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

3680 Commits

Author SHA1 Message Date
tasawernawaz
6d315a9a50 Merge pull request #12324 from edx/tasawer/story/ecom-3731-update-browse-new-courses-area 
Update browser new course area
 2016-05-04 00:01:42 +05:00
Tasawer
4a18ec8041 ECOM-3731 update browser new course area 2016-05-03 15:14:32 +00:00
AlasdairSwan
2c8f3c8046 Styled footer on pattern library pages 2016-05-03 10:32:35 -04:00
Christina Roberts
f0f0645007 Merge pull request #12278 from edx/christina/cohort-messages 
Add messaging when verified track content MVP is enabled.
 2016-05-03 10:14:15 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
Ned Batchelder
1a2ba1a533 Reduce the use of 'Open edX' as a noun 2016-05-02 12:44:28 -04:00
Ahsan Ulhaq
f995114d11 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-02 13:15:18 +05:00
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting 
When using RequireJS load spec files one by one.
 2016-04-29 17:09:57 +05:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-04-29 15:54:47 +05:00
Ned Batchelder
4cc4e6559c Merge pull request #12295 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-28 12:22:33 -04:00
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
AlasdairSwan
61a5cd4d8f Renamed 'programId' to use 'id' 2016-04-28 09:44:08 -04:00
clrux
1aab751609 Merge pull request #12284 from edx/clrux/removing-outline-from-main 
Removing the focus outline for the main container in LMS
 2016-04-28 07:19:49 -04:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +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
Chris Rodriguez
746cae2c9a Removing the focus outline for the main container in LMS 2016-04-27 14:32:37 -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
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
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
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
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
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
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
Simon Chen
f1e79c0b9b ECOM-4272 Add the cosmetic changes to the program listing page 2016-04-22 14:52:13 -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
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
Ahsan Ulhaq
3bfaf6030f Call analytics.track on receipt page 
ECOM-4101
 2016-04-22 14:31:19 +05:00
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00:00
Adam
88192fd444 Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" 2016-04-20 19:21:14 +05:00
Jesse Zoldak
270814102f Revert "Adding background image for xseries certificates on dashboard side bar panel" 2016-04-19 13:52:19 -04:00
Awais Qureshi
298770e51b Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view 
Adding background image for xseries certificates on dashboard side bar panel
 2016-04-18 16:22:11 +05:00