Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,228 Commits 1 Branch 0 Tags
9725fa94a5d2f5062d1bbc2bc4e22bf2118bbfde
Commit Graph

339 Commits

Author SHA1 Message Date
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
Awais Jibran
8691c2425f Disable `Generate Exception Certificate button when web certificate config is deactive. 
ECOM-4202
 2016-05-17 16:42:19 +05:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
AlasdairSwan
4a9e7c748c Merge pull request #12380 from edx/alasdair/ECOM-4213-move-program-list-to-pattern-library 
Alasdair/ecom 4213 move program list to pattern library
 2016-05-09 15:05:55 -04:00
AlasdairSwan
2fe52df720 UPdated a11y approach for program card progress bars 2016-05-09 13:52:55 -04:00
Renzo Lucioni
c697986a3e Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit f995114d11.
 2016-05-06 14:37:23 -04:00
Usman Khalid
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files. 
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
 2016-05-05 22:42:00 +05:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
AlasdairSwan
f5d2499420 UPdated a11y approach for program card progress bars 2016-05-04 15:39:05 -04:00
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -04:00
Christina Roberts
f0f0645007 Merge pull request #12278 from edx/christina/cohort-messages 
Add messaging when verified track content MVP is enabled.
 2016-05-03 10:14:15 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
Ahsan Ulhaq
f995114d11 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-02 13:15:18 +05:00
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting 
When using RequireJS load spec files one by one.
 2016-04-29 17:09:57 +05:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-04-29 15:54:47 +05:00
AlasdairSwan
61a5cd4d8f Renamed 'programId' to use 'id' 2016-04-28 09:44:08 -04:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Brian Jacobel
12d65f5801 Use unminified picturefill in development 2016-04-27 10:23:07 -04:00
Ahsan Ulhaq
edb356a43a Merge pull request #12273 from edx/ahsan/revert-ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page 
Revert "Add js test for analytics event on LMS receipt page"
 2016-04-27 18:38:45 +05:00
Ahsan Ulhaq
5f6474ac7d Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit 785b752d19.
 2016-04-27 17:38:51 +05:00
Muzaffar yousaf
d97b3cbd1f Merge pull request #12037 from edx/fedx/upgrade-backbone 
Upgrade backbone via npm.
 2016-04-27 17:31:00 +05:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Ahsan Ulhaq
785b752d19 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-04-27 00:35:06 +05:00
Simon Chen
f1e79c0b9b ECOM-4272 Add the cosmetic changes to the program listing page 2016-04-22 14:52:13 -04:00
Usman Khalid
fefc88b084 Post-rebase fixes. 2016-04-22 19:09:34 +05:00