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

..

features

Delete lettuce tests already converted to bok choy.

2016-01-06 14:22:10 -05:00

management

remove old management commands

2016-01-20 14:11:54 -05:00

migrations

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

tests

Merge pull request #11229 from edx/pmitros/minor-studio-settings-cleanup

2016-01-21 14:38:24 -05:00

views

Revert "Merge pull request #11241 from edx/feature/credentials-phase-1"

2016-01-25 12:46:57 -05:00

__init__.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

admin.py

MA-612 Mobile Push Notification Studio Django admin setting

2015-04-18 15:30:14 -04:00

context_processors.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

course_group_config.py

In-course reverification access control

2015-08-20 08:43:55 -07:00

course_info_model.py

Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py

2015-05-14 16:03:50 -04:00

courseware_index.py

Refactor course_image_url

2015-12-04 11:25:40 -05:00

debug_file_uploader.py

some tweeks to the negative testing

2013-07-09 19:16:00 -04:00

git_export_utils.py

Fix Pylint: E1305(too-many-format-args)

2015-03-13 20:20:04 -07:00

models.py

Remove useless pylint suppressions

2015-11-22 07:41:19 -05:00

proctoring.py

PHX-161

2015-12-15 14:27:29 -05:00

push_notification.py

MA-668 Mobile Push Notification payload update

2015-04-24 17:23:22 -04:00

signals.py

Add Timed Exams as a feature to edx-platform

2015-10-30 08:44:33 -04:00

startup.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

tasks.py

MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse

2015-04-18 15:30:19 -04:00

utils.py

Refactor CourseDetails

2015-12-04 16:03:05 -05:00