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

37117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Smith
b3462e5b1c Merge pull request #12544 from edx/derf/override_SES_email_region 
override SES email region
 2016-05-25 11:16:47 -04:00
Diana Huang
53f6d40d45 Merge pull request #12542 from edx/diana/discussion-a11y 
Add accessibility tests for discussion forums.
 2016-05-25 10:16:38 -04:00
Fred Smith
8a9df36809 update django-ses 2016-05-25 10:12:50 -04:00
Diana Huang
677403192b Add accessibility tests for discussion forums. 2016-05-25 09:26:35 -04:00
Brian Jacobel
182921f1f1 Merge pull request #12433 from edx/bjacobel/upgrade-jquery 
Upgrade jQuery to 2.2
 2016-05-25 09:07:07 -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
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
Bill DeRusha
136f3d3467 Merge pull request #12552 from edx/release 
Merge Release 2016-05-24 to Master
 2016-05-24 16:11:35 -04:00
Bill DeRusha
14c0262885 Merge pull request #12533 from edx/rc/2016-05-24 
Release Candidate rc/2016-05-24
 2016-05-24 14:39:01 -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
Peter Fogg
ce17961413 Merge pull request #12551 from edx/peter-fogg/jwt-auth-fixes 
Use correct JWT audience when connecting to course discovery.
 2016-05-24 09:33:23 -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
Peter Fogg
760ce74fca Use correct JWT audience when connecting to course discovery. 2016-05-23 17:05:42 -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
Peter Fogg
c75bcb23b6 Merge pull request #12546 from edx/peter-fogg/date-summary-unicode-fixes 
Fix date summaries with Unicode format issues.
 2016-05-23 14:20:58 -04:00
Nimisha Asthagiri
569ac193ce Merge pull request #12547 from edx/naa/hotfix-course-blocks-management-command 
Support force update param in generate_course_blocks Management Command
 2016-05-23 14:07:59 -04: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
Nimisha Asthagiri
4ace1d2bc3 Merge pull request #12537 from edx/naa/hotfix-outdated-course-structure 
Hotfix for BlockStructure data not invalidating upon Course Publish
 2016-05-23 12:59:23 -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
Nimisha Asthagiri
16f89ddae3 Support force update param in generate_course_blocks Management Command 2016-05-23 11:40:03 -04:00
Peter Fogg
c1a59cc0b3 Fix date summaries with Unicode format issues. 
This issue would show up when date formatting strings are translated
with Unicode characters (like when testing with fake Esperanto
translations).
 2016-05-23 11:15:09 -04:00
Fred Smith
fe788bc305 override SES email region and endpoint 2016-05-23 10:38:57 -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
Nimisha Asthagiri
d37499c29d Hotfix for BlockStructure data not being invalidated upon Course Publish. 2016-05-20 16:21:06 -04:00
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