Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,484 Commits 1 Branch 0 Tags
b54dd4d83b5bd184b9d1c049d2bb992c4ece0a21
Commit Graph

8752 Commits

Author SHA1 Message Date
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Nimisha Asthagiri
a03134b371 Merge remote-tracking branch 'origin/release' into rc/2014-07-16 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-21 10:35:55 -04:00
Nimisha Asthagiri
c139c2a516 Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors 
Don't update ancestors while bulk editing.
 2014-07-21 08:12:24 -04:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course 
STUD-1725
 2014-07-21 13:16:00 +05:00
Nimisha Asthagiri
80f078cf61 Don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-20 23:38:33 -04:00
Nimisha Asthagiri
d53a666949 Merge pull request #4381 from edx/nimisha/split-converge-api 
Nimisha/split converge api
 2014-07-19 07:04:23 -04:00
Calen Pennington
483e2a6a5d split create_item and create_child out as separate methods 2014-07-18 21:11:37 -04:00
polesye
2a6a874a8f BLD-1099: Edit group configurations. 2014-07-18 10:03:08 +03:00
Mathew Peterson
06ef306f7f more split_draft methods 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
7efd0cb49e converge Split APIs with Mixed and Draft 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
a501aa9400 don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-17 21:58:11 -04:00
Nimisha Asthagiri
682c9fffd1 fix bulk_write context manager. 2014-07-17 21:57:43 -04:00
chrisndodge
1c5959988f Merge pull request #4466 from edx/cdodge/change-course-access-role-admin 
make sure the CourseAccessRole Django ORM Admin page uses a raw_id so th...
 2014-07-17 18:34:09 -04:00
Don Mitchell
801dcd07a2 Merge pull request #4462 from edx/bug/delete_draft 
Piecemeal conversion to draft needs to allow
 2014-07-17 15:45:54 -04:00
Don Mitchell
1103d057d7 Piecemeal conversion to draft needs to allow 
already converted children.
STUD-1965
 2014-07-17 13:54:54 -04:00
Jason Bau
fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register 
fix shib reg from course about page
 2014-07-17 13:53:51 -04:00
Jason Bau
be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache 
removing thread-local cache for branch_setting
 2014-07-17 13:03:08 -04:00
Chris Dodge
bde448d950 make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list 2014-07-17 12:04:56 -04:00
Jason Bau
f12fa05ae1 removing thread-local cache for branch_setting 2014-07-17 11:05:47 -04:00
Calen Pennington
1607b7fc0d Merge pull request #4445 from cpennington/cross-store-xml-import-export 
Add tests for xml import/export between different modulestores
 2014-07-17 10:55:55 -04:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Calen Pennington
d354571e95 Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses 2014-07-17 10:35:37 -04:00
Calen Pennington
9a4e1f5cd1 Only compute block types with children once 2014-07-17 10:35:37 -04:00
Calen Pennington
3c7aa18d25 Don't use raw asserts in split (to handle different types of UsageKeys sanely) 2014-07-17 10:35:37 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Calen Pennington
4e67c2a9b3 Add the manual testing course for testing xml import/export across modulestores 2014-07-17 10:35:36 -04:00
Calen Pennington
8e0189bcf7 Skip DraftVersioningModuleStore tests 2014-07-17 10:35:35 -04:00
Calen Pennington
7a55f1207d Add tests of cross-modulestore import/export 
[LMS-2945]
 2014-07-17 10:35:04 -04:00
louyihua
db39e6a311 Make TinyMCE editor translatable 
Combine TinyMCE's built-in translation scheme with the django's translation framework.
So edX's translators can also make translations for TinyMCE used in edX.
 2014-07-17 02:37:01 +08:00
Anton Stupak
26d35ac4f8 Merge pull request #4441 from edx/anton/fix-flaky--bok-choy-test 
Video: fix flaky bok-choy test.
 2014-07-16 21:11:46 +03:00
Calen Pennington
7c6cd56ed3 Merge pull request #4447 from cpennington/squelch-deprecation-warnings-in-test 
Remove warning filter from library code (should be set by applications/tests directly)
 2014-07-16 13:07:17 -04:00
Sarina Canelake
405c4f9eb3 Merge pull request #4244 from Stanford-Online/jbau/edx/course-specific-login-opaquekeys 
course_specific_reg/login for OpaqueKeys
 2014-07-16 12:45:39 -04:00
Calen Pennington
ae3942baa2 Remove warning filter from library code (should be set by applications/tests directly) 2014-07-16 11:14:24 -04:00
Jason Bau
e9022e74a8 Hotfix course_specific_reg/login for OpaqueKeys 2014-07-16 10:18:21 -04:00
Don Mitchell
9f2fa7e105 sql migrations cannot use loc mapper 2014-07-16 09:21:25 -04:00
Don Mitchell
a9695828ab Remove LocMapperStore 
LMS-2918
 2014-07-16 09:21:25 -04:00
polesye
37cccb85e4 BLD-1190: Fix bok-choy test. 2014-07-16 13:34:00 +03:00
muhammad-ammar
a71919efa7 Merge pull request #4422 from edx/ammar/fix-handout-tests 
Add promise to ensure unit visibility is changed
 2014-07-16 12:25:48 +05:00
Don Mitchell
713c2a4474 Handle bad children pointers during publish 
rather than aborting the publish, ignore them.
    Needed for import
 2014-07-15 21:21:39 -04:00
Jason Bau
fb39111af3 Merge pull request #4417 from edx/jbau/event-responsetype 
Change answer <-> response matching in capa.get_submission_metadata
 2014-07-15 16:51:42 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional 
Make text on register button on About page conditional.
 2014-07-15 16:37:00 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional. 
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
 2014-07-15 12:51:12 -07:00
Muhammad Ammar
b2e08ddc72 Add promise to ensure unit visibility is changed 2014-07-15 07:10:01 +00:00
Tim Babych
246e0e6f66 Merge pull request #4411 from edx/anton/group-experiments 
Create new group configurations page
 2014-07-15 08:19:34 +03:00
Nimisha Asthagiri
851fe47a95 Merge pull request #4370 from edx/nimisha/split-drop-database-2952 
Implement close_connections and drop_database on modulestores.
 2014-07-14 18:17:48 -04:00
Jason Bau
faff8c577e Change answer <-> response matching in capa.get_submission_metadata 2014-07-14 17:09:06 -04:00
Nimisha Asthagiri
d7cf8b7fa0 Implement close_connections and drop_database on modulestores. 2014-07-14 16:01:10 -04:00
chrisndodge
e8d14b207b Merge pull request #4415 from edx/cdodge/enhanced_registration_fields 
add ability for microsites to define additional profile fields to be cap...
 2014-07-14 15:50:18 -04:00
cahrens
66173ab9e6 Add "visible_to_staff_only" field to support staff locking in Studio. 
STUD-1875
 2014-07-14 14:46:40 -04:00
Nimisha Asthagiri
bc03fb0881 Merge pull request #4380 from edx/nimisha/mongo-bwc-config 
auto-migrate old mongo to draft modulestore
 2014-07-14 13:46:00 -04:00