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

..

discussion

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

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

xblock

Merge pull request #2724 from edx/will/studio-xblock-save

2014-02-27 10:50:51 -05:00

.gitignore

Move Logger and *withPrefix javascript into a common location

2012-07-24 16:14:03 -04:00

ajax_prefix.coffee

Move Logger and *withPrefix javascript into a common location

2012-07-24 16:14:03 -04:00

jquery.immediateDescendents.coffee

Add an XBlock javascript runtime, and use it to run XModules

2013-10-18 16:31:32 -04:00

logger.coffee

switch from log_event to Logger.log

2013-08-20 16:52:18 -04:00

xproblem.coffee

Moving a few static files out of lms into common

2012-08-07 13:39:59 -04:00