Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,367 Commits 1 Branch 0 Tags
76e66ff30fd790984cd28fddc85be8eb78057e79
Commit Graph

35367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Braden MacDonald
76e66ff30f Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-29 08:39:19 -05:00
Michael Frey
70ad954eec Merge pull request #11648 from edx/patch/2016-02-24 
Only allow ecommerce checkout if user is also activated
 2016-02-24 15:08:23 -05:00
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145) 
mathjax preview should be inline by default
 2016-02-24 12:51:30 -05:00
Adam Palay
2cb48742b2 mark discussion deletion test as flaky 2016-02-24 12:51:09 -05:00
Michael Frey
f1ebee433f Only allow ecommerce checkout if user is also activated 2016-02-24 11:23:40 -05:00
Michael Katz
44c27bb1bb Merge pull request #11606 from edx/rc/2016-02-23 
Release Candidate rc/2016-02-23
 2016-02-23 20:19:32 -05:00
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
Eric Fischer
5e380305ef keep version bumps 2016-02-23 10:06:13 -05:00
Eric Fischer
73fa3190cd Revert "Inform openassessment to clear submission" 
This reverts commit 920cc3d222.
 2016-02-22 17:32:44 -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
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
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
Mushtaq Ali
7a9991e95c Studio homepage escaping 2016-02-18 21:10:21 +05:00
Peter Pinch
dcb04cb092 Merge pull request #10877 from mitocw/enhancement/aq/add_master_course_staff_in_ccx 
Added staff and instructor roles on ccx to all the staff and instructors of the master course plus fixed view as student masquerade and display name of ccx on coach dashboard
 2016-02-18 11:09:37 -05:00
Zia Fazal
e8ccc2f3e5 Merge pull request #11076 from CredoReference/render-lms-main-navigation-with-template 
Render lms main navigation (tabs) with template
 2016-02-18 11:21:16 +05:00
Mark Sadecki
1a5fa4b73d removes alt attribute value 2016-02-17 17:14:26 -05:00
Bill DeRusha
b686abc18d Disable mailchimp integration for most segment identify requests 2016-02-17 17:10:48 -05:00
Ned Batchelder
080b7d7bbd Merge pull request #11572 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-02-17 16:31:18 -05:00
Ned Batchelder
6c3ae8245f Update translations (autogenerated message) 2016-02-17 20:12:36 +00:00
vkaracic
f58c2cd6b0 Otto checkout flow 2016-02-17 15:04:19 -05:00
Renzo Lucioni
62d07c91b5 Merge pull request #11541 from edx/renzo/manual-cert-trigger 
Add API endpoint for issuing programs certificates
 2016-02-17 15:04:13 -05:00
Clinton Blackburn
922269f0ed Merge pull request #11464 from mitocw/oauth-confirmation-views 
Added a UI for confirming OAuth Access.
 2016-02-17 15:02:07 -05:00
Justin Abrahms
885785d7f1 Added a UI for confirming OAuth Access. 
This will allow users to delegate permissions to a 3rd party service.
 2016-02-17 14:04:04 -05:00
Vedran Karačić
2312b222ec Merge pull request #11503 from edx/coupons/otto-checkout 
Checkout on Otto
 2016-02-17 19:57:02 +01:00
Renzo Lucioni
619420bb80 Add API endpoint for issuing programs certificates 
Allows staff users to manually enqueue the task responsible for awarding programs certificates. ECOM-3692.
 2016-02-17 13:52:27 -05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
Nimisha Asthagiri
eb914a00b4 Merge pull request #11564 from edx/release 
Release Feb 17, 2016
 2016-02-17 11:17:13 -05:00
Toby Lawrence
80c68e42b7 Merge pull request #11467 from edx/perf/speed-up-student-tests 
Switch to SharedModuleStoreTestCase in the 'student' app where possible.
 2016-02-17 11:15:53 -05:00
sanfordstudent
e4b59c3198 Merge pull request #11526 from edx/sstudent/MA-1882-update-api-regex 
MA-1882 adding course api to regex
 2016-02-17 10:21:51 -05:00
Ahsan Ulhaq
d90c1a2845 Merge pull request #11560 from edx/ahsan/ECOM-2831-GeneratedCertificates-admin-broken 
set show_full_result_count false
 2016-02-17 20:09:45 +05:00
Nimisha Asthagiri
71b3080908 Merge pull request #11532 from edx/rc/2016-02-16 
Release Candidate rc/2016-02-16
 2016-02-17 10:05:03 -05:00
Sanford Student
45f8e526c0 making check more generic 2016-02-17 09:22:27 -05:00
clrux
21aa7edd1c Merge pull request #9909 from edx/clrux/ac-179 
AC-179 fixing skip links
 2016-02-17 09:09:27 -05:00
Mushtaq Ali
b94204a8a4 Merge pull request #11452 from edx/mushtaq/ECOM-3615-fix-self-paced-scheduled-content 
Fix self paced course content visiblity
 2016-02-17 18:59:41 +05:00
Ahsan Ulhaq
88df456414 set show_full_result_count false 
ECOM-2831
 2016-02-17 18:10:40 +05:00
Chris Rodriguez
2a4e141e0e LMS: fixing skip links and adding a11y tests 2016-02-17 07:46:42 -05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Mushtaq Ali
5485d0c236 make is_course_self_paced default to False 2016-02-17 15:54:54 +05:00