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

32014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Fogg
7fb9c331fd Merge pull request #9274 from mitocw/patch/2015-08-11 
Patch/2015 08 11
 2015-08-11 13:52:12 -04:00
Brandon DeRosier
912db9910f Fix CCX 0002 migration 
(cherry picked from commit 558b93fdeaaf72d02e050808698b2015e123a01c)
 2015-08-11 13:04:09 -04:00
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"" 
This reverts commit 42e78463a7.
 2015-08-11 13:03:58 -04:00
Peter Fogg
5b4d070259 Merge pull request #9234 from edx/rc/2015-08-10 
rc/2015-08-10
 2015-08-11 10:37:25 -04:00
Peter Fogg
9f58f656de Merge pull request #9261 from edx/peter-fogg/test-rc-fix 
Test Cale's RC fix.
 2015-08-10 22:08:42 -04:00
Peter Fogg
a6891609be Test Cale's RC fix. 2015-08-10 19:36:32 -04:00
Peter Fogg
25537da0c4 Merge pull request #9256 from cpennington/fix-user-state-client 
Fix user state client
 2015-08-10 16:59:38 -04:00
Calen Pennington
584453202f Use the correct attribute when accessing StudentModuleHistory creation dates 2015-08-10 14:56:03 -04:00
Calen Pennington
34892b9680 Add more information when logging data about differing history and score entries 2015-08-10 14:56:03 -04:00
Calen Pennington
93b1b69854 Don't violate the empty-dict vs None semantics of student_module during delete_many 2015-08-10 14:42:18 -04:00
David Baumgold
d502987c5f Merge pull request #9253 from edx/studio-short-name-bugfix 
settings.STUDIO_SHORT_NAME doesn't exist in LMS
 2015-08-10 13:38:28 -04:00
David Baumgold
5953debee1 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:45:09 -04:00
Peter Fogg
42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment" 
This reverts commit 53db053c18, reversing
changes made to 386a8a27dd.
 2015-08-07 16:59:56 -04:00
Peter Fogg
440c1575e0 Revert "Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model" 
This reverts commit d80e83649a, reversing
changes made to fb5506a6f7.
 2015-08-07 16:59:50 -04:00
Peter Fogg
d80e83649a Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model 
Readd CcxMembership model for migration
 2015-08-07 15:44:12 -04:00
Brandon DeRosier
235c45f1fb Add the CcxMembership model back 2015-08-07 15:38:25 -04:00
Clinton Blackburn
fb5506a6f7 Merge pull request #9238 from edx/renzo/info-logging 
Emit INFO-level messages when a mode does not have a SKU
 2015-08-07 15:29:31 -04:00
Renzo Lucioni
3a735591d1 Emit INFO-level messages when a mode does not have a SKU 2015-08-07 14:11:42 -04:00
Peter Fogg
9c58489b38 Merge pull request #9223 from edx/peter-fogg/discussion-admin-delete 
Ensure that discussion admins can delete team posts.
 2015-08-07 11:03:50 -04:00
Sarina Canelake
e09f9ac434 Merge pull request #9230 from edx/sarina/20150807-update-translations 
Update translations (autogenerated message)
 2015-08-07 10:35:34 -04:00
Christina Roberts
dbe74ea340 Merge pull request #9221 from edx/christina/less-assets 
Christina/less assets
 2015-08-07 10:34:20 -04:00
Sarina Canelake
19b44b477f Update translations (autogenerated message) 2015-08-07 09:54:08 -04:00
Waheed Ahmed
32b0dc1989 Merge pull request #8871 from edx/aj/tnl2669-invalid-display-name-export-not-working 
Slashes in Asset Displayname cause `export` to fail
 2015-08-07 18:51:24 +05:00
Bill DeRusha
69a460fdca Merge pull request #9206 from edx/bderusha/teams-full-country-language-names 
Add Full Country & Language Names to Teams
 2015-08-07 09:49:48 -04:00
Peter Fogg
90d8774745 Test that discussion admins can delete team posts. 2015-08-07 09:46:12 -04:00
Jesse Zoldak
f37860d36c Merge pull request #9220 from jzoldak/zoldak/circle-noprereq 
No need to install prereqs twice on circleci.com
 2015-08-07 09:20:50 -04:00
cahrens
fd31c68404 Include coffee dependency files in discussion_js. 2015-08-07 09:14:11 -04:00
cahrens
e95e23faf1 Allow discussion vendor files to be bundled. 
Improve client-side performance.
 2015-08-07 09:14:11 -04:00
cahrens
68645db38b Reduce dependency on courseware_js. 
TNL-2945
 2015-08-07 09:14:06 -04:00
Awais Jibran
7bf81195ad Strip aways slashes from the asset 'displayname' as they cause export to fail. 
TNL-2669
 2015-08-07 18:10:26 +05:00
Peter Fogg
24bca27b46 Merge pull request #9219 from edx/peter-fogg/url-routing-bok-choy 
Add Bok Choy tests for URL routing on teams page.
 2015-08-06 15:47:35 -04:00
Matt Drayer
65a9c05adb Merge pull request #9213 from edx/ziafazal/SOL-1075 
sol-1075: On click of Edit of a Live certificate, the system must display a warning message dialog
 2015-08-06 15:04:58 -04:00
cahrens
a7c06fd296 Allow image files to be cached. 2015-08-06 14:56:28 -04:00
Zia Fazal
97c3bd1cfd on clicking Edit of certificate config show prompt 2015-08-06 13:48:28 -04:00
Peter Fogg
e0e895a531 Add Bok Choy tests for teams page URL routing. 2015-08-06 13:32:48 -04:00
Bill DeRusha
2398824bba Add Full Country & Language Names to Teams [TNL-2891] 2015-08-06 13:17:01 -04:00
Jesse Zoldak
f8766891f0 No need to install prereqs twice on circleci.com 2015-08-06 13:09:06 -04:00
Ned Batchelder
117bc4a94e Merge pull request #9216 from edx/ned/speed-i18n-extract 
Ignore more directories to speed up extracting i18n strings.
 2015-08-06 12:37:12 -04:00
Andy Armstrong
1a251a4900 Merge pull request #9105 from edx/andya/team-discussion-component 
Show discussion component on Team view
 2015-08-06 12:21:27 -04:00
Matt Drayer
3570d08856 Merge pull request #9197 from edx/ziafazal/SOL-1077-fix 
SOL-1077: certificate config edit/delete is only allowed if user is edX PM or for those certificate configs not active
 2015-08-06 11:36:03 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI. 
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
 2015-08-06 11:15:56 -04:00
Daniel Friedman
f5840489a0 Allow editing of own post in team discussion 2015-08-06 11:15:55 -04:00
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 2015-08-06 11:15:55 -04:00
cahrens
41173fefee Only verify course access for threads with course context. 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view 
TNL-2515
 2015-08-06 11:15:55 -04:00
Ned Batchelder
2300f382cf Ignore more directories to speed up extracting i18n strings. 
Also, remove the one use of _() in a test feature, since there's no
point.
 2015-08-06 10:39:04 -04:00
David Baumgold
df936837ae Merge pull request #9210 from edx/dont-click-here 
Should never just link the word 'here'
 2015-08-06 10:10:43 -04:00
Ben Patterson
c4eed7bbc2 Merge pull request #9196 from edx/benp/bok-choy-shard-7 
Benp/bok choy shard 7
 2015-08-06 07:27:56 -04:00
Syed Hasan raza
486aa58fe7 Merge pull request #8889 from edx/shr/bug/TNL-2686-library-export-then-import-error 
Test library failed to export after import
 2015-08-06 02:09:05 -07:00
David Baumgold
668c7fdca3 Should never just link the word 'here' 2015-08-05 15:53:51 -04:00