David Ormsbee eb96497cff Merge branch 'master' into feature/bk_forum_int ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt

2012-08-20 18:57:46 -04:00

..

css

Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red

2012-08-20 15:45:05 -04:00

js

Multiple file submissions

2012-08-19 09:26:03 -04:00

modulestore

hack item errors for now

2012-08-20 11:41:56 -04:00

tests

Keep each course's descriptors separate

2012-08-20 09:26:16 -04:00

util

Make tests pass again again

2012-08-07 11:08:56 -04:00

__init__.py

Make xmodule fit the typical python installation setup

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

abtest_module.py

address comment on #412

2012-08-15 10:27:07 -04:00

backcompat_module.py

html needs < in backcompat_module

2012-08-16 15:17:55 -04:00

capa_module.py

Add facility for fixed number of problem attempts

2012-08-16 14:27:28 -04:00

course_module.py

Merge pull request #464 from MITx/kimth/textbook

2012-08-20 12:38:14 -07:00

discussion_module.py

Remove unnecessary import that was failing a test

2012-08-20 16:48:31 -04:00

editing_module.py

todos and comments

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

error_module.py

Make start dates work for all modules

2012-08-14 23:30:37 -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 another backcompat html bug

2012-08-16 17:58:10 -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

Use .display_name instead of metadata['display_name']

2012-08-16 11:37:54 -04:00

stringify.py

Move files into xmodule module per comment on #326

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

template_module.py

Clean up customtag handling

2012-08-09 13:32:57 -04:00

timeparse.py

Make start dates work for all modules

2012-08-14 23:30:37 -04:00

vertical_module.py

Added descriptor to xmodule init. Now xmodules have pointer to their descriptor.

2012-08-07 13:43:30 -04:00

video_module.py

Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database.

2012-08-07 14:34:05 -04:00

x_module.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00

xml_module.py

New policy organization:

2012-08-16 11:41:19 -04:00