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

3744 Commits

Author SHA1 Message Date
John Eskew
e5a5704b38 Merge pull request #12495 from edx/jeskew/release_to_master_merge 
Merge release to master for 2016-05-17 release
 2016-05-17 17:16:16 -04:00
clrux
5db315bebf Merge pull request #12371 from edx/clrux/ac-405 
AC-405 calculator image to icon
 2016-05-17 17:11:56 -04:00
clrux
f7eba02808 Merge pull request #12411 from edx/clrux/ac-396 
AC-396 updating courseware nav to display correctly on high contrast displays
 2016-05-17 17:11:09 -04:00
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -04:00
AlasdairSwan
7a0d7818bc Offscreen a11y test fix 2016-05-17 15:41:28 -04:00
Matt Drayer
c6249f4227 mattdrayer/WL-466: Use LMS Courses API 2016-05-17 15:41:28 -04:00
AlasdairSwan
646d0b9b68 ECOM-4450 Added help tab and model styling to Pattern Library pages 2016-05-17 15:41:28 -04:00
Matt Drayer
fe1e659fb7 mattdrayer/rc/2016-05-17: Check for "code" on receipt line item attribute. 2016-05-17 15:41:27 -04:00
Ahsan Ulhaq
300002b54d Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-17 18:56:05 +05:00
Peter Desjardins
879fa212c7 Updated URLs for help topic links that had become stale. Per DOC-2568. 2016-05-16 14:30:17 -04:00
Hasnain
c5f0fb87c8 ML-446 / Aligned the labels in login and registration pages 2016-05-16 12:35:08 +00:00
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup 
ECOM-4215 adding setup for new program details page
 2016-05-12 18:25:13 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Chris Rodriguez
0dcd3d2da2 Simplifying styles 2016-05-12 15:45:07 -04:00
Ned Batchelder
1ef94b7694 Update translations (autogenerated message) 2016-05-12 14:48:44 +00:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-11 10:57:24 -04:00
AlasdairSwan
599070e5ef Merge pull request #12412 from edx/alasdair/program-listing-certificate-fix 
If not certificates remove the container element from the DOM
 2016-05-10 13:00:11 -04:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
Chris Rodriguez
6951497a16 AC-396 updating courseware nav to display correctly on high contrast displays 2016-05-10 08:23:36 -04:00
Tasawer
03e241ecc4 Update student verification area 
ECOM-3729
 2016-05-10 09:11:51 +00:00
sanfordstudent
40c74c3a7a Merge pull request #12406 from edx/sstudent/TNL-4530 
removing redundant fields from outline.selected event
 2016-05-09 15:18:24 -04:00
AlasdairSwan
4a9e7c748c Merge pull request #12380 from edx/alasdair/ECOM-4213-move-program-list-to-pattern-library 
Alasdair/ecom 4213 move program list to pattern library
 2016-05-09 15:05:55 -04:00
AlasdairSwan
2fe52df720 UPdated a11y approach for program card progress bars 2016-05-09 13:52:55 -04:00
Sanford Student
4e7a24e706 removing redundant fields rom outline.selected event 2016-05-09 13:24:32 -04:00
Renzo Lucioni
c697986a3e Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit f995114d11.
 2016-05-06 14:37:23 -04:00
Chris Rodriguez
cb19cdd256 AC-405 calculator image to icon 2016-05-06 12:48:44 -04:00
Simon Chen
e13ab68090 ECOM-4352 Update the min height of the title of the program cards 2016-05-05 15:21:07 -04:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
84412ef8ea Exclude translation files from coverage tracking. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files. 
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
 2016-05-05 22:42:00 +05:00
Usman Khalid
713c79e0aa Set included=false by default because we want to move towards RequireJs. 2016-05-05 22:39:59 +05:00
Usman Khalid
855fdbd387 Moved all logic from karma config files to karma.common.conf.js. 
The config files just declare lists of files.
 2016-05-05 22:38:34 +05:00
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
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
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -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