Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05:00

..

calc

298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

2013-11-19 12:52:13 +01:00

capa

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

chem

i18n for self-assessment (ORA-314)

2014-02-14 17:27:32 -05:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

2013-05-31 12:01:33 -04:00

symmath

pep8/pylint cleanup on symmath/formula.py

2014-02-11 09:46:24 -05:00

xmodule

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

django_startup.py

Very Minor tweaks to the LMS and CMS startup.

2014-01-02 14:27:52 -05:00

extract_tar.py

Use wrapped tar extraction

2013-10-04 15:47:58 -04:00

html_to_text.py

Hide "Email Settings" from student dash if bulk email not enabled

2013-08-29 12:40:33 -04:00

logsettings.py

Remove lms/lib from sys.path in favore of using it as the module lms.lib

2013-11-08 11:08:48 -05:00

rooted_paths.py

Sort the css and js assets by numerical index

2013-04-29 07:31:48 -04:00

sample-post.py

Update requests library to 1.2.3

2013-09-10 09:59:21 -04:00

supertrace.py

…

tempdir.py

Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.

2013-02-21 11:38:45 -05:00