Commit Graph

13977 Commits

Author SHA1 Message Date
Chris Rodriguez
39e60a7b1a AC-400 removing tabindex from bookmark 2016-05-02 13:09:23 -04:00
Clinton Blackburn
e344bb6cd8 Updated access token view to return a JWT as an access token
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).

ECOM-4221
2016-05-02 13:09:23 -04:00
Waheed Ahmed
5628d162a6 Fixed celery task.
ECOM-3437
2016-05-02 13:09:23 -04:00
Brian Jacobel
0f90185766 remove usage of minifed Underscore.string 2016-05-02 13:09:22 -04:00
Brian Jacobel
71e49e5b59 Fix a UI issue with oauth page and the theme on edx.org 2016-05-02 13:09:22 -04:00
Brian Jacobel
63b5fb845d Update escaping and safe-templating usage 2016-05-02 13:09:22 -04:00
Brian Jacobel
d6cee8c65f This is what this string used to look like, to gettext 2016-05-02 13:09:22 -04:00
Brian Jacobel
44bd6bab04 Fix line wrapping here 2016-05-02 13:09:21 -04:00
Brian Jacobel
716062a876 Mako templates return context in .context_data rather than .context 2016-05-02 13:09:21 -04:00
Brian Jacobel
ced6fb5b52 Move manual refunds page to Mako 2016-05-02 13:09:21 -04:00
Brian Jacobel
4a9960e4b0 OAuth grant screen converted to mako (3/4) 2016-05-02 13:09:21 -04:00
Brian Jacobel
8f71ed12b1 Migrate password_reset_confirm.html to Mako (2/4) 2016-05-02 13:09:21 -04:00
Brian Jacobel
400f8beb1d Convert password_reset_confirm.html to Mako 2016-05-02 13:09:21 -04:00
Brian Jacobel
5ec2957167 Remove an old i18n JS include from the wiki that did nothing 2016-05-02 13:09:20 -04:00
Brian Jacobel
5ef63e0f1e The only JS the pages using this template need is base_application 2016-05-02 13:09:20 -04:00
Brian Jacobel
0f88fd2018 Fix a usage of a Mako thing that doesn't work here 2016-05-02 13:09:20 -04:00
Brian Jacobel
51de302ca5 Fix gettext errors by including /js/i18n/LANGUAGE_CODE/djangojs.js in Django template 2016-05-02 13:09:20 -04:00
Andy Armstrong
28b0305f8b Fixes 2016-05-02 13:09:20 -04:00
AlasdairSwan
3cbb2d1a08 FEDX-118 Adding header to test page 2016-05-02 13:09:19 -04:00
Chris Rodriguez
717b56a7b2 Sending skip links to single main, making more relevant 2016-05-02 13:09:19 -04:00
Peter Fogg
5a780e8019 Generate API client credentials.
ECOM-3946
2016-05-02 13:09:19 -04:00
Waheed Ahmed
921dc602ba Automatically enable Self Generating Certificates for Self Paced Courses.
ECOM-3437
2016-05-02 13:09:18 -04:00
Simon Chen
79332ed586 ECOM-4272 Add the cosmetic changes to the program listing page 2016-05-02 13:08:59 -04:00
J. Clifford Dyer
6a01f18e17 Update seq_* to edx.ui.lms.sequence.* format
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
2016-05-02 13:08:59 -04:00
John Eskew
e1d8347c21 Fix static tabs test. 2016-05-02 13:08:58 -04:00
John Eskew
6ea91d42b5 Remove another XML course test. 2016-05-02 13:08:58 -04:00
John Eskew
f0c1318041 Add XML_COURSE_DIRS back in. 2016-05-02 13:08:58 -04:00
John Eskew
a08f4d3cc3 Remove non-existent import. 2016-05-02 13:08:58 -04:00
John Eskew
971a198fb9 Remove ModuleStoreEnum.Type.xml 2016-05-02 13:08:57 -04:00
John Eskew
2380fa3c2c Unify usage of a single test mixed modulestore called:
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
2016-05-02 13:08:27 -04:00
John Eskew
39ac2579dc Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
2090f07344 Remove XML-backed course-specific test. 2016-05-02 13:08:26 -04:00
John Eskew
134fb9c269 Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
4106528e1a Fix toy course textbook test - use Mongo-backed test course. 2016-05-02 13:08:26 -04:00
John Eskew
71d7f1c81b Skip test with static tabs - seems broken. 2016-05-02 13:08:25 -04:00
John Eskew
dd159bce12 Import test course instead of using XML-backed course. 2016-05-02 13:08:25 -04:00
John Eskew
14a8314adc Remove include_xml option. 2016-05-02 13:08:25 -04:00
John Eskew
7987b16a18 Remove XML modulestore code - discovery work 2016-05-02 13:08:25 -04:00
Usman Khalid
0280b1713f Load jquery-ui by default in LMS suite. 2016-04-22 21:21:21 +05:00
Usman Khalid
51c5b981af Merge pull request #12204 from edx/fedx/krma-conf-tnl4102
Use Karma as test runner with Jasmine 2.4.
2016-04-22 20:28:01 +05:00
Ahsan Ulhaq
0cc0a4543f Merge pull request #12213 from edx/ahsan/ECOM-4101-Call-analytics-track-on-receipt-page
Call analytics.track on receipt page
2016-04-22 20:06:00 +05:00
Ehtesham
8603026795 making preprocessor files path absolute to have coverage reporter include file only once 2016-04-22 19:09:35 +05:00
Ehtesham
3507792b78 coverage fixes 2016-04-22 19:09:35 +05:00
Usman Khalid
fefc88b084 Post-rebase fixes. 2016-04-22 19:09:34 +05:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms.
TNL-4102
2016-04-22 19:09:27 +05:00
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates
Updating cookies settings
2016-04-22 07:25:09 -04:00
M. Rehan
d659dd9f6d Merge pull request #12068 from edx/mrehan/sust-40-reduce-peroblem-get-ajax
SUST-40 – Eliminate unwanted problem_get ajax requests flooding the LMS.
2016-04-22 14:59:22 +05:00
Ahsan Ulhaq
3bfaf6030f Call analytics.track on receipt page
ECOM-4101
2016-04-22 14:31:19 +05:00
Giovanni Di Milia
090cefcf44 Added REST API for certificates in LMS (#12055) 2016-04-21 17:15:06 -04:00