Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
4e38b10af9 Merge pull request #3818 from edx/ahodges/documentation/DOC368 
Ahodges/documentation/doc368
 2014-05-22 10:23:06 -04:00
Alison Hodges
5ce9b418b6 Reorganized, updated, & streamlined sections in Running Your Course 2014-05-22 10:22:35 -04:00
louyihua
34d2f051a4 i18n: Make checklists translatable 
Now the description & action_text strings in checklists can be extracted and translated.
 2014-05-22 22:15:45 +08:00
Dave St.Germain
232df30b3e support aria-grabbed and aria-dropeffect 2014-05-22 09:51:50 -04:00
Dave St.Germain
f4391b5eb9 fixing drag and drop 2014-05-22 09:51:50 -04:00
Don Mitchell
253ed3b855 Merge pull request #3820 from edx/dhm/bug_ok_serial_numbers 
Dhm/bug ok serial numbers
 2014-05-22 09:36:43 -04:00
Ben Patterson
dd07967805 Disable cms test due to failure on master build. 2014-05-22 09:24:13 -04:00
zubair-arbi
72d9a91f1d Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft 
create draft request gets already created version if it exists
 2014-05-22 18:18:56 +05:00
Calen Pennington
ba59e3b8a5 fixup! Serial number commands deserialize course keys 2014-05-22 09:06:13 -04:00
Alison Hodges
6d1e9f9bad Anton's edit, date change 2014-05-22 08:53:15 -04:00
Nimisha Asthagiri
0631c6358c Merge pull request #3821 from edx/ok-permissions-asserts 
Added asserts to ensure course_ids are course key objects.
 2014-05-22 08:47:01 -04:00
Waheed Ahmed
a7184c03cf Merge pull request #3774 from edx/waheed/lms2719-fix-register-on-edge 
Fixed register button on edge homepage.
 2014-05-22 12:49:33 +05:00
Waheed Ahmed
b6a90e0bfa Fixed register button on edge homepage. 
LMS-2719
 2014-05-22 12:09:23 +05:00
Calen Pennington
4b69cf5472 Merge pull request #3810 from cpennington/ok-management-commands 
Fix management commands
 2014-05-21 21:53:43 -04:00
Calen Pennington
942c2eab30 Merge pull request #3815 from cpennington/ok-certificaties 
Fix certificate requests
 2014-05-21 21:52:54 -04:00
Calen Pennington
76953d7223 Merge pull request #3807 from cpennington/ok-cleaner-logging 
Clean up logging in import_export.py
 2014-05-21 20:36:48 -04:00
Calen Pennington
75ad81bea3 Merge pull request #3813 from cpennington/ok-mongoengine-fields 
Make mongoengine field for UsageKeys expect a Location
 2014-05-21 20:35:55 -04:00
Sarina Canelake
4723467345 Validate forms to allow old and new style course key serialization syntax 2014-05-21 17:44:50 -04:00
Nimisha Asthagiri
d43386a0c6 Added asserts to ensure course_ids are course key objects. 2014-05-21 17:20:56 -04:00
clytwynec
18ee082cc3 Merge pull request #3708 from edx/clytwynec/rake2paver-quality 
Switch quality tasks to paver
 2014-05-21 17:10:03 -04:00
Don Mitchell
30184dbd68 Serial number commands deserialize course keys 2014-05-21 16:58:04 -04:00
Don Mitchell
bef8134eea Merge pull request #3806 from edx/dhm/opaque_migrate_0036 
Migration for role_coursenum deprecated roles
 2014-05-21 16:33:33 -04:00
Calen Pennington
708d758d65 Merge pull request #3808 from cpennington/ok-course-mode-errors 
Call other CourseModeView methods using serialized course_id
 2014-05-21 16:21:27 -04:00
Calen Pennington
1f9c7b2ed4 Merge pull request #3809 from cpennington/ok-dead-code 
Remove dead code
 2014-05-21 16:21:17 -04:00
Calen Pennington
1c60da02df fixup! Fix management commands 2014-05-21 16:20:46 -04:00
srpearce
fb300029b9 Merge pull request #3765 from edx/sylvia/docs/TIM-243 
Sylvia/docs/tim 243
 2014-05-21 16:17:20 -04:00
Christina Roberts
eb362fba67 Merge pull request #3579 from edx/andya/container-add-buttons 
Allow creation of components on container page
 2014-05-21 16:15:14 -04:00
Calen Pennington
32e0387fa0 Merge pull request #3811 from cpennington/ok-dont-use-empty 
Don't use Empty directly, let the manager handle it
 2014-05-21 16:14:42 -04:00
Sylvia Pearce
d8d7c2fd2f Deprecate old ORA; add links to new ORA permanent docs 2014-05-21 16:13:11 -04:00
Calen Pennington
61e621fc6e Merge pull request #3812 from cpennington/ok-simpler-loc-mapper 
Make the arguments to translate_location_to_course_locator more specific
 2014-05-21 16:12:27 -04:00
Calen Pennington
3b58997b82 Merge pull request #3814 from cpennington/ok-conditional-test 
Fix ConditionalTest test system
 2014-05-21 16:10:56 -04:00
Calen Pennington
4c3c8a9a2e Fix certificate requests 2014-05-21 16:10:16 -04:00
Calen Pennington
150b5cd298 Merge pull request #3816 from cpennington/ok-psychometrics 
Fix PsychometricData query
 2014-05-21 16:09:46 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
Calen Pennington
d52c58c77b Fix PsychometricData query 2014-05-21 14:48:25 -04:00
Calen Pennington
c62b6b0083 Fix ConditionalTest test system 2014-05-21 14:44:46 -04:00
Calen Pennington
4c2e612aeb Make mongoengine field for UsageKeys expect a Location 2014-05-21 14:43:51 -04:00
Calen Pennington
4836252972 Make the arguments to translate_location_to_course_locator more specific 2014-05-21 14:39:28 -04:00
Calen Pennington
06d680cded Don't use Empty directly, let the manager handle it 2014-05-21 14:38:16 -04:00
Calen Pennington
1f849e441d Fix management commands 2014-05-21 14:36:41 -04:00
Calen Pennington
4af2249a9d Remove dead code 2014-05-21 14:28:04 -04:00
Calen Pennington
3d90c83199 Call other CourseModeView methods using serialized course_id 2014-05-21 14:27:01 -04:00
Calen Pennington
7f8543a2e4 Clean up logging in import_export.py 2014-05-21 14:25:21 -04:00
Adam
2124571c0f Merge pull request #3803 from edx/release 
Release
 2014-05-21 12:52:18 -04:00
Han Su Kim
c8ce4a54d6 Merge pull request #3621 from edx/han/cert-report 
Added totals for different student tracks
 2014-05-21 12:08:00 -04:00
Don Mitchell
9af40ae2cc Migration for role_coursenum deprecated roles 2014-05-21 12:03:09 -04:00
jmclaus
cc7987e515 Merge pull request #3489 from edx/jmclaus/bugfix_numerical_response_tolerance 
Tolerance expressed in percentage now computes correctly. [BLD-522]
 2014-05-21 17:47:45 +02:00
jmclaus
db239c69fe Tolerance expressed in percentage now computes correctly. [BLD-522] 2014-05-21 17:14:12 +02:00
Calen Pennington
4df73548bf Merge pull request #3788 from cpennington/allow-cross-course-references 
Allow cross course references in the LMS
 2014-05-21 11:06:01 -04:00