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

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Fogg
1603a1ab4d Merge pull request #11366 from edx/peter-fogg/reenable-course-home-checks 
Reenable course home improvements check.
 2016-01-28 13:08:41 -05:00
Ned Batchelder
5ec74b7cb7 Merge pull request #11365 from edx/ned/add-note-to-edx-private 
Add a note to the top of edx-private.txt
 2016-01-28 13:04:28 -05:00
Douglas Hall
22430f610b Merge branch 'release' into hotfix/2016-01-28_release_into_master 2016-01-28 12:40:00 -05:00
Douglas Hall
cc01391ac5 Merge pull request #11362 from edx/hotfix/2016-01-28 
HOTFIX for PHX-245 Updated proctored/timed exam text
 2016-01-28 12:28:41 -05:00
Peter Fogg
6e6c397776 Reenable course home improvements check. 
This was disabled some time ago due to PLAT-900, which caused cached
objects to be unpickled and used in new code which could expect to
find new fields that didn't exist on the old objects. That issue is
now fixed.

ECOM-2853
 2016-01-28 11:33:45 -05:00
Ned Batchelder
a193fd0f5e Add a note to the top of edx-private.txt 2016-01-28 11:30:13 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Douglas Hall
2447540d5f Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes 2016-01-28 09:40:14 -05:00
Christine Lytwynec
092eae9ff3 Merge pull request #11130 from edx/clytwynec/ac-75 
AC-75 and AC-73
 2016-01-28 08:52:40 -05:00
wajeeha-khalid
8320653587 Merge pull request #11259 from edx/jia/MA-1930-featured-rebase 
MA-1930 add result count in paginated endpoints
 2016-01-28 17:19:36 +05:00
Ahsan Ulhaq
0c55f17d81 Merge pull request #11347 from edx/ahsan/credentials-feature-changes 
Credentials Feature changes reverted in release
 2016-01-28 15:28:49 +05:00
Awais Jibran
fc3511d7e4 Merge pull request #11335 from edx/aj/tnl4049-studio-dashbord-update-2 
Render CMS course listing Using CourseSummary for user with org access role
 2016-01-28 14:35:23 +05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization 
changes after feedback from matte
 2016-01-28 14:26:48 +05:00
Ahsan Ulhaq
9220420925 Add jwt auth in LMS 
ECOM-3419
 2016-01-28 14:00:58 +05:00
Awais Jibran
7d8936e328 Merge pull request #11346 from edx/aj/ecom-3525-add-logging-in-remove-user-from-cert-exception 
Add logging when user is removed from exception list
 2016-01-28 13:56:52 +05:00
wajeeha-khalid
e723fb6aec MA-1930 add result count in paginated endpoints 2016-01-28 13:41:27 +05:00
Matjaz Gregoric
434f196550 Remove default django template loaders. 
Mako filesystem/app_directories loaders already wrap default django template loaders.

Mako loaders delegate the `load_template_source` method to the base loader that
they wrap, so there's no reason to explicitly include the two django loaders in the settings.
 2016-01-28 09:33:09 +01:00
Tasawer
394601f301 Update 'certificate_url' field for view certificate on learner dashboard. 
ECOM-3281
 2016-01-28 13:08:38 +05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service 
ECOM-3278
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials 
ECOM-3015
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
8a280559dd Added configuration model for credentials 
ECOM-3033
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
b11e312d2c Create placeholder django apps for credentials 
ECOM-3057
 2016-01-28 13:05:49 +05:00
Clinton Blackburn
0b8145ee75 Merge pull request #11357 from edx/clintonb/ccx-fix 
Resolved ccx-keys dependency on edx-opaque-keys
 2016-01-27 22:55:13 -05:00
Ned Batchelder
d66f8d45da Merge pull request #11361 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-01-27 22:10:05 -05:00
Clinton Blackburn
d6f7fa18c6 Updated edx-user-state-client dependency 
New version uses edx-opaque-keys instead of opaque-keys.
 2016-01-27 18:52:45 -05:00
Clinton Blackburn
29f0a5b172 Updated XModule opaque-keys dependency 
Using edx-opaque-keys instead of opaque-keys
 2016-01-27 17:19:39 -05:00
Cliff Dyer
6595dfc2aa Merge pull request #11360 from edx/cdyer/track-push 
Track push notification activity in analytics
 2016-01-27 16:52:22 -05:00
Clinton Blackburn
0ddf46894a Resolved ccx-keys dependency on edx-opaque-keys 
ccx-keys has been updated to use the edx-opaque-keys library from PyPI, rather than simply expect the package to be pre-installed. The edx-opaque-keys version has been bumped as it was updated to export test packages needed by ccx-keys.
 2016-01-27 16:22:26 -05:00
Ned Batchelder
10998f5dd0 Update translations (autogenerated message) 2016-01-27 21:02:51 +00:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
J. Cliff Dyer
90493ac3a2 Track push notification activity in analytics 
When a course is updated, track whether or not a push notification is
sent.
 2016-01-27 20:33:21 +00:00
Ned Batchelder
1bbc2d0b95 Update translations (autogenerated message) 2016-01-27 20:32:13 +00:00
Nimisha Asthagiri
233deb27be Merge pull request #11340 from edx/hotfix/2016-01-26 
Hotfix for MA-1981 and safe sessions
 2016-01-27 14:51:09 -05:00
Peter Pinch
806048d4bb Merge pull request #11166 from mitocw/gdm_feature_ccx_actual_apis_#119 
CCX REST APIs
 2016-01-27 14:43:30 -05:00
Christine Lytwynec
8c8953fe32 Update discussion markdown editor add link and image modals 2016-01-27 14:43:29 -05:00
Andy Armstrong
71c24efb6c Merge pull request #11353 from edx/andya/ignore_node_modules 
Ignore node_modules when checking Python quality
 2016-01-27 14:41:18 -05:00
Andy Armstrong
4839bf4c21 Ignore node_modules when checking Python quality 2016-01-27 13:41:27 -05:00
Ben Patterson
f43e19615b Merge pull request #11333 from edx/benp/mgmt-command-enroll-in-course 
Enroll already-existing user to a course via management command.
 2016-01-27 12:39:39 -05:00
Ben Patterson
551eaaf706 Enroll already-existing user to a course via management command. 
Our current sandbox provisioning uses a create_user management command,
which creates and enrolls a user into a course. However, for TE-1128, we
will need a way to enroll the same user to multiple courses (which are
dynamic at time of provisioning). Using the existing management
command is no longer feasible for that, so we are using one that accesses
the enrollment API, which is the new standard for new enrollment capabilities.
 2016-01-27 11:49:31 -05:00
Giovanni Di Milia
e63194c1cd Added CCX REST APIs 
CCX REST APIs
OAUTH2 authorization for CCX APIs
- oauth2 authorization required for ccx list.
- Course-instructor permission for ccx api endpoint
- Protection for detail view too.

Tests for CCX REST APIs and OAUTH2 authorization
 2016-01-27 11:04:28 -05:00
Bill DeRusha
f59144b7e3 Merge pull request #11207 from edx/bderusha/yob-fix 
Update age calculation to be more conservative.
 2016-01-27 10:48:47 -05:00
Christine Lytwynec
9378c8ff28 Merge pull request #11245 from edx/clytwynec/tnl-4040 
Fix file upload in IE
 2016-01-27 09:44:11 -05:00
Douglas Hall
349b83f072 Merge pull request #11344 from edx/douglashall/PHX-241/upgrade_xblock_lti_consumer 
PHX-241 Upgrade xblock_lti_consumer
 2016-01-27 09:25:53 -05:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251 
Add the basis of configuring a cache TTL for course assets.
 2016-01-27 08:38:16 -05:00
Saleem Latif
7a1b8aec5d Remove stanford_theme_enabled from themes templates 2016-01-27 14:56:50 +05:00
Awais Jibran
0f2f1f2c17 Add logging when user is removed from exception list 
ECOM-3525
 2016-01-27 14:48:29 +05:00
Ahsan Ulhaq
7c8de429d9 Merge pull request #11337 from edx/ahsan/Update-edx-organizations-version 
Add latest edx-organization version in the platform
 2016-01-27 14:14:11 +05:00
Awais Jibran
793f916712 TNL-4049 
Specific user cannot access studio.edge.edx.org/home
 2016-01-27 14:12:26 +05:00
Ahsan Ulhaq
18c1f86a67 Add latest edx-organization version in the platform 2016-01-27 13:27:46 +05:00
Clinton Blackburn
aed41b1556 Merge pull request #11332 from edx/clintonb/opaque-keys-update 
Installing edx-opaque-keys from PyPI
 2016-01-26 21:57:54 -05:00