20 Commits

Author	SHA1	Message	Date
Kevin Chugh	21f4616080	spread less than and greater than fix to responses and comments, and profile view	2013-02-12 09:18:46 -05:00
Kevin Chugh	d57c78f9d9	fix showing less than and greater than in code	2013-02-11 20:01:09 -05:00
Victor Shnayder	2af06ef1d4	Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" ... This reverts commit 66889b8724, reversing changes made to 0dd9c24e74. This was merged too early--it's still missing the filtering and display-your-cohort changes. Will need to revert this revert later.	2013-02-06 20:29:17 -05:00
Kevin Chugh	c7a133470d	inline discussions working	2013-02-05 22:43:09 -05:00
Your Name	d5b70d7bfc	inline cohorting working	2013-02-05 18:38:06 -05:00
Your Name	837f54c055	inline cohorting almost done	2013-02-04 20:10:08 -05:00
Your Name	3fa67c1425	allow moderators and students to select cohort on post creation	2013-01-31 17:05:15 -05:00
Chris Dodge	e70db062b2	Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ... Conflicts: requirements.txt	2013-01-03 10:46:24 -05:00
Chris Dodge	7229a9cdaf	perform a new merge from master, resolve conflicts	2013-01-03 10:43:03 -05:00
Brian Talbot	caf143514c	debugged tooltip latency/vanishing issue	2012-12-12 14:11:30 -05:00
Calen Pennington	93cc17cf3b	Starting to generate jasmine tests for common/lib	2012-11-14 15:03:55 -05:00
Calen Pennington	b52ed48221	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: common/lib/capa/capa/responsetypes.py common/lib/xmodule/xmodule/js/src/html/display.coffee lms/envs/common.py	2012-10-23 13:38:11 -04:00
Calen Pennington	8ca10a8356	Separate unit page from vertical implementation for editing	2012-10-01 15:19:35 -04:00
Calen Pennington	b305c0bae2	Make drag/drop save content immediately in seqs and verticals	2012-10-01 15:17:41 -04:00
Calen Pennington	fd7223bd87	Make editing work, building towards drag/drop saving	2012-10-01 15:17:41 -04:00
Calen Pennington	ce3638538c	Make inline editing save to mongo and then update the preview	2012-10-01 15:17:41 -04:00
Calen Pennington	44805ca383	Make discussion js work for cms as well as lms so that inline discussion xmodules load	2012-10-01 15:16:54 -04:00
Arjun Singh	26f31324c4	Moving a few static files out of lms into common	2012-08-07 13:39:59 -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