Commit Graph

5610 Commits

Author SHA1 Message Date
Chris
ff242a3eac Merge pull request #12694 from edx/clrux/ac-454-repeat
AC-454 visual indicator in video menus + safe transcripts
2016-06-14 08:46:47 -04:00
Chris Rodriguez
55d84d34b8 AC-454 adding visual clarify for selected menu options 2016-06-14 07:53:15 -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
Awais Jibran
8d40dcd0f4 Fix remove user from cert-exception list
ECOM-4650
2016-06-13 18:50:16 +05:00
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release
Merge hotfix-2016-06-10 release into master
2016-06-10 16:01:23 -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
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
AlasdairSwan
1ff0a3b45e Merge pull request #12709 from edx/alasdair/ECOM-4469-modals-sass-cleanup
Clean up the help tab Sass included on Pattern Library pages
2016-06-10 06:22:23 -04:00
AlasdairSwan
a856325731 Stay Clean 2016-06-09 14:49:37 -04:00
Ned Batchelder
78f2d9e1eb Update translations (autogenerated message)
Update translations (autogenerated message)
2016-06-09 12:00:04 -04:00
Ahsan Ulhaq
b00ce0282a Merge pull request #12679 from edx/ahsan/ECOM-4544-Financial-Assistance-Form-Updates
Financial Assistance Form Updates
2016-06-08 23:53:05 +05:00
Waheed Ahmed
b2f21ef4f3 Complete Order History tab for students on account settings page.
ECOM-2361
2016-06-08 21:45:07 +05:00
Ahsan Ulhaq
7e88a88604 Financial Assistance Form Updates
ECOM-4544
2016-06-08 21:18:49 +05:00
Tasawer
38104eb6ed Update Receipt page
ECOM-4559
2016-06-08 18:00:47 +05:00
Eric Fischer
0c3468a067 Use edx.HtmlUtils properly in incourse_reverify_view 2016-06-07 13:15:23 -04: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
Renzo Lucioni
f8be1ed168 Merge pull request #12657 from edx/renzo/include-listing-url
Include program listing URL on detail pages
2016-06-06 14:25:43 -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
Renzo Lucioni
f913cc52c4 Include program listing URL on detail pages
Replaces the hardcoded URL in favor of a URL passed by the server.
2016-06-06 13:45:18 -04:00
Andy Armstrong
3b05398022 Address code review feedback 2016-06-06 12:36:54 -04:00
Matt Drayer
d655e6b6f6 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-06 07:45:59 -04:00
Ibrahim Ahmed
0a84b65dcb Merge branch 'master' into ibrahimahmed443/MAYN-280-explore-new-courses-button-fix 2016-06-06 15:55:21 +05:00
Andy Armstrong
199c4c350b Support content headers for Pattern Library pages 2016-06-03 16:34:20 -04:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00
Renzo Lucioni
93ba637e5f Merge pull request #12638 from edx/renzo/fix-failing-a11y
Fix program details a11y test
2016-06-03 13:00:13 -04:00
Renzo Lucioni
9c4a3dc9c7 Fix program details a11y test 2016-06-03 11:32:07 -04:00
Ibrahim
8c9ad0d338 fix 'explore new courses' button overlap issue 2016-06-03 20:02:16 +05:00
Ned Batchelder
d0dcfe12e4 Merge pull request #12621 from edx/ned/update-translations
Update translations (autogenerated message)
2016-06-02 19:52:51 -04:00
Andy Armstrong
7e2a174eec Move discussion board to the Pattern Library
TNL-4622
2016-06-02 12:48:12 -04:00
Ned Batchelder
64828c48c8 Update translations (autogenerated message) 2016-06-02 14:36:45 +00:00
Waheed Ahmed
c8d23c1603 Fixed i18n issues, follow up PR for "Account Settings Navigation".
ECOM-4582
2016-06-02 15:22:32 +05: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
ssemenova
36c867c42a changed icon html from <i> to <span>
TNL-4651
2016-05-31 15:46:23 -04:00
Andy Armstrong
42f44848e5 Merge pull request #12585 from edx/andya/course-navigation-safe-template
Refactor staff preview menu logic out of template
2016-05-31 14:05:24 -04:00
Brian Jacobel
53d31551f6 Merge pull request #12591 from edx/bjacobel/forgot_password_empty
File doesn't do anything
2016-05-31 11:39:05 -04:00
Andy Armstrong
7ee41eafb3 Refactor staff preview menu logic out of template 2016-05-31 11:36:40 -04:00
Brian Jacobel
a799da96f1 This file is empty and hasn't been touched since 2012 2016-05-31 10:27:13 -04:00
Christina Roberts
880206e438 Merge pull request #12577 from edx/christina/4642
Add missing file.
2016-05-31 08:48:40 -04:00
cahrens
3aa7a313fc Move file to common directory.
It is needed by both Studio and LMS.
TNL-4642

x
2016-05-30 12:43:46 -04:00
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05: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
Ned Batchelder
ff6e9b7f3f Merge pull request #12570 from edx/ned/update-translations
Update translations (autogenerated message)
2016-05-26 12:38:27 -04:00
Ned Batchelder
10f7c9bb2f Update translations (autogenerated message) 2016-05-26 15:57:37 +00: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
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo)
Simplify paths in karma_cms_squire require paths
2016-05-24 16:53:59 -04:00