Commit Graph

3647 Commits

Author SHA1 Message Date
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
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
tasawernawaz
b4e1e97185 ECOM-3201
Updated dashboard UI for empty list of courses and programs
2016-04-18 08:48:21 +00:00
Awais
54058f6e58 Adding background image for xseries certificates on programs dashboard side bar panel.
ECOM-3199
2016-04-18 12:50:08 +05:00
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00
Ned Batchelder
a2b06dc617 Merge pull request #12159 from edx/ned/update-translations
Update translations (autogenerated message)
2016-04-15 09:41:51 -04:00
tasawernawaz
00d2d6d20d Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated
Updated dashboard UI for empty list of courses and programs
2016-04-15 13:08:24 +05:00
tasawernawaz
ba6ba40e2e ECOM-3201
Updated dashboard UI for empty list of courses and programs
2016-04-15 06:50:03 +00:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master
Manually merge release into master
2016-04-15 00:47:54 -04:00
Andy Armstrong
60fab86f01 Reconcile double reverts
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
2016-04-14 23:28:55 -04:00
clrux
0c9f9d4682 Merge pull request #11438 from edx/clrux/ac-329
AC-329 making closed-captions draggable
2016-04-14 17:20:36 -04:00
Ned Batchelder
958795d5cb Update translations (autogenerated message) 2016-04-14 16:44:22 -04:00
Simon Chen
582debcd58 Merge pull request #12135 from edx/schen/ECOM-3195
ECOM-3195 Edit the navigation header on dashboard to expose program listing page
2016-04-14 15:51:19 -04:00
Chris Rodriguez
df5520bdf9 Video player: adding Dragabilly to closed captions
* tests for dragging
* icon location reference updates
* pattern library usage
2016-04-14 15:29:38 -04:00
Simon Chen
75951b5936 ECOM-3195 Edit the navigation header on dashboard to expose program listing page 2016-04-14 14:44:40 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
AlasdairSwan
1c3868ef59 Update program listing page's sidebar implementation to move to more self-contained subviews
s/our/your
2016-04-14 13:50:17 -04:00
tasawernawaz
e962a39ef7 Revert "ECOM-3201"
This reverts commit 628843f62c.
2016-04-14 14:23:41 +00:00
Tasawer
628843f62c ECOM-3201
Updated dashboard UI for empty list of courses and programs
2016-04-14 10:48:21 +00:00
Peter Fogg
56ca0e90f2 Merge pull request #12085 from edx/peter-fogg/improve-api-request-ui
API request page improvements.
2016-04-12 15:58:49 -04:00
Peter Fogg
0da55b0f0e Add the real terms of service to our API request page, and improve UI.
ECOM-4024
2016-04-12 14:05:31 -04:00
Bound3R
4ddcf31ad8 change css properties for mixins bi-aap in about template
remove unnecessary parentheses

change css properties for mixins bi-aap in login/register page

change css properties for mixins bi-app in about course page

change css properties for mixins bi-app in the dashboard

change css properties for mixins bi-app in help template

change css properties for mixins bi-app in the home page

change css properties for mixins bi-app in jobs, press and media pages

remove the extra spaces
2016-04-12 12:59:53 -05:00
Peter Fogg
7864ec1c2c Merge pull request #12109 from edx/peter-fogg/course-home-a11y-test
Add a11y test for the course home page.
2016-04-12 10:04:28 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
2016-04-12 08:22:14 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198
ECOM-3198 Add banner image to the program listing program cards
2016-04-11 16:00:03 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Peter Fogg
beb3c19722 Add a11y test for the course home page. 2016-04-11 14:28:06 -04:00
Andy Armstrong
fd3a87a2cf Merge pull request #12102 from edx/andya/pattern-library-test-page-take-2
Introduce Pattern Library test pages (take two)
2016-04-11 10:28:25 -04:00
Vedran Karacic
733f7375f6 Lower padding on header for 320 breakpoint 2016-04-11 13:20:40 +00:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 11:41:04 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
Simon Chen
b5b7ea7884 Create the listing page of Programs (x-series) which learners have enrolled in 2016-04-05 10:10:19 -04:00