Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
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
Nimisha Asthagiri
a5574792fb Fix mobile Warning errors in tracking logs. 2016-02-09 13:22:15 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Ehtesham Kafeel
cf5dc1075f Merge pull request #11289 from edx/ekafeel/Deprecated-Advanced-Component-Types 
Ekafeel/deprecated advanced component types
 2016-02-09 15:07:59 +05:00
Omar Khan
ed2cba2e2d Keep SAML configuration check 2016-02-09 16:10:31 +07:00
Omar Khan
9b7bb0dc20 Make SAMLAuthBackend._config a cached_property 
Cleaner, and keeps pylint happy
 2016-02-09 15:45:49 +07:00
Omar Khan
2c4e97ebfa Don't remove auth_url method 2016-02-09 15:45:21 +07:00
Omar Khan
78d4ed31a1 Revert "Keep SAML configuration check" 
This reverts commit a020464a41.
 2016-02-09 15:40:27 +07:00
Toby Lawrence
e2ed8ff787 Switch to SharedModuleStoreTestCase in the 'student' app where possible. 2016-02-08 14:13:57 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00
Omar Khan
a020464a41 Keep SAML configuration check 2016-02-08 14:32:12 +07:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
Toby Lawrence
409a947c0d Merge pull request #11435 from edx/bugfix/add-admin-for-ext-exclusion 
Fix up the excluded extensions bit.
 2016-02-05 12:15:07 -05:00
Toby Lawrence
b03ee49a82 Fix up the excluded extensions bit. 
This adds the missing admin class, and registration of it, required to
actually change the value of the excluded extensions configuration.
 2016-02-05 12:14:15 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Omar Khan
28cb402a04 Return 404 response from third party auth login when SAML disabled 2016-02-05 13:49:20 +07:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching 
bookmark button js caching
 2016-02-04 21:07:45 +05:00
muhammad-ammar
3127ac9180 bookmark button js caching 
TNL-3954
 2016-02-04 17:59:47 +05:00