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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
67b128dfe0 Merge pull request #11625 from edx/efischer/revert_ora_release 
Revert "Inform openassessment to clear submission"
 2016-02-23 11:38:00 -05:00
Michael Frey
25919f7d57 Merge pull request #11615 from edx/SOL-1652 
Only allow ecommerce checkout if user is also activated
 2016-02-23 11:17:52 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Eric Fischer
5e380305ef keep version bumps 2016-02-23 10:06:13 -05:00
Ben Patterson
1ba360d987 Merge pull request #11629 from edx/benp/TNL-4151-flaky-test 
Flag test as flaky. See TNL-4151.
 2016-02-23 10:05:33 -05:00
Christine Lytwynec
0f66d852c2 Merge pull request #11581 from edx/clytwynec/ac-327 
Sequence navigation tooltip mechanism updated
 2016-02-23 09:28:32 -05:00
Your Name
b1751e70c3 User automatically registered to course. 2016-02-23 19:07:19 +05:00
Ben Patterson
a11ca6cd91 Merge pull request #11618 from edx/benp/library-test-flaky-fix 
Ensure test waits for the library list to populate before continuing.
 2016-02-23 08:51:22 -05:00
Ben Patterson
de45c0d36d Flag test as flaky. See TNL-4151. 2016-02-23 08:20:06 -05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops 
Don't blow away the role cache when updating.
 2016-02-23 06:55:00 -05:00
Ned Batchelder
c59db6e5fc Merge pull request #11622 from eduNEXT/Bound3R/url_static-path 
missing change the url path to the sass variable
 2016-02-22 19:59:22 -05:00
Pan Luo
4c7e3fd2e3 Update UBCPI Xblock to 0.5.1 2016-02-22 15:12:41 -08:00
Renzo Lucioni
5094fec6dc Merge pull request #11559 from edx/renzo/update-organizations 
Bump edx-organizations version to 0.4.0
 2016-02-22 18:08:41 -05:00
Eric Fischer
73fa3190cd Revert "Inform openassessment to clear submission" 
This reverts commit 920cc3d222.
 2016-02-22 17:32:44 -05:00
Qubad786
b669765cee TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters 2016-02-23 02:39:22 +05:00
Michael Katz
bf5d2034a1 Revert "Added staff role on ccx to staff of master course and added a data migration for existing ccx courses." 
This reverts commit 91bf48fc8c.
 2016-02-22 15:33:01 -05:00
Bound3R
b0b977ba7f missing change the url path to the sass variable 2016-02-22 15:30:53 -05:00
Renzo Lucioni
79a4d6ce47 Bump edx-organizations version to 0.4.0 
Also install djangorestframework-oauth 1.1.0 from PyPI
 2016-02-22 15:19:31 -05:00
Christine Lytwynec
3f6b7cb004 Sequence navigation tooltip mechanism updated 2016-02-22 14:13:36 -05:00
Nimisha Asthagiri
03487073aa Merge pull request #11579 from edx/course_blocks_api/support_substructure 
Course Blocks API: Support accessing a substructure MA-1604
 2016-02-22 13:38:01 -05:00
Alison Hodges
364463160f Merge pull request #11589 from edx/ahodges/DOC-2717 
Fixes DOC-2717 for Jennifer
 2016-02-22 13:14:30 -05:00
Alison Hodges
5e62e937d6 Fixes DOC-2717 for Jennifer 2016-02-22 12:26:11 -05:00
Omar Khan
a1301ded69 Merge pull request #11544 from open-craft/omar/remove-newrelic-handler 
Remove newrelic logging handler
 2016-02-22 23:56:16 +07:00
Nimisha Asthagiri
70469c16b2 Block Structure API: Replace has_block with __contains__ 2016-02-22 11:25:46 -05:00
Ben Patterson
3afc2a9fa7 Ensure test waits for the library list to populate before continuing. 2016-02-22 10:01:03 -05:00
John Eskew
df261cd5d6 Remove all request.REQUEST usages - replace with request.GET and/or 
request.POST to eliminate Django deprecation messages.
 2016-02-22 09:54:26 -05:00
Amir Qayyum Khan
2ee9105017 Fixes bug where coach with multiple CCXs can't view coach dashboard 2016-02-22 18:59:07 +05:00
Ibrahim
c503c236a9 add student email in credit service 2016-02-22 14:45:25 +05:00
Zubair Afzal
040578b315 Merge pull request #11599 from edx/zub/feature-flag-jwt-auth 
enable jwt auth with feature flag
 2016-02-20 03:54:18 +05:00
zubair-arbi
182826261d enable jwt auth with feature flag 2016-02-20 02:31:51 +05:00
Christine Lytwynec
41febaa875 Merge pull request #11565 from edx/clytwynec/ac-234 
Remove hgroup usage
 2016-02-19 16:06:22 -05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code 
Mobile API: remove unused endpoints
 2016-02-19 15:14:13 -05:00
Christine Lytwynec
a2645b639a Change .heading-group>h2 to .heading-group>p 2016-02-19 13:48:14 -05:00
Douglas Hall
8f7c158f12 Merge pull request #11594 from edx/douglashall/edx_proctoring_0_12_10 
Upgraded edx-proctoring to 0.12.10
 2016-02-19 08:04:31 -05:00
Usman Khalid
4be5aeb194 Merge pull request #11550 from edx/muzaffar/tnl4013 
Using display_name_with_default  instead of display_name.
 2016-02-19 17:51:27 +05:00
muzaffaryousaf
509522414a Using display_name_with_default instead of display_name. 
TNL-4103
 2016-02-19 16:50:23 +05:00
Kevin Falcone
3a296a9183 Don't delete the whole db cache dir 
It also contains the lettuce caches.
 2016-02-18 22:43:47 -05:00
Douglas Hall
4a246dd134 Upgraded edx-proctoring to 0.12.10 2016-02-18 21:06:14 -05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release 
Release
 2016-02-18 17:19:29 -05:00
Eric Fischer
09d0f435ce Merge pull request #11422 from edx/efischer/reset_state_fix 
Reset state fix
 2016-02-18 17:08:44 -05:00
Adam
5f0d969b8b Merge pull request #11585 from edx/hotfix/2016-02-18-mathjax 
update mathjax to 2.6 (TNL-4104) and (TNL-4094)
 2016-02-18 15:43:09 -05:00
Eric Fischer
920cc3d222 Inform openassessment to clear submission 
The openassessment xblock stores some information that assumes
a given student module is never cleared, it needs to be informed of
this operation.
 2016-02-18 15:41:13 -05:00
Michael Frey
5903ef832c Merge pull request #11584 from edx/release 
Merging release back to master
 2016-02-18 14:55:25 -05:00
Matjaz Gregoric
f4e462c728 Merge pull request #11316 from open-craft/remove-django-template-loaders 
Remove default django template loaders.
 2016-02-18 20:38:47 +01:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094) 
update mathjax class names to support common html, html-css, and svg
 2016-02-18 14:13:34 -05:00
Michael Frey
da0992b4e8 Merge pull request #11570 from edx/patch-2016-02-17 
Patch release 2016-02-17
 2016-02-18 13:39:20 -05:00
Mark Sadecki
94d5b5dba3 Merge pull request #11576 from edx/cptvitamin/AC-332 
removes unnecessary alt attribute value (empty value is more appropriate)
 2016-02-18 13:26:47 -05:00
Mushtaq Ali
689bb73b84 Merge pull request #11551 from edx/mushtaq/fix-tnl4006 
Studio homepage escaping
 2016-02-18 22:52:01 +05:00
Nimisha Asthagiri
c088df0835 Remove unused Mobile latest_updates field 2016-02-18 12:12:05 -05:00
Nimisha Asthagiri
deb9148f64 Remove unused Mobile CourseBlocksAndNavigation endpoint. 2016-02-18 12:12:05 -05:00