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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rodriguez
fed39609d5 AC-400 removing tabindex from bookmark 2016-04-26 09:54:48 -04:00
Clinton Blackburn
6941fcd766 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-04-26 09:32:49 -04:00
Muddasser
2857e66239 Changed screenshots to incorporate firefox and chrome 2016-04-26 18:11:52 +05:00
Waheed Ahmed
61de4ffc71 Fixed celery task. 
ECOM-3437
 2016-04-26 17:37:02 +05:00
Muddasser
99cbf18e96 branch out at assert based on chrome and firefox 2016-04-26 16:20:32 +05:00
Ben Patterson
d0b8f5d4fd Merge pull request #12253 from edx/benp/flaky-condition 
Fix flaky condition related to settings page.
 2016-04-26 05:39:34 -04:00
Ibrahim Ahmed
8b014f2650 Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio 
WL-309 Add new text fields to Studio schedule and details settings page
 2016-04-26 14:30:43 +05:00
Awais Jibran
b4e8086397 Merge pull request #12049 from edx/aj/safe-templates 
Safe templates
 2016-04-26 09:40:31 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Matt Drayer
5adf6fec66 Merge pull request #12252 from edx/mattdrayer/microsite-override-ecommerce-api 
mattdrayer: Add microsite settings overrides
 2016-04-25 21:17:09 -04:00
Ben Patterson
6ee3ea68ba Fix flaky condition related to settings page. 2016-04-25 17:32:32 -04:00
Matt Drayer
fdd045b108 mattdrayer: Add microsite settings overrides 2016-04-25 17:09:11 -04:00
Andy Armstrong
ae52b9c468 Merge pull request #12057 from edx/alasdair/fedx-118-pattern-library-styles-with-current-partials 
Alasdair/fedx 118 pattern library styles with current partials
 2016-04-25 16:51:31 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Andy Armstrong
56d003e47e Merge pull request #12219 from stvstnfrd/staticfiles/cms 
Remove LMS_ROOT / static from cms/common.py
 2016-04-25 16:50:29 -04:00
Brian Jacobel
217ea5d074 remove usage of minifed Underscore.string 2016-04-25 16:24:51 -04:00
Ben Patterson
f53b900f06 Merge pull request #12248 from edx/benp/course-page-existence 
FEDX-88. Marking test as flaky.
 2016-04-25 16:14:53 -04:00
Nimisha Asthagiri
43be14beec Merge pull request #12247 from edx/tnl/block_structure_logging 
Change BlockStructure logging from DEBUG to INFO
 2016-04-25 16:04:17 -04:00
Brian Jacobel
e6875d3f22 Fix a UI issue with oauth page and the theme on edx.org 2016-04-25 15:38:14 -04:00
Brian Jacobel
060b5bf97d Update escaping and safe-templating usage 2016-04-25 15:08:16 -04:00
Brian Jacobel
ac37c12b7d This is what this string used to look like, to gettext 2016-04-25 15:08:16 -04:00
Brian Jacobel
3c944d2af3 Fix line wrapping here 2016-04-25 15:08:16 -04:00
Brian Jacobel
e576733608 Mako templates return context in .context_data rather than .context 2016-04-25 15:08:16 -04:00
Brian Jacobel
284cc17b1d Move manual refunds page to Mako 2016-04-25 15:08:16 -04:00
Brian Jacobel
784e200a2f OAuth grant screen converted to mako (3/4) 2016-04-25 15:08:16 -04:00
Brian Jacobel
422147ea5a Migrate password_reset_confirm.html to Mako (2/4) 2016-04-25 15:08:16 -04:00
Brian Jacobel
bda18f46c0 Convert password_reset_confirm.html to Mako 2016-04-25 15:08:16 -04:00
Brian Jacobel
5965091a89 Remove an old i18n JS include from the wiki that did nothing 2016-04-25 15:08:16 -04:00
Brian Jacobel
bceab97d77 The only JS the pages using this template need is base_application 2016-04-25 15:08:16 -04:00
Brian Jacobel
ae49f7a6d9 Fix a usage of a Mako thing that doesn't work here 2016-04-25 15:08:16 -04:00
Brian Jacobel
2bee02a10a Fix gettext errors by including /js/i18n/LANGUAGE_CODE/djangojs.js in Django template 2016-04-25 15:08:16 -04:00
Ben Patterson
9efdda83b1 FEDX-88. Marking test as flaky. 2016-04-25 14:35:34 -04:00
Brian Jacobel
00fcb9ddc1 Fix FEDX-167: Both math inputs and adaptive hints are sized correctly 2016-04-25 14:31:53 -04:00
Nimisha Asthagiri
40951bc7f5 Change BlockStructure logging from DEBUG to INFO 2016-04-25 14:30:50 -04:00
clrux
74db655ed9 Merge pull request #12239 from edx/clrux/ac-444 
AC-444 Adding legacy event_type for language menu events
 2016-04-25 13:58:44 -04:00
clrux
6aa76d3f9b Merge pull request #12199 from edx/clrux/ac-385 
AC-385 adding events for closed captions
 2016-04-25 13:58:16 -04:00
Andy Armstrong
c42b36ccd1 Fixes 2016-04-25 13:35:57 -04:00
Christine Lytwynec
7814e7c984 Merge pull request #12228 from edx/clytwynec/ac-367 
Fix start url format for paver pa11ycrawler
 2016-04-25 13:18:51 -04:00
Ben Patterson
54839cb725 Use bok-choy v0.5.2 for various improvements. 2016-04-25 12:09:04 -04:00
clrux
8e347f4078 Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links 
AC-342 sending skip links to single main, relevant
 2016-04-25 11:36:26 -04:00
Peter Fogg
687197481f Merge pull request #12154 from edx/peter-fogg/client-keys 
Generate API client keys.
 2016-04-25 11:05:01 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Waheed Ahmed
8baf58689a Merge pull request #12210 from edx/waheed/ecom-3437-enable-self-gen-certs-by-default-for-self-paced 
Automatically enable Self Generating Certificates for Self Paced Courses.
 2016-04-25 19:26:35 +05:00
Chris Rodriguez
2a23757fbc Sending skip links to single main, making more relevant 2016-04-25 10:00:45 -04:00
Peter Fogg
b9b67d1091 Generate API client credentials. 
ECOM-3946
 2016-04-25 09:27:04 -04:00
Chris Rodriguez
5137b9f8b6 Adding legacy event_type for language menu events 2016-04-25 08:58:43 -04:00
Waheed Ahmed
f246c6bbd6 Automatically enable Self Generating Certificates for Self Paced Courses. 
ECOM-3437
 2016-04-25 17:52:47 +05:00
Chris Rodriguez
6ea7545cc3 AC-385 adding events for closed captions 2016-04-25 08:29:08 -04:00
Awais Jibran
34b06932e5 Safe tempaltes 2016-04-25 16:30:09 +05:00
Ben Patterson
f7ec039bef Merge pull request #12100 from edx/benp/selenium-253-with-screenshots 
Bok-choy tests: use firefox 42.0, selenium 2.53.1
 2016-04-24 09:59:36 -04:00