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

37076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Smith
8a9df36809 update django-ses 2016-05-25 10:12:50 -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
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
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
Ned Batchelder
6142c76ce8 Merge pull request #12471 from edx/ned/release-translations 
Support named-release translation files.
 2016-05-19 10:41:06 -04:00
Dmitry Viskov
21bbcc9f35 Connected aside information is included in the emitted event (on check) 2016-05-19 17:37:40 +03:00
Diana Huang
49e66863fe Merge pull request #12512 from edx/diana/enable-verify-xss 
turn on bok choy XSS checking
 2016-05-19 10:25:21 -04: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
Chris Rodriguez
e0da408f95 AC-408 converting video slider controls from a to div 2016-05-19 10:02:13 -04:00
Douglas Hall
d95ad32532 Merge pull request #12510 from edx/douglashall/WL-450/fixed_timeout_issue 
WL-450 Fix for issue with canceling changes to image upload fields
 2016-05-19 09:24:14 -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
Ned Batchelder
7aa1c1c21d Add tests for the new commands 2016-05-18 18:55:16 -04:00
Christina Roberts
95ffe7cdf3 Merge pull request #12513 from edx/christina/mark-flaky-tests 
Christina/mark flaky tests
 2016-05-18 17:19:03 -04:00
Brian Jacobel
3faaead6b1 Merge pull request #12503 from edx/bjacobel/FEDX-194-more-math-input-issues 
Fix another kind of math problem which was overflowing
 2016-05-18 17:18:11 -04:00
Diana Huang
1162dbc18f Enable VERIFY_XSS checking by default. 2016-05-18 16:27:15 -04: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
9e81c4ccce Merge pull request #12511 from edx/andya/exclude-deletions-from-safe-commit-linting 
Exclude deleted files from safe template linting
 2016-05-18 16:16:25 -04:00
Douglas Hall
6eb2e18469 Merge pull request #12483 from edx/douglashall/SOL-1776/add_studio_acceptance_tests 
SOL-1776 Added Studio settings image upload acceptance tests
 2016-05-18 15:28:55 -04:00
Calen Pennington
8b3ef8725c In order to minimize contention for the mongodb global lock, use one database per process in tests 2016-05-18 14:39:00 -04:00
Calen Pennington
299b2659c6 Allow tests to run in verbose mode and multiprocess mode (by turning off TestId mode as needed) 2016-05-18 14:39:00 -04:00
Calen Pennington
e60114c716 Add paver arguments to control concurrency and randomization 2016-05-18 14:39:00 -04:00
Adam
55bfb74c6d Merge pull request #12481 from edx/fix-memory-leak 
clear request cache after celery task finishes (TNL-2705)
 2016-05-18 14:31:22 -04:00
cahrens
a80773f8dc Mark test as flaky. 
SOL-1811
 2016-05-18 14:24:20 -04:00
Robert Raposa
cf3ef8aae3 Enhance safe template linter. 
- Lint directories and files in sorted order.
- Lint python blocks in Mako.
 2016-05-18 14:23:57 -04:00