Commits · aff849281d9a7dbfeb19afcb2a61e82ab517d750 · edx / edx-platform · GitLab

11 Aug, 2015 6 commits
- Revert "Test library failed to export after import" · aff84928
```
This reverts commit 4c1c4619.
```
  Waheed Ahmed committed Aug 12, 2015
  aff84928 Browse Files
- Merge pull request #9274 from mitocw/patch/2015-08-11 · 7fb9c331
```
Patch/2015 08 11
```
  Peter Fogg committed Aug 11, 2015
  7fb9c331 Browse Files
- Fix CCX 0002 migration · 912db991
```
(cherry picked from commit 558b93fdeaaf72d02e050808698b2015e123a01c)
```
  Brandon DeRosier committed Aug 11, 2015
  912db991 Browse Files
- Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"" · 34526ddf
```
This reverts commit 42e78463.
```
  Brandon DeRosier committed Aug 11, 2015
  34526ddf Browse Files
- Merge pull request #9234 from edx/rc/2015-08-10 · 5b4d0702
```
rc/2015-08-10
```
  Peter Fogg committed Aug 11, 2015
  5b4d0702 Browse Files
- Merge pull request #9261 from edx/peter-fogg/test-rc-fix · 9f58f656
```
Test Cale's RC fix.
```
  Peter Fogg committed Aug 10, 2015
  9f58f656 Browse Files
10 Aug, 2015 7 commits
- Test Cale's RC fix. · a6891609
  Peter Fogg committed Aug 10, 2015
  
  a6891609 Browse Files
- Merge pull request #9256 from cpennington/fix-user-state-client · 25537da0
```
Fix user state client
```
  Peter Fogg committed Aug 10, 2015
  25537da0 Browse Files
- Use the correct attribute when accessing StudentModuleHistory creation dates · 58445320
  Calen Pennington committed Aug 10, 2015
  
  58445320 Browse Files
- Add more information when logging data about differing history and score entries · 34892b96
  Calen Pennington committed Aug 10, 2015
  
  34892b96 Browse Files
- Don't violate the empty-dict vs None semantics of student_module during delete_many · 93b1b698
  Calen Pennington committed Aug 10, 2015
  
  93b1b698 Browse Files
- Merge pull request #9253 from edx/studio-short-name-bugfix · d502987c
```
settings.STUDIO_SHORT_NAME doesn't exist in LMS
```
  David Baumgold committed Aug 10, 2015
  d502987c Browse Files
- settings.STUDIO_SHORT_NAME doesn't exist in LMS · 5953debe
  David Baumgold committed Aug 10, 2015
  
  5953debe Browse Files
07 Aug, 2015 18 commits
- Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment" · 42e78463
```
This reverts commit 53db053c, reversing
changes made to 386a8a27.
```
  Peter Fogg committed Aug 07, 2015
  42e78463 Browse Files
- Revert "Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model" · 440c1575
```
This reverts commit d80e8364, reversing
changes made to fb5506a6.
```
  Peter Fogg committed Aug 07, 2015
  440c1575 Browse Files
- Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model · d80e8364
```
Readd CcxMembership model for migration
```
  Peter Fogg committed Aug 07, 2015
  d80e8364 Browse Files
- Add the CcxMembership model back · 235c45f1
  Brandon DeRosier committed Aug 07, 2015
  
  235c45f1 Browse Files
- Merge pull request #9238 from edx/renzo/info-logging · fb5506a6
```
Emit INFO-level messages when a mode does not have a SKU
```
  Clinton Blackburn committed Aug 07, 2015
  fb5506a6 Browse Files
- Emit INFO-level messages when a mode does not have a SKU · 3a735591
  Renzo Lucioni committed Aug 07, 2015
  
  3a735591 Browse Files
- Merge pull request #9223 from edx/peter-fogg/discussion-admin-delete · 9c58489b
```
Ensure that discussion admins can delete team posts.
```
  Peter Fogg committed Aug 07, 2015
  9c58489b Browse Files
- Merge pull request #9230 from edx/sarina/20150807-update-translations · e09f9ac4
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Aug 07, 2015
  e09f9ac4 Browse Files
- Merge pull request #9221 from edx/christina/less-assets · dbe74ea3
```
Christina/less assets
```
  Christina Roberts committed Aug 07, 2015
  dbe74ea3 Browse Files
- Update translations (autogenerated message) · 19b44b47
  Sarina Canelake committed Aug 07, 2015
  
  19b44b47 Browse Files
- Merge pull request #8871 from edx/aj/tnl2669-invalid-display-name-export-not-working · 32b0dc19
```
Slashes in Asset Displayname cause `export` to fail
```
  Waheed Ahmed committed Aug 07, 2015
  32b0dc19 Browse Files
- Merge pull request #9206 from edx/bderusha/teams-full-country-language-names · 69a460fd
```
Add Full Country & Language Names to Teams
```
  Bill DeRusha committed Aug 07, 2015
  69a460fd Browse Files
- Test that discussion admins can delete team posts. · 90d87747
  Peter Fogg committed Aug 07, 2015
  
  90d87747 Browse Files
- Merge pull request #9220 from jzoldak/zoldak/circle-noprereq · f37860d3
```
No need to install prereqs twice on circleci.com
```
  Jesse Zoldak committed Aug 07, 2015
  f37860d3 Browse Files
- Include coffee dependency files in discussion_js. · fd31c684
  cahrens committed Aug 07, 2015
  
  fd31c684 Browse Files
- Allow discussion vendor files to be bundled. · e95e23fa
```
Improve client-side performance.
```
  cahrens committed Aug 07, 2015
  e95e23fa Browse Files
- Reduce dependency on courseware_js. · 68645db3
```
TNL-2945
```
  cahrens committed Aug 07, 2015
  68645db3 Browse Files
- Strip aways slashes from the asset 'displayname' as they cause export to fail. · 7bf81195
```
TNL-2669
```
  Awais Jibran committed Aug 07, 2015
  7bf81195 Browse Files
06 Aug, 2015 9 commits
- Merge pull request #9219 from edx/peter-fogg/url-routing-bok-choy · 24bca27b
```
Add Bok Choy tests for URL routing on teams page.
```
  Peter Fogg committed Aug 06, 2015
  24bca27b Browse Files
- Merge pull request #9213 from edx/ziafazal/SOL-1075 · 65a9c05a
```
sol-1075: On click of Edit of a Live certificate, the system must display a warning message dialog
```
  Matt Drayer committed Aug 06, 2015
  65a9c05a Browse Files
- Allow image files to be cached. · a7c06fd2
  cahrens committed Aug 06, 2015
  
  a7c06fd2 Browse Files
- on clicking Edit of certificate config show prompt · 97c3bd1c
  Zia Fazal committed Aug 06, 2015
  
  97c3bd1c Browse Files
- Add Bok Choy tests for teams page URL routing. · e0e895a5
  Peter Fogg committed Aug 06, 2015
  
  e0e895a5 Browse Files
- Add Full Country & Language Names to Teams [TNL-2891] · 2398824b
  Bill DeRusha committed Aug 06, 2015
  
  2398824b Browse Files
- No need to install prereqs twice on circleci.com · f8766891
  Jesse Zoldak committed Aug 06, 2015
  
  f8766891 Browse Files
- Merge pull request #9216 from edx/ned/speed-i18n-extract · 117bc4a9
```
Ignore more directories to speed up extracting i18n strings.
```
  Ned Batchelder committed Aug 06, 2015
  117bc4a9 Browse Files
- Merge pull request #9105 from edx/andya/team-discussion-component · 1a251a49
```
Show discussion component on Team view
```
  Andy Armstrong committed Aug 06, 2015
  1a251a49 Browse Files