Your Name
a761e2e829
make pinning backward compatible
2013-03-15 12:38:28 -04:00
Your Name
7f877344d6
added comment to explain sorting
2013-03-13 19:47:19 -04:00
Your Name
896ee094c6
added comment to explain sorting
2013-03-13 19:44:41 -04:00
Your Name
117be695cb
candidate without inline
2013-03-13 18:40:10 -04:00
Your Name
08bc073fa5
updates
2013-03-13 16:40:04 -04:00
Your Name
a2f9e4d565
almost there
2013-03-13 15:29:57 -04:00
Your Name
7450128064
update coffeescript
2013-03-13 12:52:07 -04:00
Your Name
8280c55992
pinning .1
2013-03-12 17:40:26 -04:00
Victor Shnayder
fb350ed1e3
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
...
Feature/abarrett/annotatable xmodule DO NOT MERGE
2013-03-06 12:05:27 -08:00
Your Name
b7a6eadca4
new cohorts tested
2013-03-01 16:33:27 -05:00
Arthur Barrett
afa7fca15a
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-27 11:58:38 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Arthur Barrett
72d9c1d7d2
Saving work-in-progress of guided classification exercise.
2013-02-18 19:02:54 -05:00
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
Your Name
f500806247
make hide/show synchronous for cohort filters
2013-02-08 18:18:12 -05:00
Your Name
cc0a6a2da9
make hide/show synchronous for cohort filters
2013-02-08 18:03:27 -05:00
Your Name
7761f6cb04
make cohort filter visibility conditional on selected commentable cohortedness
2013-02-08 17:22:29 -05:00
Your Name
21c06c741b
inline mustache working
2013-02-08 14:28:48 -05:00
Kevin Chugh
3cfc5c4545
cohort filter wokorking
2013-02-07 19:18:21 -05:00
Your Name
3965f9129d
cohort filter almost done
2013-02-07 18:13:53 -05:00
Kevin Chugh
d047d826c7
update coffeescript to hide cohort choice if first commmentable is not cohorted
2013-02-06 22:00:03 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
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
