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

11913 Commits

Author SHA1 Message Date
Arbab Nazar
330ef94e1e Merge pull request #9182 from edx/arbab/whitelist-text-change 
updated the help text for cert_whitelist
 2015-08-12 12:28:04 +05:00
Clinton Blackburn
58865ee0a8 Added API endpoints for CreditCourse 
Endpoints support create, read, and list operations.

NOTE: This commit also includes a retrofitted SimpleRouter that supports overriding the lookup regex. This retrofit is simpler to implement than updating edx-ora2 which is pinned to DRF 2.3.x.

XCOM-524
 2015-08-11 15:44:37 -04:00
Sarina Canelake
eda45d37f2 Merge pull request #9192 from edx/sarina/fix-i18n 
Add more context to translation strings
 2015-08-11 14:11:07 -04:00
clrux
98bd1d39ef Merge pull request #9152 from edx/clrux/ux-2233-video-bumper 
Updating the video bumper play button
 2015-08-11 13:45:52 -04:00
Sarina Canelake
71d5180ba1 Add more context to translation strings 2015-08-11 13:11:32 -04:00
Chris Rodriguez
f958272149 Updating video bumper play button 2015-08-11 12:51:18 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release 
2015-08-11 release
 2015-08-11 12:07:21 -04:00
Matt Drayer
2b93e246f3 Merge pull request #9266 from edx/asadiqbal08/SOL-1118 
asadiqbal08/SOL-1118: Use correct course number in web certificate
 2015-08-11 11:06:28 -04:00
Akiva Leffert
ba03081320 Merge pull request #9260 from edx/aleffert/start-date-error 
Show vaguer error message if using default start date
 2015-08-11 10:28:44 -04:00
asadiqbal
8269bf5f1f SOL-1118 2015-08-11 19:25:23 +05:00
Usman Khalid
1de9fc6461 Merge pull request #9200 from edx/usman/tnl1911-my-teams 
My teams tab.
 2015-08-11 19:22:50 +05:00
Usman Khalid
b4ed9a28b0 My Teams tab. 
TNL-1911
 2015-08-11 17:27:53 +05:00
clrux
bf0dddfef6 Merge pull request #9106 from edx/clrux/ux-2534-css-cleanup 
Style simplification to sync up styles
 2015-08-11 07:58:54 -04:00
Chris Rodriguez
b08a8f7e7f Style simplification to sync up styles 2015-08-11 06:56:39 -04:00
Waheed Ahmed
d6dab577a8 Merge pull request #9202 from edx/waheed/plat776-fix-course-id-regex 
Fixed course_id pattern regex.
 2015-08-11 15:56:19 +05:00
Sven Marnach
55ace6baa8 Make new masquerading code compatible to existing session data. 
The new masquerading code introduced in PR #8775 adds a new attribute to
CourseMasquerade objects stored in the user's session.  When users who have
active masquerading configuration access instances with the new code, and
AttributeError occurs when trying to access the attribute user_name.

This fix ensures that CourseMasquerade objects receive all required attributes
when they are unpickled from the session.
 2015-08-11 10:47:25 +02:00
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex. 
PLAT-776
 2015-08-11 13:36:07 +05:00
Peter Fogg
a6891609be Test Cale's RC fix. 2015-08-10 19:36:32 -04:00
Kevin Falcone
891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https 
Deactivate HTTPS on devstack
 2015-08-10 17:29:05 -04:00
Akiva Leffert
2632fd7ecd Show vaguer error message if using default start date 2015-08-10 17:26:36 -04:00
David Baumgold
026c7edf32 Merge pull request #9252 from edx/no-studio-short-name-in-lms 
settings.STUDIO_SHORT_NAME doesn't exist in LMS
 2015-08-10 15:39:53 -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
5953debee1 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:45:09 -04:00
David Baumgold
8daf2a7854 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:40:40 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
Christina Roberts
4e9b7ea9ec Merge pull request #9235 from edx/christina/tnl-1776 
Handle case of video in a content library with no transcripts.
 2015-08-10 10:08:52 -04:00
Carson Gee
cb678b9c35 Merge pull request #8979 from mitocw/feature/cg/lti_provider_config 
Additional configuration options for LTI provider feature.
 2015-08-09 09:10:14 -04:00
Andy Armstrong
420696ba80 Separate out the Backbone image field 2015-08-08 09:43:20 -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
Brandon DeRosier
235c45f1fb Add the CcxMembership model back 2015-08-07 15:38:25 -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
cahrens
2b57603436 Handle case of video in a content library with no transcripts. 
This partially addresses TNL-1776
 2015-08-07 13:19:12 -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
Christina Roberts
dbe74ea340 Merge pull request #9221 from edx/christina/less-assets 
Christina/less assets
 2015-08-07 10:34:20 -04: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
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
cahrens
a7c06fd296 Allow image files to be cached. 2015-08-06 14:56: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
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
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