Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7d773df52d24e0c8c1915fd4cf03cc844a932efb
edx-platform/common/djangoapps
History
Adam Palay c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
2016-01-26 11:25:41 -05:00
..
auth_exchange
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
cache_toolbox
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
config_models
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
contentserver
Add super() calls to setUp/tearDown that are missing them
2015-05-14 18:14:21 -04:00
cors_csrf
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
course_action_state
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
course_modes
moved IS_EDX_DOMAIN dependent feature to edx.org theme
2016-01-22 15:32:19 -05:00
dark_lang
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
datadog
Remove dogstatsd-python in favor of dogapi
2013-09-11 19:28:58 -04:00
django_comment_common
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
edxmako
moved IS_EDX_DOMAIN dependent feature to edx.org theme
2016-01-22 15:32:19 -05:00
embargo
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
enrollment
Revert "Add options trailing slashes to the Enrollment API."
2016-01-08 09:47:39 -05:00
external_auth
Fix for error in TNL-363
2015-12-03 11:27:20 +01:00
geoinfo
Add super() calls to setUp/tearDown that are missing them
2015-05-14 18:14:21 -04:00
heartbeat
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
lang_pref
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
microsite_configuration
Creating a settings object that is aware of the microsite settings.
2016-01-15 14:52:36 +05:00
monitoring
Eliminate instances of unused-import Pylint violation
2015-07-13 17:33:25 -04:00
monkey_patch
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
performance
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
pipeline_js
Use django.contrib.staticfiles instead of django-staticfiles.
2015-10-06 19:52:38 +05:00
pipeline_mako
Remove microsite_configuration/microsite.py references from individual templates
2016-01-22 14:27:58 -05:00
request_cache
Revert "Merge DRF 3.1 in to master"
2015-09-28 17:12:43 -04:00
reverification
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
service_status
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
session_inactivity_timeout
add middleware to be able to expire inactive sessions after N seconds
2014-01-24 10:36:21 -05:00
static_replace
Add the migrations necessary for asset base URL support.
2016-01-08 13:16:50 -05:00
status
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00
student
Merge remote-tracking branch 'origin/release' into merge-release-into-master
2016-01-26 11:25:41 -05:00
terrain
Comment out mock call to ORA1 stub server
2015-12-11 15:30:27 -05:00
third_party_auth
Redirect to login when SAML accessed without idp param
2016-01-20 09:36:31 +07:00
track
Fix HTTP_USER_AGENT latin1 characters
2016-01-20 18:40:09 +05:00
util
Creating a settings object that is aware of the microsite settings.
2016-01-15 14:52:36 +05:00
xblock_django
Fix pylint C7630 (literal used as attribute) violations
2015-11-23 15:32:54 -05:00
xmodule_django
Rebase upgrade Django to v1.8.5
2015-11-10 15:00:19 -05:00