Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,514 Commits 1 Branch 0 Tags
048f73be6d856ec57df551dbf29974bf942dc29d
Commit Graph

14003 Commits

Author SHA1 Message Date
Waheed Ahmed
b7b4e0b041 Added Kosovo in django country list. 
ECOM-4292
 2016-04-28 00:17:06 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Brian Jacobel
19b9242986 Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates 
Fix errors in old Django templates / migrate to Mako
 2016-04-27 13:39:54 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix 
Fix Next Button's 404 error
 2016-04-27 13:18:39 -04:00
Brian Jacobel
0f1366a7fb Merge pull request #12251 from edx/bjacobel/use-unminified-assets 
Use unminified picturefill in development
 2016-04-27 12:12:43 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal 
Remove XML modulestore code from most tests.
 2016-04-27 11:20:02 -04:00
Brian Jacobel
12d65f5801 Use unminified picturefill in development 2016-04-27 10:23:07 -04:00
Ahsan Ulhaq
edb356a43a Merge pull request #12273 from edx/ahsan/revert-ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page 
Revert "Add js test for analytics event on LMS receipt page"
 2016-04-27 18:38:45 +05:00
John Eskew
8354e6d79c Fix quality issue. 2016-04-27 09:27:36 -04:00
Renzo Lucioni
63b65ab035 Merge pull request #12231 from edx/renzo/program-progress 
Measuring program progress
 2016-04-27 09:24:09 -04:00
Ahsan Ulhaq
5f6474ac7d Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit 785b752d19.
 2016-04-27 17:38:51 +05:00
Muzaffar yousaf
d97b3cbd1f Merge pull request #12037 from edx/fedx/upgrade-backbone 
Upgrade backbone via npm.
 2016-04-27 17:31:00 +05:00
clrux
c6a4c23123 Merge pull request #12260 from edx/clrux/ac-400 
AC-400 removing tabindex from bookmark
 2016-04-27 07:23:30 -04:00
Ahsan Ulhaq
be6aea179a Merge pull request #12238 from edx/ahsan/ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page 
Add js test for analytics event on LMS receipt page
 2016-04-27 15:33:29 +05:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error 
MA-2305
 2016-04-26 20:21:08 -04:00
Brian Jacobel
90499e77f1 Merge pull request #12250 from edx/bjacobel/underscore.string-removal-v2 
remove usage of minifed Underscore.string
 2016-04-26 16:40:19 -04:00
Ahsan Ulhaq
785b752d19 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-04-27 00:35:06 +05:00
Renzo Lucioni
5da6a598dd Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-04-26 13:36:58 -04:00
Clinton Blackburn
3138ff9724 Merge pull request #12194 from edx/clintonb/jwt-oauth-access-token 
Updated access token view to return a JWT as an access token
 2016-04-26 12:35:32 -04:00
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
Waheed Ahmed
61de4ffc71 Fixed celery task. 
ECOM-3437
 2016-04-26 17:37:02 +05: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
Brian Jacobel
217ea5d074 remove usage of minifed Underscore.string 2016-04-25 16:24:51 -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
Andy Armstrong
c42b36ccd1 Fixes 2016-04-25 13:35:57 -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
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
Waheed Ahmed
f246c6bbd6 Automatically enable Self Generating Certificates for Self Paced Courses. 
ECOM-3437
 2016-04-25 17:52:47 +05:00
Simon Chen
7791e7fc1d Merge pull request #12230 from edx/schen/ECOM-4272 
ECOM-4272 Add the cosmetic changes to the program listing page
 2016-04-22 17:01:02 -04:00
Simon Chen
f1e79c0b9b ECOM-4272 Add the cosmetic changes to the program listing page 2016-04-22 14:52:13 -04:00
J. Clifford Dyer
001874c42e 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-04-22 13:38:41 -04:00