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

37100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Jacobel
e433aa4e32 Remove this focus test, it's impossible to get it to pass in all envs without breaking something else 2016-05-24 16:53:58 -04:00
Brian Jacobel
ad2a9a985d .val is not working here, approximate its intent with .prop("checked") 2016-05-24 16:53:58 -04:00
Brian Jacobel
a893c00b20 Update to jquery-migrate 1.4.1 2016-05-24 16:53:57 -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
Jillian Vogel
a5ef614994 Fixes require.storage.OptimizationError: Error while running r.js optimizer 
Removes the jquery dependency on non-existant _jquery.js
 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
clrux
025f74c870 Merge pull request #12347 from edx/clrux/ac-409 
AC-409 adding `lang` attribute to closed-captions and transcript skip links
 2016-05-24 12:48:23 -04:00
Sofiya Semenova
e16ba93603 Merge pull request #12549 from edx/ssemenova/authors 
added name to authors file
 2016-05-24 11:35:37 -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
Waheed Ahmed
f7e980620e Merge pull request #12369 from edx/waheed/ecom-2981-account-settings-nav 
Account Settings Navigation
 2016-05-24 16:33:47 +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
Ned Batchelder
83155840aa Merge pull request #12520 from edx/ned/oops-messages-po 
Two tweaks because we keep django.po and djangojs.po now.
 2016-05-24 06:40:10 -04:00
Clinton Blackburn
8855f12701 Merge pull request #12435 from mitocw/gdm_certificates_api_key 
Authentication and Authorization for Cert Rest APIs fixed
 2016-05-23 17:31:45 -04:00
Giovanni Di Milia
3a6167d6c8 Authentication and Authorization for Cert Rest APIs fixed 2016-05-23 16:22:03 -04:00
ssemenova
db384b773f added name to authors file 2016-05-23 15:49:06 -04:00
tasawernawaz
21ff5f4ea1 Merge pull request #12540 from edx/feature/update-learner-dashboard 
Feature/update learner dashboard
 2016-05-24 03:37:41 +08:00
Simon Chen
6f983c3384 Merge pull request #12484 from edx/schen/ECOM-4007 
ECOM-4007 Add new cert status "unverified" to handle no active user ID verification
 2016-05-23 14:05:00 -04:00
Tasawer
caa5a0ac02 ECOM-4334 Update learner dashboard 2016-05-23 21:41:06 +05:00
Simon Chen
e6137dd6af ECOM-4007 Prevent the issuing of HC certs to verified learners that haven't ID verified 2016-05-23 11:44:14 -04:00
Asad Iqbal
18cddf6e1e Merge pull request #12488 from edx/asadiqbal08/WL-477 
Got two thumbs up, so merging. 
WL-477 Route direct references to email address configurations through theming.helpers
 2016-05-23 17:56:28 +05:00
Malik Shahzad
6b390f2ec2 Merge pull request #12529 from edx/malikshahzad228/WL-484 
WL-484: Receipt total bill cell alignment fixed
 2016-05-23 17:15:03 +05:00
asadiqbal
1c19ebb443 WL-477 2016-05-23 13:24:05 +05:00
Jillian Vogel
ec44b296d9 Merge pull request #12526 from open-craft/jill/update-dndv2-v2.0.6 
Bump DnDv2 to v2.0.6
 2016-05-22 18:52:10 +09:30
Ned Batchelder
2245a8f577 Use the latest non-clobbering i18n_tools 2016-05-20 13:28:29 -04:00
Ned Batchelder
5dc4917049 We don't have messages.po any more, so don't try to upload it 2016-05-20 13:28:29 -04:00
John Eskew
76685e4e69 Merge pull request #12532 from edx/jibsheet/fixing-release-to-master-merge-with-conflicts 
Jibsheet/fixing release to master merge with conflicts
 2016-05-20 13:13:50 -04:00
Kevin Falcone
01fca6b67d Merge branch 'release' into jibsheet/fixing-release-to-master-merge-with-conflicts 2016-05-20 12:16:35 -04:00
Douglas Hall
846e05cdec Merge pull request #12509 from edx/hasnain-naveed/MAYN-230 
MAYN-230 / Added 2 extra fields for registration
 2016-05-20 10:53:52 -04:00
Hasnain
d5d51f3293 WL-230 Added additional fields to extended registration fields 2016-05-20 09:57:45 -04:00
Gabe Mulley
1ee87c887a Merge pull request #12212 from CredoReference/assigned-tags-included-in-the-emitted-event 
Connected aside information is included in the emitted event (on check)
 2016-05-20 09:41:10 -04:00
clrux
c64e0f3726 Merge pull request #12310 from edx/clrux/ac-406 
AC-406 adding proper aria-labels to HTML sliders in video
 2016-05-20 09:38:09 -04:00
Malik Shahzad
9f421219a6 Reciept Total allign Fixed. 2016-05-20 18:24:56 +05:00
Chris Rodriguez
2a1d4d5401 Updating video player controls with better accessibility 2016-05-20 08:14:32 -04:00
Chris Rodriguez
721fffc9c4 AC-407 adding lable to video progress 2016-05-20 07:43:04 -04:00
Chris Rodriguez
bf9380523f AC-406 adding label to volume slider 2016-05-20 07:43:04 -04:00
Jillian Vogel
83c58c603d Bump Drag-and-Drop-v2 v2.0.6 2016-05-20 17:23:46 +09:30
Calen Pennington
387f968c38 Merge pull request #12521 from cpennington/disable-concurrency-in-tests 
Disable concurrency in tests while we work out the kinks
 2016-05-19 22:15:53 -04:00
clrux
74abec3f1c Merge pull request #12430 from edx/clrux/ac-408 
AC-408 converting video slider controls from a to div
 2016-05-19 17:27:07 -04:00
Calen Pennington
548985803b Disable concurrency in tests while we work out the kinks 2016-05-19 16:56:24 -04:00
sanfordstudent
d95a4c8559 Merge pull request #12493 from edx/sstudent/TNL-4468 
Sstudent/tnl 4468
 2016-05-19 16:07:01 -04: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
Sanford Student
987fe723a4 adding link clicked event and associated tests 2016-05-19 14:58:22 -04:00
Calen Pennington
2aa9967189 Merge pull request #12386 from cpennington/cale/concurrent-unit-tests 
[EV-12] Run LMS unit tests concurrently on jenkins
 2016-05-19 14:25:24 -04:00
Calen Pennington
927b74e745 Make separate test processes use separate GRADES_DOWNLOAD and FINANCIAL_REPORTS directories 2016-05-19 12:45:28 -04:00
Calen Pennington
76e0482fb8 Fix a flaky test caused by caching of UserPartition schemes 2016-05-19 11:58:52 -04:00
Ned Batchelder
558281a09d Merge pull request #12516 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-19 11:51:25 -04:00