Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

4736 Commits

Author SHA1 Message Date
Ned Batchelder
dd9139374f Update translations (autogenerated message) 2016-06-23 15:29:59 +00:00
E. Kolpakov
2b8c02a759 Discussion coffee files to JS 2016-06-23 11:05:36 -04:00
Clinton Blackburn
d7c570aacd Corrected name of static file (#12817) 
ECOM-4610
 2016-06-22 15:07:40 -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
Andy Armstrong
037e27b268 Merge pull request #12208 from edx/andya/use-ui-toolkit-helpers 
Use the UI Toolkit's spec helpers
 2016-06-21 10:55:26 -04:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Renzo Lucioni
10ad29f33c Merge pull request #12757 from edx/renzo/link-to-detail 
Link program listing cards to detail pages
 2016-06-21 09:37:02 -04:00
Renzo Lucioni
9cd7c93223 Link program listing cards to detail pages 
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
 2016-06-20 16:34:57 -04:00
Brian Jacobel
6aba6219c3 Add a third fixed case where images could overflow (refs #12735) 2016-06-20 16:32:52 -04:00
Andy Armstrong
519ebed615 Merge pull request #12780 from edx/andya/remove-coffeescript 
Convert XBlock runtime code from CoffeeScript
 2016-06-20 10:39:45 -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
Andy Armstrong
fff88151d2 Convert XBlock runtime code to JavaScript 2016-06-19 12:55:20 -04:00
Douglas Hall
2717167f24 Pass purchase_workflow parameter through to post-FinishAuth views 2016-06-16 21:17:05 -04: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
Ned Batchelder
b1c15af3ff Merge pull request #12779 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-16 13:14:07 -04:00
Ned Batchelder
25c195d48a Update translations (autogenerated message) 2016-06-16 14:48:20 +00: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
b725dc0d75 Merge pull request #12744 from edx/clrux/ac-455 
AC-455 adding main to PDF books; styling chapters
 2016-06-15 17:36:45 -04:00
Chris Rodriguez
079b2df404 AC-455 adding main to PDF books 2016-06-15 14:05:31 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Awais Jibran
acc3a9bf76 Merge pull request #12713 from edx/aj/ecom4650-fix-remove-exception 
Fix remove user from cert-exception list
 2016-06-15 17:00:55 +05:00
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