Commits · 801dcd07a2643b1457f1ee440bfe3c5aa45ca0cc · edx / edx-platform · GitLab

17 Jul, 2014 18 commits
- Merge pull request #4462 from edx/bug/delete_draft · 801dcd07
```
Piecemeal conversion to draft needs to allow
```
  Don Mitchell committed Jul 17, 2014
  801dcd07 Browse Files
- Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io · adae7c6d
```
always include GA file
```
  Renzo Lucioni committed Jul 17, 2014
  adae7c6d Browse Files
- Piecemeal conversion to draft needs to allow · 1103d057
```
already converted children.
STUD-1965
```
  Don Mitchell committed Jul 17, 2014
  1103d057 Browse Files
- Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register · fb927dd7
```
fix shib reg from course about page
```
  Jason Bau committed Jul 17, 2014
  fb927dd7 Browse Files
- always include GA file · 77c3d15d
  Giulio Gratta committed Jul 17, 2014
  
  77c3d15d Browse Files
- Merge pull request #4464 from edx/jbau/remove-branch-setting-cache · be80e005
```
removing thread-local cache for branch_setting
```
  Jason Bau committed Jul 17, 2014
  be80e005 Browse Files
- Merge pull request #4303 from edx/danielli/recommender_prototype · e81c33ce
```
recommender prototype
```
  swdanielli committed Jul 17, 2014
  e81c33ce Browse Files
- recommender prototype · 3f1e9993
  swdanielli committed Jul 17, 2014
  
  3f1e9993 Browse Files
- removing thread-local cache for branch_setting · f12fa05a
  Jason Bau committed Jul 17, 2014
  
  f12fa05a Browse Files
- Merge pull request #4445 from cpennington/cross-store-xml-import-export · 1607b7fc
```
Add tests for xml import/export between different modulestores
```
  Calen Pennington committed Jul 17, 2014
  1607b7fc Browse Files
- fix shib reg from course about page · e1fcac93
  Jason Bau committed Jul 17, 2014
  
  e1fcac93 Browse Files
- Use field scopes to compute which metadata to strip from the definition during… · d354571e
```
Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses
```
  Calen Pennington committed Jul 17, 2014
  d354571e Browse Files
- Only compute block types with children once · 9a4e1f5c
  Calen Pennington committed Jul 17, 2014
  
  9a4e1f5c Browse Files
- Don't use raw asserts in split (to handle different types of UsageKeys sanely) · 3c7aa18d
  Calen Pennington committed Jul 17, 2014
  
  3c7aa18d Browse Files
- Explicitly create the AssetKey for all assets coming out of a ContentStore · 1bc0b323
  Calen Pennington committed Jul 17, 2014
  
  1bc0b323 Browse Files
- Add the manual testing course for testing xml import/export across modulestores · 4e67c2a9
  Calen Pennington committed Jul 17, 2014
  
  4e67c2a9 Browse Files
- Skip DraftVersioningModuleStore tests · 8e0189bc
  Calen Pennington committed Jul 17, 2014
  
  8e0189bc Browse Files
- Add tests of cross-modulestore import/export · 7a55f120
```
[LMS-2945]
```
  Calen Pennington committed Jul 17, 2014
  7a55f120 Browse Files
16 Jul, 2014 17 commits
- Merge pull request #4349 from louyihua/localization-cms · ebfcb5d8
```
Make TinyMCE editor translatable
```
  Ned Batchelder committed Jul 16, 2014
  ebfcb5d8 Browse Files
- Make TinyMCE editor translatable · db39e6a3
```
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.
```
  louyihua committed Jul 17, 2014
  db39e6a3 Browse Files
- Merge pull request #4441 from edx/anton/fix-flaky--bok-choy-test · 26d35ac4
```
Video: fix flaky bok-choy test.
```
  Anton Stupak committed Jul 16, 2014
  26d35ac4 Browse Files
- Merge pull request #4347 from louyihua/studio-advanced-settings-localization · 18b7e6f5
```
Fix quotation mark & apostrophe related i18n bug
```
  Ned Batchelder committed Jul 16, 2014
  18b7e6f5 Browse Files
- Merge pull request #4447 from cpennington/squelch-deprecation-warnings-in-test · 7c6cd56e
```
Remove warning filter from library code (should be set by applications/tests directly)
```
  Calen Pennington committed Jul 16, 2014
  7c6cd56e Browse Files
- Merge pull request #4244 from Stanford-Online/jbau/edx/course-specific-login-opaquekeys · 405c4f9e
```
course_specific_reg/login for OpaqueKeys
```
  Sarina Canelake committed Jul 16, 2014
  405c4f9e Browse Files
- Merge pull request #4449 from edx/ned/tweaks-for-i18n-docs · 8f9c383c
```
Tweaks for i18n docs
```
  Ned Batchelder committed Jul 16, 2014
  8f9c383c Browse Files
- Fix quotation mark & apostrophe related i18n bug · 9d284d2f
```
Just done by using the escapejs function :)
```
  louyihua committed Jul 16, 2014
  9d284d2f Browse Files
- Tweaks for i18n docs · fc16ee3a
  Ned Batchelder committed Jul 16, 2014
  
  fc16ee3a Browse Files
- Merge pull request #3718 from jazkarta/idde-bugfix · fba7bb91
```
Fix a bug in Individual Due Date Extensions (IDDE).
```
  Sarina Canelake committed Jul 16, 2014
  fba7bb91 Browse Files
- Remove warning filter from library code (should be set by applications/tests directly) · ae3942ba
  Calen Pennington committed Jul 16, 2014
  
  ae3942ba Browse Files
- Merge pull request #4413 from edx/remove-loc-mapper · 347b6606
```
Remove LocMapperStore
```
  Don Mitchell committed Jul 16, 2014
  347b6606 Browse Files
- Hotfix course_specific_reg/login for OpaqueKeys · e9022e74
  Jason Bau committed Jul 16, 2014
  
  e9022e74 Browse Files
- sql migrations cannot use loc mapper · 9f2fa7e1
  Don Mitchell committed Jul 16, 2014
  
  9f2fa7e1 Browse Files
- Remove LocMapperStore · a9695828
```
LMS-2918
```
  Don Mitchell committed Jul 16, 2014
  a9695828 Browse Files
- BLD-1190: Fix bok-choy test. · 37cccb85
  polesye committed Jul 16, 2014
  
  37cccb85 Browse Files
- Merge pull request #4422 from edx/ammar/fix-handout-tests · a71919ef
```
Add promise to ensure unit visibility is changed
```
  muhammad-ammar committed Jul 16, 2014
  a71919ef Browse Files
15 Jul, 2014 5 commits
- Merge pull request #4435 from edx/christina/stud-1963 · cd2315c1
```
Disable test that is leaving modal open.
```
  Andy Armstrong committed Jul 15, 2014
  cd2315c1 Browse Files
- Merge pull request #4430 from edx/feanil/fix_bokchoy · a5330052
```
Feanil/fix bokchoy
```
  Feanil Patel committed Jul 15, 2014
  a5330052 Browse Files
- Disable test that is leaving modal open. · 8a484b64
```
STUD-1963
```
  cahrens committed Jul 15, 2014
  8a484b64 Browse Files
- Merge pull request #4417 from edx/jbau/event-responsetype · fb39111a
```
Change answer <-> response matching in capa.get_submission_metadata
```
  Jason Bau committed Jul 15, 2014
  fb39111a Browse Files
- Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional · 666f563e
```
Make text on register button on About page conditional.
```
  Sarina Canelake committed Jul 15, 2014
  666f563e Browse Files