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

17975 Commits

Author SHA1 Message Date
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
Chris Rodriguez
9c77c42949 Moving main element up higher to not conflict with chart 2016-05-24 16:43:19 -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
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
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
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
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
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
Robert Raposa
addb5bf634 Fix violations with n filter. 2016-05-23 09:00:32 -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
Robert Raposa
7223ee9316 Fix import order for HTML, Text. 2016-05-23 08:47:08 -04: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
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
Malik Shahzad
9f421219a6 Reciept Total allign Fixed. 2016-05-20 18:24:56 +05: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
Ned Batchelder
558281a09d Merge pull request #12516 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-19 11:51:25 -04:00
Ned Batchelder
9351b302b5 Merge pull request #12492 from edx/ned/fix-csv-headers 
Ensure correct CSV headers for non-English
 2016-05-19 11:26:38 -04:00
Ned Batchelder
6c60f73124 Update translations (autogenerated message) 2016-05-19 15:01:26 +00:00
Dmitry Viskov
21bbcc9f35 Connected aside information is included in the emitted event (on check) 2016-05-19 17:37:40 +03:00
Calen Pennington
0ade461f2a Skip course_wiki test which is flaky under randomization 
The test TestComprehensiveTheming.test_themed_footer in lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py
fails when run immediately after lms.djangoapps.course_wiki.tests.test_middleware:TestWikiAccessMiddleware.test_url_tranform.

Until we have a chance to fix it, we're going to skip it to expedite merging
concurrent testing.

To reproduce the failure, remove the @skip decorator, and run:

paver test_system -s lms --disable-migrations --test_id='lms.djangoapps.course_wiki.tests.test_middleware lms.djangoapps.course_wiki.tests.test_comprehensive_theming' --no-randomize -v --processes=0
 2016-05-19 10:20:20 -04:00
Calen Pennington
084f139113 Remove a redundant setUpClass method that only called super 2016-05-19 10:20:20 -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
Robert Raposa
94adf7fb74 Merge pull request #12490 from edx/robrap/linter-mako 
TNL-4566: Lint Mako templates outside of expressions
 2016-05-18 16:17:10 -04:00
Robert Raposa
7ecbed43e7 Make _thread_list_template.html safe. 2016-05-18 14:23:56 -04:00
Calen Pennington
a45f1f032c Set OAUTH2_PROVIDER_APPLICATION_MODEL for tests so that migrations can run in verbose mode 2016-05-18 14:10:30 -04:00
Calen Pennington
5249504edc Use xunitmp by default, rather than standard xunit 2016-05-18 14:10:29 -04:00
Calen Pennington
4a3f8358de Make static_template_view.tests an actual module 2016-05-18 14:10:28 -04:00
Calen Pennington
a07f53e020 Run middleware on a RequestFactory generated request in tests 2016-05-18 14:10:28 -04:00
Calen Pennington
09dc884c38 Isolate databases between test processes 2016-05-18 14:10:28 -04:00
Ned Batchelder
17b16b115d Ensure correct CSV headers for non-English 
If we pass non-ASCII strings to create_csv_response, it will call
unicode() on it, and fail with UnicodeDecodeError.  So pass Unicode
strings, or ASCII-only bytestrings for the headers.
 2016-05-18 11:10:32 -04:00
attiyaishaque
48e7fc8125 Bokchoy Test Deleted. 2016-05-18 11:40:59 +05:00
attiyaishaque
275a31ec42 Change in Bokchoy test according to new design. 2016-05-18 11:40:58 +05:00
attiyaishaque
19ea9ae9a0 Unit tests added and changes in enroll_staff view. 2016-05-18 11:40:58 +05:00
attiyaishaque
b19264974b Adding unit test 2016-05-18 11:40:58 +05:00