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

26516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stupak
39f1f00977 Merge pull request #4424 from edx/anton/edit-group-configurations 
Edit group configurations.
 2014-07-18 13:12:18 +03: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
Jason Bau
6e5f9fdb70 Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT 
Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
 2014-07-17 17:49:21 -04:00
swdanielli
44e9e6f359 Merge pull request #4467 from edx/swli/rc-hotpatch-recommender 
hotpatch for recommender (learning science)
 2014-07-17 17:01:08 -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
Jason Bau
aac0fac3d2 Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs 2014-07-17 15:04:22 -04:00
Renzo Lucioni
adae7c6d95 Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io 
always include GA file
 2014-07-17 14:34:19 -04:00
swdanielli
0fdc762452 recommender prototype 2014-07-17 14:31:16 -04:00
marco
a129fd4a27 adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups 2014-07-17 14:26:22 -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
Giulio Gratta
77c3d15d20 always include GA file 2014-07-17 10:25:06 -07: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
swdanielli
e81c33cea5 Merge pull request #4303 from edx/danielli/recommender_prototype 
recommender prototype
 2014-07-17 12:54:32 -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
swdanielli
3f1e9993f5 recommender prototype 2014-07-17 11:21:01 -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
chrisndodge
2e13c5a813 Merge pull request #4456 from edx/cdodge/shopping-cart-only-paid-registrations 
add ability to inspect a cart for the existence of a particular type of ...
 2014-07-17 09:43:34 -04:00
Chris Dodge
4928fad415 add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it. 2014-07-17 00:43:00 -04:00
Ned Batchelder
ebfcb5d8ce Merge pull request #4349 from louyihua/localization-cms 
Make TinyMCE editor translatable
 2014-07-16 17:06:37 -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
Ned Batchelder
18b7e6f59d Merge pull request #4347 from louyihua/studio-advanced-settings-localization 
Fix quotation mark & apostrophe related i18n bug
 2014-07-16 13:51:02 -04: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
Ned Batchelder
8f9c383c68 Merge pull request #4449 from edx/ned/tweaks-for-i18n-docs 
Tweaks for i18n docs
 2014-07-16 12:30:39 -04:00
louyihua
9d284d2f61 Fix quotation mark & apostrophe related i18n bug 
Just done by using the escapejs function :)
 2014-07-16 23:56:30 +08:00
Ned Batchelder
fc16ee3a6e Tweaks for i18n docs 2014-07-16 11:48:35 -04:00
Sarina Canelake
fba7bb91bd Merge pull request #3718 from jazkarta/idde-bugfix 
Fix a bug in Individual Due Date Extensions (IDDE).
 2014-07-16 11:30:10 -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
Don Mitchell
347b660623 Merge pull request #4413 from edx/remove-loc-mapper 
Remove LocMapperStore
 2014-07-16 11:09: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