Commit Graph

2939 Commits

Author SHA1 Message Date
Renzo Lucioni
af1c560210 Program detail page touchups
Center cards and add padding around logos. ECOM-4871.
2016-07-05 13:38:07 -04:00
Renzo Lucioni
d738188550 Add upgrade section to program detail course cards.
Displays a message and link when a user is enrolled in a program's course run but must upgrade in order to be eligible for the program certificate. ECOM-4220.
2016-07-02 01:23:20 -04:00
Simon Chen
4fd7f2936a ECOM-4219 Add coming soon message styles to the course cards (#12890) 2016-06-30 15:39:24 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming""
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
2016-06-30 15:19:51 +05:00
Simon Chen
4911bf805f ECOM-4219 - Add the course states to course cards and make sure the display follows course states (#12844)
Please enter the commit message for your changes. Lines starting
2016-06-28 12:57:25 -04:00
Asad Iqbal
85b1f23a18 Merge pull request #12868 from edx/asadiqbal08/WL-538
WL-538 changes to make UI responsive
2016-06-28 11:59:59 +05:00
Chris
e90dad8af5 Merge pull request #12860 from edx/clrux/ac-398
AC-398 putting edx.org social media links in list, updating styles
2016-06-27 13:50:21 -04:00
Chris Rodriguez
62a6f891c4 AC-398 putting edx.org social media links in list, updating styles 2016-06-27 11:31:42 -04:00
asadiqbal
0d32f71113 WL-538 changes to make UI responsive 2016-06-27 17:34:37 +05:00
Chris Rodriguez
f9b8865367 Hiding focus outline on programmatically focusable els 2016-06-24 12:50:33 -04:00
Chris
b42a9ff4d9 Merge pull request #12716 from edx/clrux/ac-484
AC-484 changing aria- to data-, a to button
2016-06-24 06:19:46 -04:00
Chris Rodriguez
76df13487c AC-484 removing aria-activedescendent 2016-06-23 19:55:28 -04:00
Renzo Lucioni
157c68506d Merge pull request #12836 from edx/renzo/switch-cert-icon
Use SVG cert icon for program detail page certificate section
2016-06-23 17:28:45 -04:00
Eric Fischer
d3128f4d36 Masquerading staff override hidden special exams [TNL-4808] (#12806)
Allows staff using "view as specific student" mode to bypass edx-proctoring
hiding special exams from students, to allow for more useful debugging.

Includes "shim" pattern library implementation of alerts, and a bokchoy
test for this functionality.
2016-06-23 16:54:57 -04:00
Renzo Lucioni
c151761e64 Use SVG cert icon for program detail page certificate section
Part of ECOM-4224.
2016-06-23 16:39:58 -04:00
mdinino
0a7c534d56 Merge pull request #12824 from edx/release
Release
2016-06-22 11:31:34 -04:00
Renzo Lucioni
a240780b85 Merge pull request #12768 from edx/alasdair/ECOM-4224-certificate-messaging-for-program-course-cards
Front End for certificates
2016-06-21 16:58:15 -04:00
AlasdairSwan
619829d5b5 Program details front end for certificates
Part of ECOM-4224.
2016-06-21 13:20:40 -04:00
Brian Jacobel
6aba6219c3 Add a third fixed case where images could overflow (refs #12735) 2016-06-20 16:32:52 -04:00
Matt Drayer
a9cfa74650 Merge pull request #12775 from edx/asadiqbal08/WL-515
WL-515 Update Activate Account message page
2016-06-20 10:20:19 -04:00
asadiqbal
4e38b2e4e8 WL-515 Update Activate Account message page 2016-06-20 14:34:17 +05:00
Ben Patterson
d544340fde Merge pull request #12776 from edx/benp/remove-invalid-scss-calc
Remove invalid css syntax.
2016-06-16 13:35:38 -04:00
Ben Patterson
1044dd5965 Remove invalid css syntax.
This line can safely be removed since it does not impact
styling (nothing is being supplied to calculate).

Reference [here](http://www.w3schools.com/cssref/func_calc.asp)
2016-06-16 09:58:41 -04:00
Ben Patterson
602380e52d Remove improper scss syntax.
This was a typo that was missed, and is not resulting in any styling.

Removing it is a no-op.

The original committer does not work in this code anymore, and
it is old enough such that changing it would be more disruptive.
2016-06-16 08:38:14 -04:00
Chris Rodriguez
079b2df404 AC-455 adding main to PDF books 2016-06-15 14:05:31 -04:00
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -04:00
Brian Jacobel
5e0e337654 Fix overflowing images in forum posts/responses 2016-06-13 12:30:13 -04:00
clrux
0aa87b8a22 Merge pull request #12452 from edx/clrux/ac-414
AC-414 adding headings as first child to sections
2016-06-10 15:23:10 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
AlasdairSwan
a856325731 Stay Clean 2016-06-09 14:49:37 -04:00
Waheed Ahmed
b2f21ef4f3 Complete Order History tab for students on account settings page.
ECOM-2361
2016-06-08 21:45:07 +05:00
AlasdairSwan
a7cd4daee5 ECOM-4216 Styling the header 2016-06-07 10:53:00 -04:00
Eric Fischer
faa7f544d2 Bulk Email Cohorts (#12602)
Adds cohorts as valid bulk email targets.
2016-06-06 16:32:59 -04:00
Andy Armstrong
d8a8bacd91 Merge pull request #12639 from edx/andya/discussion-board-header
Add styling for content headers to the edx-platform
2016-06-06 13:46:40 -04:00
Andy Armstrong
3b05398022 Address code review feedback 2016-06-06 12:36:54 -04:00
Andy Armstrong
199c4c350b Support content headers for Pattern Library pages 2016-06-03 16:34:20 -04:00
Ibrahim
8c9ad0d338 fix 'explore new courses' button overlap issue 2016-06-03 20:02:16 +05:00
Andy Armstrong
7e2a174eec Move discussion board to the Pattern Library
TNL-4622
2016-06-02 12:48:12 -04:00
Simon Chen
928e4b46a0 ECOM-4218 Draft 2 to add course card styles (#12593)
ECOM-4218 Draft 2 to add course card styles
2016-06-01 16:42:03 -04:00
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301)
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
2016-05-26 14:22:04 -04:00
Simon Chen
c60cf3911c ECOM-4218 Draft 1 for Course Cards on program details page 2016-05-26 10:56:30 -04:00
AlasdairSwan
9d3bd8e9cf Merge pull request #12550 from edx/alasdair/ECOM-4216-program-details-header
ECOM-4216 Program Details Header View
2016-05-25 18:21:37 -04:00
AlasdairSwan
dd9d465772 ECOM-4216 Program Details Header View 2016-05-25 16:54:02 -04:00
Ahsan Ulhaq
fa7ed070b9 Merge pull request #12468 from edx/ahsan/ECOM-4398-Course-Dashboard-Visual-Update
Course Dashboard Visual Update
2016-05-24 18:07:02 +05:00
Ahsan Ulhaq
a8f2de8375 Course Dashboard Visual Update
ECOM-4398
2016-05-24 16:17:19 +05:00
Waheed Ahmed
dc4e4f7d6a Account settings navigation.
ECOM-2981
2016-05-24 15:44:39 +05:00
clrux
d98bc768df Merge pull request #12299 from edx/clrux/ac-413
AC-413 adding labels to form fields on Instructor dashboard membership page
2016-05-19 15:58:04 -04:00
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