Adam Palay b199a72c62 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py

2015-06-12 16:22:06 -04:00

..

features

Fix flaky lettuce test. TNL-1452

2015-06-12 10:32:28 -04:00

management

PLAT-643

2015-06-09 11:19:46 +05:00

migrations

MA-612 Mobile Push Notification Studio Django admin setting

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

tests

add name param check_transcripts

2015-06-12 16:34:45 +05:00

views

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-06-12 16:22:06 -04:00

__init__.py

Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g

2015-04-10 14:30:19 -04:00

admin.py

MA-612 Mobile Push Notification Studio Django admin setting

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

context_processors.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-19 09:20:08 -04:00

course_group_config.py

SOL-495 Cohort-Aware content search

2015-05-14 14:07:42 -04: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

Merge pull request #8229 from edx/dcikatic/SOL-536

2015-06-03 13:55:42 +02: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

MA-612 Mobile Push Notification Studio Django admin setting

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

push_notification.py

MA-668 Mobile Push Notification payload update

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

signals.py

Added code to fire library_updated signal when library is updated

2015-04-14 12:41:24 +03: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

Convert all tabs to the new plugin framework.

2015-06-02 15:05:16 -04:00