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

37393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release 
Merge hotfix-2016-06-10 release into master
 2016-06-10 16:01:23 -04:00
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
Robert Raposa
7d4a8a20fa Merge pull request #12719 from edx/hotfix-2016-06-10 
Hotfix for GET to POST
 2016-06-10 15:11:02 -04:00
Peter Desjardins
b4d330bcd4 Merge pull request #12718 from edx/pdesjardins/DOC-2315 
Repair platform API documentation build
 2016-06-10 13:42:42 -04:00
Cliff Dyer
cdf5dea2db Merge pull request #12717 from edx/tnl/splittest-zerogroup 
Ensure split-test group zero content is protected
 2016-06-10 13:33:45 -04:00
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
Peter Desjardins
7ff463c0e9 Mocked some Python modules when running a Sphinx documentation publishing build. Updated an autoclass class name that changed." 2016-06-10 12:27:51 -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
J. Cliff Dyer
4212a3c326 Ensure split-test group zero content is protected 
TNL-4771
 2016-06-10 14:00:17 +00: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
AlasdairSwan
1ff0a3b45e Merge pull request #12709 from edx/alasdair/ECOM-4469-modals-sass-cleanup 
Clean up the help tab Sass included on Pattern Library pages
 2016-06-10 06:22:23 -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
AlasdairSwan
a856325731 Stay Clean 2016-06-09 14:49: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
Peter Fogg
14fcb3a11b Merge pull request #12708 from edx/peter-fogg/fix-catalog-404 
Fix 500 error when searching for a user without catalogs.
 2016-06-09 14:30:49 -04:00
Ned Batchelder
b4248d28e1 Merge pull request #12707 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-09 14:25:09 -04:00
Renzo Lucioni
1a7e1a3125 Merge pull request #12700 from edx/renzo/local-program-completion 
Use cached data to find completed programs on LMS
 2016-06-09 13:58:16 -04:00
Peter Fogg
c43d8e1566 Fix 500 error when searching for a user without catalogs. 
ECOM-4653
 2016-06-09 13:22:51 -04:00
Calen Pennington
98bf9f9dea Enable concurrency (but not randomization) in LMS unit tests 2016-06-09 13:14:36 -04:00
Calen Pennington
9ba7048415 Merge pull request #12528 from cpennington/enable-randomization-in-lms-tests 
Enable randomization (but not concurrency) in LMS unit tests
 2016-06-09 13:05:01 -04:00
Calen Pennington
2afc9e8c16 Don't use the --processes argument at all of processes=0 2016-06-09 12:04:18 -04:00
Calen Pennington
7ca92f255a Enable randomization (but not concurrency) in LMS unit tests 2016-06-09 12:04:18 -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
Ned Batchelder
78f2d9e1eb Update translations (autogenerated message) 
Update translations (autogenerated message)
 2016-06-09 12:00:04 -04:00
Ned Batchelder
f4f33807ce Merge pull request #12705 from edx/ned/update-i18n-tools 
Use v0.3.2 of i18n_tools
 2016-06-09 11:37:59 -04:00
Ned Batchelder
1ce2cbd187 Use v0.3.2 of i18n_tools 2016-06-09 10:41:40 -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
Renzo Lucioni
6d7938fde0 Use cached data to find completed programs on LMS 
These changes improve the performance of the LMS' program certification task. They also reduce strain on the programs service, especially when attempting to award program certificates to large numbers of students. ECOM-4490.
 2016-06-09 09:57:09 -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
7d32129b9f Use the Django TestClient for branding unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
fc1e0b6637 Use the Django TestClient for course_creator unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
411f1f7964 Use the Django TestClient for forum unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
57f7271b0b Use the Django TestClient for courseware unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:30 -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