Calen Pennington 47ed02c9ea Remove more merge badness

2012-12-07 11:30:21 -05:00

..

management

Remove obsolete eager flag for xml modulestore

2012-08-30 19:26:50 -04:00

migrations

Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql.

2012-08-21 15:02:27 -04:00

tests

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-12-07 11:17:41 -05:00

__init__.py

Moving LMS code into subdirectory

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

access.py

Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course

2012-10-24 11:51:25 -04:00

admin.py

Moving LMS code into subdirectory

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

courses.py

make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter

2012-11-29 15:56:03 -05:00

grades.py

Check for None to fix 3.091 progress tab crash

2012-10-11 13:08:05 -04:00

models.py

Simple PEP8 issues.

2012-11-06 18:14:57 -05:00

module_render.py

be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling

2012-11-29 15:09:28 -05:00

progress.py

Cleaning up pep8 violations

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

tabs.py

remove (almost) all references to askbot.

2012-10-30 18:23:07 -04:00

urls.py

Moving LMS code into subdirectory

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

views.py

Remove more merge badness

2012-12-07 11:30:21 -05:00