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

13414 Commits

Author SHA1 Message Date
clrux
0aa87b8a22 Merge pull request #12452 from edx/clrux/ac-414 
AC-414 adding headings as first child to sections
 2016-06-10 15:23:10 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
Christina Roberts
81e5be2246 Merge pull request #12699 from edx/christina/config-models 
New XBlock Configuration Models
 2016-06-10 10:49:50 -04:00
cahrens
39cf70ecf4 Add new xblock config models. 
TNL-4666
 2016-06-10 09:52:57 -04:00
David Ormsbee
249467c9bb Merge pull request #12527 from cpennington/enable-concurrency-in-lms-tests 
Enable concurrency (but not randomization) in LMS unit tests
 2016-06-10 09:19:59 -04:00
clrux
4a53f78129 Merge pull request #12676 from edx/clrux/ac-473 
AC-473 fixing width of closed captions in fullscreen
 2016-06-10 06:32:21 -04:00
Calen Pennington
a173270ef1 Fix pylint-identified issues in i18n_tests 2016-06-09 16:26:21 -04:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706) 
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
 2016-06-09 16:21:11 -04:00
Calen Pennington
e7caf9b0ca Rename i18n.tests to i18n_tests, so that the i18n.tests package can be a package without squashing the python i18n package namespace 2016-06-09 15:25:37 -04:00
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
Calen Pennington
cfd1620703 Merge pull request #12630 from cpennington/dont-leak-current-requests-in-tests 
Dont leak current requests in tests
 2016-06-09 12:03:34 -04:00
Calen Pennington
97136768f9 Empty the RequestCache if the request ends in an exception 2016-06-09 10:10:40 -04:00
Calen Pennington
a88fa5c07a Remove mako_middleware_process_request, which doesn't cleanup after itself 2016-06-09 10:10:40 -04:00
Calen Pennington
029f4a5ef5 Use a contextmanager to cleanup after manipulating the current request in email rendering tests 2016-06-09 10:10:39 -04:00
Calen Pennington
71bb7f0ba0 Use a contextmanager to cleanup after manipulating the current request in create_account tests for external auth 2016-06-09 10:10:39 -04:00
Calen Pennington
6760ac44e8 Use a contextmanager to cleanup after manipulating the current request in password_policy tests for external auth 2016-06-09 10:10:39 -04:00
Calen Pennington
d77025c873 Use a contextmanager to cleanup after manipulating the current request in third_party_auth tests 2016-06-09 10:10:39 -04:00
Peter Fogg
6e91d88413 Merge pull request #12696 from edx/peter-fogg/fix-command-facepalm 
Correct destination of management command args.
 2016-06-09 09:25:09 -04:00
Muhammad Ammar
6eef8ee944 Merge pull request #12663 from edx/ammar/fedx-198-enforce-heading-problems 
enforce display name in CAPA problems
 2016-06-09 17:34:06 +05:00
muhammad-ammar
8024bae255 enforce display name in CAPA problems 
FEDX-198
 2016-06-09 16:42:19 +05:00
PaulWattenberger
9781685719 Revert "Pwattenberger/sailthru" (#12701) 2016-06-08 23:03:22 -04:00
PaulWattenberger
ca02235e64 Pwattenberger/sailthru (#12646) 
* Initial commit of Sailthru lms changes

* Field mapping changes for Sailthru integration

* Merge fix

* Add users to Sailthru list on registration

* FIx minor code format issues

* Several updates based on code review feedback

* Updates based on recomendations from Sailthru

* Clean up unit tests

* Fix last login

* Updates based on code review feedback

* Updates based on code review feedback

* Fix comment

* Cleanup
 2016-06-08 19:38:29 -04:00
Calen Pennington
86902e87af Use the Django TestClient for external_auth shib unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
437b249d68 Use django_crum to access the current request in request_cache 2016-06-08 16:35:25 -04:00
Calen Pennington
93970f3473 Allow edxmako to be passed an explicit request to create the RequestContext from 2016-06-08 16:35:25 -04:00
Calen Pennington
0e8af4cccc Use the non-deprecated functions for edxmako to access the request_cache 2016-06-08 16:35:24 -04:00
Calen Pennington
25c4398125 Convert edxmako to use django_crum to get the current request 2016-06-08 16:35:24 -04:00
Peter Fogg
3c223d106a Correct destination of management command args. 2016-06-08 15:48:27 -04:00
Waheed Ahmed
817a1585ef Merge pull request #12543 from edx/waheed/ecom-2361-complete-order-history-for-students 
Complete Order History tab for students on account settings page
 2016-06-08 22:53:59 +05:00
Brian Jacobel
6589139e29 Merge pull request #12266 from edx/bjacobel/requirejs-sync 
Load requirejs bundles synchronously
 2016-06-08 13:49:18 -04:00
Eric Fischer
2241ca59b0 remove flaky decorator (#12655) 2016-06-08 13:22:33 -04:00
Ahsan Ulhaq
d31b7cbd68 Complete Order History area for students 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Waheed Ahmed
b2f21ef4f3 Complete Order History tab for students on account settings page. 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Peter Fogg
17fb925cd4 Correct help text for the bulk_change_enrollment command. 2016-06-08 09:59:59 -04:00
Brian Jacobel
61e64fbfdf Merge pull request #12615 from edx/bjacobel/focus-test-to-bokchoy 
Move the flaky focus unit test removed in #12433 to a bok choy test
 2016-06-07 16:37:33 -04:00
Sofiya Semenova
1cda718f8f Merge pull request #12611 from edx/ssemenova/icon2 
Changing icon tags from i to span 

TNL-4692
 2016-06-07 13:36:57 -04:00
Calen Pennington
df2f347ac2 Merge pull request #12670 from cpennington/reset-urls-favicon-tests 
Reset urls favicon tests
 2016-06-07 12:02:45 -04:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52:00 -04:00
Brian Jacobel
57b4cb7fb3 Move the flaky focus unit test removed in #12433 to a bok choy test 2016-06-07 10:00:49 -04:00
raeeschachar
5110480dce Fixed test fields on my public profile 2016-06-07 08:52:30 -04:00
Calen Pennington
d76f31bc90 Merge pull request #12627 from cpennington/test-certificates-shared-modulestore-test-case 
Don't modify courses inside SharedModuleStoreTestCase test methods in…
 2016-06-06 15:50:47 -04:00
Calen Pennington
4367460709 Merge pull request #12668 from cpennington/test-tracker-global-settings 
Use copies of tracker settings dicts in tests so that changes don't l…
 2016-06-06 15:26:20 -04:00
Chris Rodriguez
c1942467bf AC-473 fixing width of closed captions in fullscreen 2016-06-06 15:03:34 -04:00
clrux
1786e25bf2 Merge pull request #12665 from edx/clrux/ac-490 
AC-490 using latest a11y checks and ignoring section test
 2016-06-06 14:26:17 -04:00
Calen Pennington
e93d112c04 Make UrlResetMixin.reset_urls a public method (so that it can be used inside test methods) 2016-06-06 13:27:38 -04:00
Calen Pennington
3207311e50 Use copies of tracker settings dicts in tests so that changes don't leak between tests 2016-06-06 13:19:52 -04:00
Chris Rodriguez
6be4f84aff Using latest version from NPM and ignoring section tests for now 2016-06-06 13:10:51 -04:00
Tasawer
c6a6cdd72d Quality fixes. 
ECOM-4214
 2016-06-06 16:50:16 +05:00
Matt Drayer
920fba502c Merge pull request #12642 from edx/mattdrayer/WL-493 
mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users
 2016-06-05 21:54:50 -04:00
Jerzy Kozera
d7ca5d94d9 Fix for thumbnail generation code crashing with SVG files 
Fixes TNL-3960: adding an SVG file to assets resulted in a logged
exception while generating a thumbnail. A user-visible side effect
was that no thumbnail was shown next to the uploaded file, which
is working correctly now after this change.
 2016-06-03 21:26:29 +02:00