Rocky Duan 0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-06 22:38:31 -04:00

..

css

Strip down sequence navigaiton and more stripping of the courseware nav

2012-08-01 17:36:10 -04:00

js

Refactor list of inputs in ajax

2012-08-06 15:44:27 -04:00

modulestore

start on lms migration path: view for loaded modules, and reload method

2012-08-03 20:20:35 -04:00

tests

Move files into xmodule module per comment on #326

2012-08-02 10:13:58 -04:00

__init__.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

abtest_module.py

Adding comment about future of user groups

2012-07-11 22:19:34 -04:00

backcompat_module.py

Import error cleanup

2012-08-01 11:48:19 -04:00

capa_module.py

Merge pull request #340 from MITx/kimth/lms-coderesponse

2012-08-06 12:17:15 -07:00

course_module.py

Import error cleanup

2012-08-01 11:48:19 -04:00

discussion_module.py

forgot to change template name

2012-08-01 16:47:20 -04:00

editing_module.py

todos and comments

2012-08-02 11:33:53 -04:00

error_module.py

Responding to comments on pull #326

2012-08-02 09:56:01 -04:00

errortracker.py

Responding to comments on pull #326

2012-08-02 09:56:01 -04:00

exceptions.py

Return a custom error for duplicate elements, and ignore it when loading into mongo

2012-07-30 13:16:21 -04:00

graders.py

Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.

2012-08-01 11:27:04 -04:00

hidden_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

html_checker.py

Move files into xmodule module per comment on #326

2012-08-02 10:13:58 -04:00

html_module.py

fix for some broken github edit links - avoids symlinks

2012-08-05 11:39:56 -04:00

mako_module.py

Turn error_handlers into error_trackers

2012-08-01 11:48:18 -04:00

progress.py

Cleaning up pep8 violations

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

raw_module.py

Turn error_handlers into error_trackers

2012-08-01 11:48:18 -04:00

schematic_module.py

Cleaning up pep8 violations

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

seq_module.py

Make decision about export file splitting overrideable

2012-07-27 16:08:22 -04:00

stringify.py

Move files into xmodule module per comment on #326

2012-08-02 10:13:58 -04:00

template_module.py

add back-compat code to customtag

2012-08-01 16:33:28 -04:00

vertical_module.py

Adding stripped down 6002x course for testing, along with CMS test for edit pages for same

2012-07-24 16:13:51 -04:00

video_module.py

Rename module.name and descriptor.name to url_name

2012-08-03 11:36:54 -04:00

x_module.py

Update ModuleSystem

2012-08-06 16:28:15 -04:00

xml_module.py

log.debug -> log.exception; revert log change in xml_module

2012-08-06 13:58:42 -04:00