David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

features

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -04:00

management

Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi

2013-08-28 10:56:07 -04:00

migrations

move test_tasks to test_integration.

2013-06-18 11:17:16 -04:00

mock_xqueue_server

small pep8 pylint and superclass fixes

2013-03-29 10:41:27 -04:00

tests

Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi

2013-08-28 10:56:07 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

update forum access to include check for valid date range

2013-08-21 11:59:39 -04:00

admin.py

Limit the rate of logins.

2013-08-02 11:23:59 -04:00

courses.py

Merge pull request #652 from edx/feature/ichuang/import-with-no-static

2013-08-22 11:05:02 -07:00

grades.py

in grading, if problem cannot be created, return score as none

2013-08-16 10:25:38 -04:00

masquerade.py

use ENABLE_MASQUERADE in masquerade.py

2013-04-13 22:52:17 -04:00

model_data.py

Provide implicit saves for XBlocks and XModules.

2013-07-18 16:37:34 -04:00

models.py

set task_id on LMS side.

2013-06-18 11:17:16 -04:00

module_render.py

modify handling of info/handouts and module_render to honor static_asset_path

2013-08-20 18:08:01 -04:00

progress.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

tabs.py

fix tabs.py to properly handle static_asset_path

2013-08-20 18:09:57 -04:00

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

get_items should take a course_id

2013-08-19 23:42:26 -04:00