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

37011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Robert Raposa
7ecbed43e7 Make _thread_list_template.html safe. 2016-05-18 14:23:56 -04:00
cahrens
2c7cdbffc1 Mark test as flaky. 
TNL-4590
 2016-05-18 14:17:53 -04:00
Christina Roberts
9f1971ce83 Merge pull request #12501 from edx/christina/tnl-1619-xss 
Christina/tnl 1619 xss
 2016-05-18 14:02:19 -04:00
Douglas Hall
e2c65c57f1 Added Studio settings image upload acceptance tests 2016-05-18 13:33:25 -04:00
cahrens
fd1d72cc8d Wait for seek to complete before pressing play. 
TNL-4540
 2016-05-18 13:13:20 -04:00
Adam Palay
04dd61bead remove logging 2016-05-18 12:56:35 -04:00
Andy Armstrong
a7e754dd9a Exclude deleted files from safe template linting 2016-05-18 12:52:21 -04:00
Douglas Hall
bb55917f03 WL-450 Fix for issue with canceling changes to image upload fields 2016-05-18 12:29:18 -04:00
Peter Fogg
06fa08394d Merge pull request #12491 from edx/peter-fogg/catalog-api-jwt-key 
Use the correct JWT key when authenticating against the course catalog API.
 2016-05-18 12:17:44 -04:00
Christina Roberts
16e9f9c6c7 Merge pull request #12500 from edx/christina/tnl-1619 
Can no longer play outside of the start/end time for the clip.
 2016-05-18 11:55:23 -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
Adam Palay
a7d638de9e clear request cache after celery task finishes (TNL-2705) 
set max_num_courses_in_cache on modulestore
 2016-05-18 10:43:54 -04:00
Syed Hasan raza
3e747c379f Merge pull request #12443 from edx/shr/log/PLAT-1023-PLAT-1031-Detail-Logging 
Detail Logging xmodule exceptions
 2016-05-18 13:59:54 +05:00
attiyaIshaque
2c5319e468 Merge pull request #12190 from edx/aj/sust-24-globalstaff-course-access 
Aj/sust 24 globalstaff course access
 2016-05-18 12:44:49 +05: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
attiyaishaque
94b58c2df6 Adding bokchoy test and change in html file. 2016-05-18 11:40:57 +05:00
Awais Jibran
3fb6592443 SUST-24 Initial commit 
Add bokchoy test and changes in html
 2016-05-18 11:40:57 +05:00
clrux
7b34f4317d Merge pull request #12502 from edx/clrux/ac-474 
Corrects duplicate main element wrapper on Wiki article template
 2016-05-17 17:36:43 -04:00
Alison Hodges
214091d33b Merge pull request #12467 from edx/ahodges/xrefs 
Updates and corrects href links to readthedocs
 2016-05-17 17:35:41 -04:00
John Eskew
e5a5704b38 Merge pull request #12495 from edx/jeskew/release_to_master_merge 
Merge release to master for 2016-05-17 release
 2016-05-17 17:16:16 -04:00
clrux
5db315bebf Merge pull request #12371 from edx/clrux/ac-405 
AC-405 calculator image to icon
 2016-05-17 17:11:56 -04:00
clrux
f0b33e33ff Merge pull request #12244 from edx/clrux/ac-399 
AC-399 adding alt for circuit schematic controls
 2016-05-17 17:11:38 -04:00
clrux
f7eba02808 Merge pull request #12411 from edx/clrux/ac-396 
AC-396 updating courseware nav to display correctly on high contrast displays
 2016-05-17 17:11:09 -04:00
Clinton Blackburn
c67ef7a8fa Merge pull request #12457 from edx/clintonb/user-update 
User administration updates
 2016-05-17 16:35:09 -04:00
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -04:00
AlasdairSwan
7a0d7818bc Offscreen a11y test fix 2016-05-17 15:41:28 -04:00
Matt Drayer
c6249f4227 mattdrayer/WL-466: Use LMS Courses API 2016-05-17 15:41:28 -04:00
AlasdairSwan
646d0b9b68 ECOM-4450 Added help tab and model styling to Pattern Library pages 2016-05-17 15:41:28 -04:00
cahrens
cafc15cf7d Move city and country fields to the very end. 
OSPR-1155
 2016-05-17 15:41:28 -04:00
Douglas Hall
4bdeaf7696 Always include the course price in the course_about template context 2016-05-17 15:41:27 -04:00