Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,346 Commits 1 Branch 0 Tags
4c21cb200f48e709c0df0f84fededfe1e9e2f169
Commit Graph

19346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
4c21cb200f Teach OEE to consider old task_states when trying to recover from an xml mismatch 2013-11-15 14:13:19 -05:00
Valera Rozuvan
0ad53f608a Revert "BLD-408: Don't allow users to enter video url's in http." 
This reverts commit 6cb5c3900f.
 2013-11-08 20:32:22 +02:00
brianhw
93dddf8dc3 Merge pull request #1585 from edx/brian/retry-email-after-dbtimeout 
Add retries when encountering DatabaseError when updating InstructorTask.
 2013-11-05 08:18:58 -08:00
Brian Wilson
7bef11a7f1 Add retries when encountering DatabaseError when updating InstructorTask. 2013-11-05 11:18:08 -05:00
David Baumgold
9e781e0b6d Merge pull request #1590 from edx/db/youtube-fallback 
If the YouTube API JS fails to load, the rest of the JS should still run
 2013-11-05 07:46:34 -08:00
Sarina Canelake
939dbb6c9d Merge pull request #1579 from edx/sarina/enhance-user-factories 
Sarina/enhance user factories
 2013-11-05 07:31:00 -08:00
David Baumgold
e1c94888e4 If the YouTube API JS fails to load, the rest of the JS should still run 
Fixes BLD-472
 2013-11-05 10:22:01 -05:00
Julia Hansbrough
68a429022d Merge pull request #1589 from edx/flowerhack/fix/remove-duplicate-course-helper-code 
Removed duplicate code
 2013-11-05 07:04:05 -08:00
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -05:00
Julia Hansbrough
8b6568f448 Removed duplicate code 2013-11-05 14:17:34 +00:00
Will Daly
0d1dc8e2d4 Merge pull request #1584 from edx/will/enable-course-id-tests 
Enabled course id clash command tests
 2013-11-05 04:50:23 -08:00
Julia Hansbrough
1e2c0f50f7 Merge pull request #1529 from edx/flowerhack/feature/refunds-for-certificates 
Flowerhack/feature/refunds for certificates
 2013-11-04 13:33:10 -08:00
Greg Price
3256ec2df8 Merge pull request #1559 from edx/gprice/cs-commentable-ids-param 
Avoid CS search endpoint for non-search queries
 2013-11-04 13:26:11 -08:00
John Jarvis
471e439fc3 Merge pull request #1565 from edx/jarv/ungencertificates-http-optione 
adds a new option to ungenerated_certs to use http in the callback url
 2013-11-04 13:16:36 -08:00
Will Daly
85203e8134 Enabled course id clash command tests 2013-11-04 16:15:20 -05:00
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00:00
John Jarvis
83f876eff8 Merge pull request #1582 from edx/jarv/create-user-admin-command 
adding create_user script
 2013-11-04 12:19:49 -08:00
John Jarvis
24524ef305 addressing comments 2013-11-04 15:14:20 -05:00
John Jarvis
4a910f8724 adding create_user script 2013-11-04 14:58:34 -05:00
Julia Hansbrough
1a3f4cb8f8 Moved can_refund logic to CourseEnrollment 2013-11-04 18:48:43 +00:00
Julia Hansbrough
e66f9a243b Clarified wording in a docstring 2013-11-04 18:38:49 +00:00
Julia Hansbrough
b0fcadad31 Moved #unenroll-modal to different template 2013-11-04 18:38:49 +00:00
Julia Hansbrough
c375666d88 Added new copy, small CR fixes 
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
 2013-11-04 18:38:46 +00:00
Julia Hansbrough
81661385fb More response to Dave's PR 2013-11-04 18:38:45 +00:00
Julia Hansbrough
7ab8142e82 Response to Dave & Diana's CR 2013-11-04 18:38:44 +00:00
Julia Hansbrough
bf916b6624 Fixes from Daian's CR 2013-11-04 18:38:43 +00:00
Julia Hansbrough
fcab46b138 Refactored to use signals; full test coverage 2013-11-04 18:38:42 +00:00
Julia Hansbrough
63940141c8 End-to-end refunding with tests 2013-11-04 18:37:55 +00:00
Julia Hansbrough
045e69f3c5 Can check verified-ness and expiration date 2013-11-04 18:37:54 +00:00
Diana Huang
b489514096 Merge pull request #1577 from edx/diana/clean-up-choose 
Determine which mode was selected more intelligently.
 2013-11-04 10:14:59 -08:00
Adam
4b473b9b8e Merge pull request #1578 from edx/adam/fix/registration-page-wording 
"Public Display Name" -> "Public Username" on registration page [LMS-139...
 2013-11-04 09:57:00 -08:00
Giulio Gratta
5c0c7ba6bb Merge pull request #1560 from edx/giulio/a11y-user-menu 
User menu a11y changes to allow use of spacebar, escape key and arrows to navigate
 2013-11-04 08:53:46 -08:00
Sarina Canelake
198452cd1c Adds Staff and Instructor factories 2013-11-04 11:38:43 -05:00
Sarina Canelake
eb0e09d63f Clean up some instructor dash code 2013-11-04 11:38:43 -05:00
Diana Huang
0018568799 Merge pull request #1555 from edx/diana/certs-reverification-path 
Verified Certificate Reverification Path
 2013-11-04 08:31:56 -08:00
Will Daly
97d32acd87 Merge pull request #1576 from edx/will/dateutil-version 
Pin dateutil version to 2.1
 2013-11-04 08:26:15 -08:00
Adam
98b3d18edc Merge pull request #1492 from edx/adam/remove-@edx 
remove instances of @edx.org email addresses in our default settings (Bug: LMS-1363)
 2013-11-04 08:02:08 -08:00
Brian Talbot
b5ec2c72f9 LMS: revises instructional copy for reverification flow 2013-11-04 10:59:50 -05:00
Adam Palay
69eebf43f4 "Public Display Name" -> "Public Username" on registration page [LMS-1393] 2013-11-04 10:49:49 -05:00
Diana Huang
dc0e3d04ab Determine which mode was selected more intelligently. 
LMS-1384
 2013-11-04 10:25:28 -05:00
Will Daly
57556c2473 Pin dateutil version to 2.1 2013-11-04 10:18:54 -05:00
Alexander Kryklia
df5b1e97d8 Merge pull request #1514 from edx/alex/add_latex_compiler_key 
Alex/add latex compiler key
 2013-11-04 02:14:53 -08:00
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
polesye
adddd75f03 Merge pull request #1564 from edx/anton/fix-video-bugs 
Video player: fix start-end time bugs.
 2013-11-04 02:01:59 -08:00
polesye
af71c780fe Fix bugs in Video player. BLD-468. 2013-11-04 11:30:24 +02:00
Jason Bau
64758673b5 Merge pull request #1563 from edx/jbau/OEE/feedback-handle-nonexistent-child 
add error handling for update_score for OEE when no child_history
 2013-11-01 16:24:18 -07:00
Jason Bau
c648db7f3d add comment explaining child_history condition 2013-11-01 15:51:20 -07:00
Giulio Gratta
6e988443f6 User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate 2013-11-01 14:34:02 -07:00
frances botsford
a57fac3be4 Merge pull request #1566 from edx/frances/fix/studio-course-creation-org-placeholder 
Course creation form cleanup
 2013-11-01 13:56:59 -07:00
Frances Botsford
8ae7bfae4d updated course creation UI: placeholder text for Org is now more generic, run is now using current format, and tips are now below fields to allow more room for tip text 
Addresses bugs STUD-885 and STUD-916
 2013-11-01 16:55:59 -04:00