Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

3007 Commits

Author SHA1 Message Date
Bill DeRusha
bec6971ae2 Monkey patch django.db.models.options for faster cache expiry 2016-02-29 17:37:17 -05:00
Renzo Lucioni
e0407893ff Merge pull request #11603 from edx/usman/migrations-setup 
Update migrations setup during Python unit tests
 2016-02-29 13:54:30 -05:00
Ben Patterson
9e4f14f1be Revert "Registration: don't require terms of service if checkbox is hidden" 2016-02-29 12:08:09 -05:00
Usman Khalid
2586f09d7a Add option to disable migrations when running tests 
By default, migrations are applied as they always have been. Exporting DISABLE_MIGRATIONS=1 or passing --disable-migrations to Paver commands will create tables directly from apps' models.
 2016-02-29 11:47:32 -05:00
Omar Khan
23a0a6d41a Merge pull request #11644 from open-craft/omar/hide-tos 
Registration: don't require terms of service if checkbox is hidden
 2016-02-29 23:15:56 +07:00
Ben Patterson
953014cfb2 Merge pull request #11604 from edx/benp/lettuce-browser 
Dev user should be able to specify LETTUCE_BROWSER.
 2016-02-27 09:14:11 -05:00
David Ormsbee
13682e4694 Cache edxmako request context computation. 
When capa problem rendering was moved to happen inline on courseware
page loads, we started executing many more Mako templates on sequences
with large numbers of thse problems. To help offset this, we're caching
the context generation (it showed up as the easiest piece of low
hanging fruit on profiles of the courseware index page).

[PERF-261]
 2016-02-26 16:15:07 -05:00
Felipe Montoya
2c7ddb1d15 Delegating the conditional to the has_configuration_Set method, which is overriden by the database backend, so the enable_pre_startup works well for both backends. 
Adding tests

Fix quality issues
 2016-02-26 12:11:44 -05:00
Ben Patterson
34e41449c7 Clean up based on feedback. 2016-02-26 09:26:04 -05:00
Ben Patterson
9513107857 Dev user should be able to specify LETTUCE_BROWSER. 2016-02-26 09:26:03 -05:00
Eric Fischer
97ac2845c1 Fix for LoginFailure.MultipleObjectsReturned in is_user_locked_out (replay) 
The get_or_create function is vulnerable to race conditions in MySQL, which can
cause the model LoginFailure to, in some cases, have more than one row for the
same user, breaking the login for that user.

Addinf functionality to expect and clean the error by deleting extra rows (by
oldest lockout date), leaving just one entry and allowing the user to login.

Replayed and squashed by @efischer19, initially commited by @laq
 2016-02-25 12:03:28 -05:00
John Eskew
e3ddb02cc7 Merge pull request #11586 from edx/jeskew/remove_all_request_dot_request 
Remove all request.REQUEST usages.
 2016-02-25 08:23:12 -05:00
Omar Khan
e461374973 Registration: don't require terms of service if checkbox is hidden 2016-02-24 16:18:32 +07:00
Awais Jibran
d114be732f Merge pull request #11514 from attiyaIshaque/ai/tnl4067-auto-register-course 
User automatically registered to course.
 2016-02-24 11:24:58 +05:00
Adam Palay
aaaba4708d add timeout to lettuce test to reduce flakiness 2016-02-23 12:40:49 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Your Name
b1751e70c3 User automatically registered to course. 2016-02-23 19:07:19 +05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops 
Don't blow away the role cache when updating.
 2016-02-23 06:55:00 -05:00
John Eskew
df261cd5d6 Remove all request.REQUEST usages - replace with request.GET and/or 
request.POST to eliminate Django deprecation messages.
 2016-02-22 09:54:26 -05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release 
Release
 2016-02-18 17:19:29 -05:00
Michael Frey
5903ef832c Merge pull request #11584 from edx/release 
Merging release back to master
 2016-02-18 14:55:25 -05:00
Matjaz Gregoric
f4e462c728 Merge pull request #11316 from open-craft/remove-django-template-loaders 
Remove default django template loaders.
 2016-02-18 20:38:47 +01:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094) 
update mathjax class names to support common html, html-css, and svg
 2016-02-18 14:13:34 -05:00
Bill DeRusha
b686abc18d Disable mailchimp integration for most segment identify requests 2016-02-17 17:10:48 -05:00
vkaracic
f58c2cd6b0 Otto checkout flow 2016-02-17 15:04:19 -05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
Toby Lawrence
80c68e42b7 Merge pull request #11467 from edx/perf/speed-up-student-tests 
Switch to SharedModuleStoreTestCase in the 'student' app where possible.
 2016-02-17 11:15:53 -05:00
sanfordstudent
e4b59c3198 Merge pull request #11526 from edx/sstudent/MA-1882-update-api-regex 
MA-1882 adding course api to regex
 2016-02-17 10:21:51 -05:00
Ahsan Ulhaq
d90c1a2845 Merge pull request #11560 from edx/ahsan/ECOM-2831-GeneratedCertificates-admin-broken 
set show_full_result_count false
 2016-02-17 20:09:45 +05:00
Sanford Student
45f8e526c0 making check more generic 2016-02-17 09:22:27 -05:00
Ahsan Ulhaq
88df456414 set show_full_result_count false 
ECOM-2831
 2016-02-17 18:10:40 +05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Toby Lawrence
0d040bc051 Fix a mistake with initializing something in the test setup. 2016-02-16 10:20:57 -05:00
Zia Fazal
57af11c0f0 Merge pull request #11548 from edx/ziafazal/fix-get-template-path 
WL-320: fixed get_template_path to work with absolute path also
 2016-02-16 18:47:45 +05:00
Zia Fazal
6cd265751a fixed get_template_path to work with absolute path also 
fixed quality violation

skipped test in CMS

changes after feedback from mattd
 2016-02-16 11:52:19 +05:00
Toby Lawrence
84ed280417 Quality fixes! 2016-02-15 21:11:35 -05:00
Gabe Mulley
fcfb0f4a3c Merge pull request #11522 from edx/gabe/remove-ga-fields 
copy event on write
 2016-02-12 14:34:29 -05:00
Toby Lawrence
dacdbae1a5 Fix up some broken tests. 
We added the ability here to check if a role has a user in with the ability to refresh the role cache before checking.  Since some tests will make inline requests, which in turn put a user into a new role, we have to refresh afterwards otherwise we won't see that new role in place.  Since we don't want to automatically refresh ever, we just added a way to request it, since we know in this test that we're doing something, effectively, out-of-band, which necessitates it.
 2016-02-12 14:17:51 -05:00
Sanford Student
52d8cb009f MA-1882 adding tests and reworking regex to exclude blocks routes 2016-02-12 09:35:29 -05:00
Eric Fischer
6394238004 Exclude Reverse Foreign Keys from list_display 
These types of fields do not need to be included, and attempting
to do so causes everything to break.
 2016-02-12 08:54:25 -05:00
Gabe Mulley
239c3822a4 copy event on write 2016-02-12 06:27:53 -05:00
Sanford Student
b92c12cbe5 MA-1882 adding course api to regex 2016-02-11 16:03:52 -05:00
Toby Lawrence
9fe2de8a1c Don't blow away the role cache when updating. 
Instead of refetching the role cache fresh every time we want to add a new role to a user, just manually add the role object.  We have it available to us, the model, not a distilled-down version.  Add that in and leave the existing cache.
 2016-02-11 14:43:53 -05:00
Peter Fogg
a7b1f79d3e Better error logging for full courses during enrollment. 
ECOM-3685
 2016-02-11 09:54:15 -05:00
Braden MacDonald
ee99cf9c8d Merge pull request #11436 from open-craft/omar/saml-crawl-fix 
Return 404 response from third party auth login when SAML disabled
 2016-02-10 08:00:06 -08:00
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272 
asadiqbal08/WL-272 - Studio Language Selection
 2016-02-10 18:30:29 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Nimisha Asthagiri
dced810138 Merge pull request #11489 from edx/release 
Hotfix for reducing mobile warnings in tracking logs
 2016-02-09 21:33:31 -05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00