Clinton Blackburn
|
868d962002
|
Merge branch 'release' into release-2016-05-03-conflict
|
2016-05-04 20:01:29 -04:00 |
|
AlasdairSwan
|
816882a130
|
Merge pull request #12358 from edx/alasdair/ECOM-4338-program-progress-a11y-update
Alasdair/ecom 4338 program progress a11y update
|
2016-05-04 19:41:49 -04:00 |
|
AlasdairSwan
|
f5d2499420
|
UPdated a11y approach for program card progress bars
|
2016-05-04 15:39:05 -04:00 |
|
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 |
|
Chris Rodriguez
|
433a9deff6
|
Overriding display table-cell on instructor dashboard
|
2016-05-03 11:50:28 -04: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 |
|
Usman Khalid
|
d851b2c951
|
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-05-02 13:09:30 -04:00 |
|
Ned Batchelder
|
b125922e65
|
Update translations (autogenerated message)
|
2016-05-02 13:09:29 -04:00 |
|
AlasdairSwan
|
afc5b47ebe
|
Renamed 'programId' to use 'id'
|
2016-05-02 13:09:27 -04:00 |
|
muzaffaryousaf
|
872d225921
|
Replace backbone-min to actual file.
|
2016-05-02 13:09:27 -04:00 |
|
Chris Rodriguez
|
8b068d9449
|
Removing the focus outline for the main container in LMS
|
2016-05-02 13:09:26 -04:00 |
|
AlasdairSwan
|
70fec21347
|
Adding program progress bar to program cards
|
2016-05-02 13:09:26 -04:00 |
|
Brian Jacobel
|
b98a361250
|
Use unminified picturefill in development
|
2016-05-02 13:09:26 -04:00 |
|
Ahsan Ulhaq
|
e08a26039f
|
Revert "Add js test for analytics event on LMS receipt page"
This reverts commit 785b752d19.
|
2016-05-02 13:09:25 -04:00 |
|
muhammad-ammar
|
762a6657fe
|
LMS fixes required to upgrade BackboneJS
|
2016-05-02 13:09:25 -04:00 |
|
muzaffaryousaf
|
95952d9b21
|
Upgrade backbone via npm.
TNL-4335
|
2016-05-02 13:09:25 -04:00 |
|
Ahsan Ulhaq
|
764f068452
|
Add js test for analytics event on LMS receipt page
ECOM-4281
|
2016-05-02 13:09:24 -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 |
|
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 |
|
Simon Chen
|
79332ed586
|
ECOM-4272 Add the cosmetic changes to the program listing page
|
2016-05-02 13:08:59 -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 |
|