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

11930 Commits

Author SHA1 Message Date
cahrens
bb910ca632 Add toggle_login_modal to list of base_application_js. 
TNL-3051
 2015-08-13 11:28:51 -04:00
Matt Drayer
f8f23240da Merge pull request #8996 from edx/ziafazal/SOL-1044 
ziafazal/SOL-1044: Custom Web Certificates
 2015-08-13 10:05:40 -04:00
Zia Fazal
2467d6971f ziafazal/SOL-1044: Database-Driven Certificate Templates 
* added certificate template model
* added certificate template asset model
* added django admin configs and migration
* initial LMS template matching logic
* improved LMS template matching
* improved LMS template matching and rendering logic
* address Django admin form/model load order incongruence
* add missing unique constraint migration.
 2015-08-13 08:01:34 -04:00
Peter Fogg
26bbbb967e Fix various team accessibility issues. 
Authors:
  - Peter Fogg
  - Daniel Friedman

TNL-1953
 2015-08-13 00:34:54 -04:00
Andy Armstrong
8bbf7c57ac Improve Teams tab navigation 2015-08-12 19:20:48 -04:00
Andy Armstrong
8bd1f69821 Govern team creation for non-privileged users 
TNL-2960

Non-privileged users can only be in one team, so don't
allow them to create new teams if they are already
members of another.
 2015-08-12 19:16:02 -04:00
Bill DeRusha
716c1f74cf Merge pull request #9237 from edx/bderusha/teams-expand-users-api-fix 
Team API include correct info when expanding users
 2015-08-12 15:27:48 -04:00
Christopher Lee
a8d937ce1f Merge pull request #9278 from edx/clee/dapi-update-mark-as-read 
Added optional mark_as_read field to comments in Discussion API
 2015-08-12 14:39:52 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975 
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
 2015-08-12 14:33:07 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release 
Release
 2015-08-12 13:06:39 -04:00
christopher lee
5b35ab3668 Added optional mark_as_read field to comments in Discussion API 
Currently when GETting comments, the thread of the comment will be
marked as read. This change makes this effect optional as well as
setting the default to not mark the thread as read.
 2015-08-12 12:25:06 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates 
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
 2015-08-12 07:09:46 -07:00
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
Peter Fogg
625781288a Merge pull request #9279 from edx/hotfix/2015-08-11-b 
Revert "Optimize OpenID Course Claims for non-global-staff users."
 2015-08-11 18:17:55 -04:00
Dennis Jen
72e6b8aaeb Revert "Optimize OpenID Course Claims for non-global-staff users." 
This reverts commit f0d1772da3.
 2015-08-11 17:06:22 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import" 
This reverts commit 4c1c4619f0.
 2015-08-12 02:06:09 +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
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
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