17 Commits

Author	SHA1	Message	Date
Brittany Cheng	32cf7c6f66	Merge branch 'master' of github.com:MITx/mitx into discussion2	2012-07-31 11:26:17 -04:00
Kyle Fiedler	2bbb19790d	Fixed jquery ui image problem and added a base style sheet for lms to override fonts	2012-07-31 11:06:39 -04:00
Rocky Duan	d6b7707725	refactored reply rendering by using mustache	2012-07-30 18:19:04 -04:00
Rocky Duan	8228bebc2a	Merge branch 'master' of github.com:MITx/mitx ... Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/envs/common.py	2012-07-30 17:41:19 -04:00
Calen Pennington	c9e637d719	Make cms and lms tests run independently (they had been colliding on collectstatic)	2012-07-30 12:58:45 -04:00
Rocky Duan	3ad309c2fd	forgot to include files & tiny styling fix	2012-07-29 17:40:11 -04:00
Rocky Duan	8e3251c915	basic tag autocomplete	2012-07-29 17:32:00 -04:00
Rocky Duan	b92a180d25	add tags to threads & view threads by tags	2012-07-29 15:24:15 -04:00
Rocky Duan	0790a3add4	image uploading & render markdown	2012-07-27 17:50:38 -04:00
Rocky Duan	f0ce33c951	make mathjax working with the editor	2012-07-26 15:34:22 -04:00
Rocky Duan	7103bd0071	moved vendor js files to common	2012-07-25 20:57:38 -04:00
Calen Pennington	29cf09763f	Fixing up cms tests to only use data in common/test/data	2012-07-25 10:09:25 -04:00
Calen Pennington	bdf964a305	Modularize video css	2012-07-24 16:14:05 -04:00
Calen Pennington	6029c28695	Modularize sequence css	2012-07-24 16:14:04 -04:00
Calen Pennington	408726e678	Standardize how JS XModules are instantiated	2012-07-24 16:14:04 -04:00
Calen Pennington	8481937f59	Move Logger and *withPrefix javascript into a common location	2012-07-24 16:14:03 -04:00
Calen Pennington	87ce82570d	Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware	2012-07-24 16:14:03 -04:00