Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

519 Commits

Author SHA1 Message Date
Renzo Lucioni
b1f5916360 Allow viewing of archived courses from the program detail page 
ECOM-4974.
 2016-07-18 17:04:48 -04:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls 
Use course run marketing URLs from the catalog service on program detail page
 2016-07-15 17:55:01 -04:00
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page 
Part of ECOM-4566.
 2016-07-15 16:12:10 -04:00
Chris Rodriguez
4e4c740c2c AC-517 fixes color-contrast ignores across platform 2016-07-12 14:41:06 -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
Kevin Kim
d0be769f1d Merge pull request #12667 from edx/kkim/tz_pref_AS 
Time Zone in Account Settings
 2016-06-28 13:10:10 -04: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
Kevin Kim
059985b9ec Added time zone field to user account settings, currently hidden behind a feature flag. 2016-06-28 14:33:56 +00: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
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
Douglas Hall
2717167f24 Pass purchase_workflow parameter through to post-FinishAuth views 2016-06-16 21:17:05 -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
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -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
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -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
AlasdairSwan
a7cd4daee5 ECOM-4216 Styling the header 2016-06-07 10:53:00 -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
Renzo Lucioni
9c4a3dc9c7 Fix program details a11y test 2016-06-03 11:32:07 -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
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
Andy Armstrong
7ee41eafb3 Refactor staff preview menu logic out of template 2016-05-31 11:36:40 -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
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
Brian Jacobel
4f0aee3f2d Fix unit and acceptance tests broken in upgrade (squashed) 
Fix syntax error in selectors

.attr() now returns a string (though it can still be passed an integer)

Fixes checkbox test failures

Remove remaining references to jquery.min (in wrong folder)

$.ajax now returns 422 if type is json and body is not JSON, e.g. ''

Substitute prop for attr

Remove references to jquery.min, add jquery.migrate (again)

"Fix" jquery karma config

This wasn't suppoed to survive the merge

This throws an error when called with an 'undefined' error

Fix Karma warning about [re|un]loading the window

Fix path for jquery in cms-squire tests

Move jasmine.clock.uninstall() to afterEach so it runs even on failure

Fix test failing due to timezone issues

Do the timeout before the window scrolling (so handler will not be _.throttled)

Fix an alert() triggered by window.onBeforeUnload while testing in Chrome
 2016-05-24 16:53:57 -04:00
Daniel Friedman
230f252bad Fix the way jquery and jquery-migrate are loaded 
Don't use symlinks to include node_modules
 2016-05-24 16:53:51 -04:00
cahrens
665f983c99 Tweak focus/blur functions for JQuery upgrade. 
Fix incorrectly scoped selector.
 2016-05-24 16:53:42 -04:00
cahrens
4ba07bf7a4 Assorted test and dependency fixes to cms-squire and cms 
isRejected is deprecated.

Actually serve the slick library in LMS jasmine tests

customwmd doesn't need to wait for DOM ready event

... In order to define a class and extend the Markdown class.
 2016-05-24 16:53:34 -04:00
Daniel Friedman
15f148141f Upgrade jQuery 1.7.2 to 2.2.0 
FEDX-25
 2016-05-24 16:52:50 -04:00
Waheed Ahmed
dc4e4f7d6a Account settings navigation. 
ECOM-2981
 2016-05-24 15:44:39 +05:00
sanfordstudent
d95a4c8559 Merge pull request #12493 from edx/sstudent/TNL-4468 
Sstudent/tnl 4468
 2016-05-19 16:07:01 -04:00
Sanford Student
987fe723a4 adding link clicked event and associated tests 2016-05-19 14:58:22 -04:00
Awais Jibran
4f46716e42 Merge pull request #12441 from edx/aj/ecom4202-disable-gen-cert-exception-btn 
Disable `Generate Exception Certificate button
 2016-05-19 13:41:13 +05:00
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -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