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

35334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Mushtaq Ali
d3fc2625d0 Code refactor pass store_type in course create method 2016-02-17 12:53:12 +05:00
Robert Raposa
6cc8bbffb6 Merge pull request #11059 from edx/robrap/TNL-3425 
Properly escape Studio base.html
 2016-02-16 16:19:45 -05:00
Toby Lawrence
d3c88d7079 Merge pull request #11552 from edx/perf/speed-up-contentstore-tests 
Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible.
 2016-02-16 14:10:22 -05:00
Nimisha Asthagiri
c7b049bef0 Merge pull request #11558 from edx/aamir-khan/ECOM-3706-verify-now-button-issue-fix-rc 
Aamir khan/ecom 3706 verify now button fix
 2016-02-16 13:54:05 -05:00
srpearce
b9ccff7549 Merge pull request #11557 from edx/sylvia/DOC-2692-2 
Update screenshot for Help modal on Pages page
 2016-02-16 13:37:11 -05:00
Robert Raposa
b69c6d62bf Make base.html Mako template safe by default 
Make base.html Mako template safe by default by:
1. Add page-level default of html escaping
2. Fix escaping of all variables in base.html
3. Fix escaping of all dependent underscore templates
Also includes additional best practices for certificates and
textbooks JavaScript/Underscore in order to complete that work.

TNL-3425
 2016-02-16 13:19:24 -05:00
aamir-khan
b6604a3a70 ECOM-3706: Updated the hard coded datetimes in tests and also added the test for restricting credit direct sale 2016-02-16 13:14:44 -05:00
aamir-khan
f7be42a135 ECOM-3706: Restricted the enrollment in credit modes directly in upgradeAndVerified flow 2016-02-16 13:14:44 -05:00
Nimisha Asthagiri
52b39ca4f5 Merge pull request #11554 from edx/revert-old-commits 
Undo inadvertent commits
 2016-02-16 13:06:42 -05:00
Simon Chen
3fa62a6ff6 Merge pull request #11416 from edx/schen/ECOM-3177 
ECOM-3177 fix flaky js tests on dashboard.TrackEvents
 2016-02-16 12:45:22 -05:00
Kelketek
ddd7b61734 Merge pull request #11364 from edx/kelketek/drag-and-drop 
Add Drag-and-drop XBlock to requirements.
 2016-02-16 10:46:31 -06:00
Sylvia Pearce
a858bb9b0f Update screenshot for Help modal on Pages page 2016-02-16 11:41:46 -05:00
Toby Lawrence
af102a6919 Remove duplicate test setup. 2016-02-16 11:30:46 -05:00
srpearce
b68beea4df Merge pull request #11508 from edx/sylvia/DOC-2692 
Update help text for Pages page in Studio to reflect Courseware-Course etc change
 2016-02-16 11:12:04 -05:00
Simon Chen
4b8a737168 Merge pull request #11553 from edx/schen/ECOM-3640 
ECOM-3640 add a new info log message on program certificate task to mark successful task completion
 2016-02-16 10:58:38 -05:00
Simon Chen
f6fc711cb6 ECOM-3177 fix the flaky js test by doing dependency injection 2016-02-16 15:58:23 +00:00
Toby Lawrence
0d040bc051 Fix a mistake with initializing something in the test setup. 2016-02-16 10:20:57 -05:00
Toby Lawrence
fe545e058f Quality fixes. 2016-02-16 10:12:29 -05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Nimisha Asthagiri
ed19789708 Undo inadvertent commits. 2016-02-16 09:59:50 -05:00
Simon Chen
2f595c111f ECOM-3640 add a new info log message on program certificate task to mark successful task completion 2016-02-16 14:48:55 +00:00
Toby Lawrence
e2cbb547b1 Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible. 2016-02-16 09:39:00 -05:00
Awais Jibran
31853d49cc Merge pull request #11495 from edx/aj/tnl4115-improve-log-get-course-section 
Use Course ID in logging an exception
 2016-02-16 18:56:50 +05:00
Zia Fazal
57af11c0f0 Merge pull request #11548 from edx/ziafazal/fix-get-template-path 
WL-320: fixed get_template_path to work with absolute path also
 2016-02-16 18:47:45 +05:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Zia Fazal
6cd265751a fixed get_template_path to work with absolute path also 
fixed quality violation

skipped test in CMS

changes after feedback from mattd
 2016-02-16 11:52:19 +05:00
Toby Lawrence
ead2f0477b Quality fixes. 2016-02-15 21:18:53 -05:00
Jonathan Piacenti
97593f1966 Add Drag-and-drop XBlock to requirements. 2016-02-15 16:28:34 -06:00