Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,024 Commits 1 Branch 0 Tags
21c06c741be51ea3dc842f119ca319b5dbbf0263
Commit Graph

153 Commits

Author SHA1 Message Date
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
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -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
Don Mitchell
b3d7dc779d Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-29 13:17:15 -05:00
Don Mitchell
ba95cf2385 Auto expand on hover of drag&drop unit 2013-01-29 13:10:23 -05:00
Victor Shnayder
39a9c47512 make links look like links 2013-01-29 11:33:26 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Don Mitchell
e58193f87f Updated comment 2013-01-25 13:03:54 -05:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll 
racing condition.
 2013-01-25 12:44:58 -05:00
Victor Shnayder
103db8aaf3 add conflict detection--users should be in at most one cohort per course 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00
cahrens
b554eb5afe Cleanup of format dropdown, toolbar buttons. 2013-01-22 15:28:47 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Valera Rozuvan
47d1173394 Refactoring and cleaning of code. 2013-01-21 15:56:39 +02:00
Valera Rozuvan
3cc4a663ff Refactoring and cleaning of code. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
5457f35f81 Drag and Drop: Further testing of new feature "can reuse". 2013-01-21 15:56:38 +02:00
Valera Rozuvan
7ad6ef21f4 Removed unnecessary debug information. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
1eec7bada7 Updated docs. Added debug output info for tracing problem related to server communications. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
0f7b89facc Bug fixes for new functionality: Draggable "is reusable". 2013-01-21 15:56:38 +02:00
Valera Rozuvan
5001680356 Implemented isReusable feature. Not fully tested. 2013-01-21 15:56:38 +02:00
Valera Rozuvan
98977cabdb Refactoring of Drag and Drop complete. Draggable properties isUsable, isOriginal included, but functionality connected with them is not complete. Found and fixed bug with z-index ordering. 2013-01-21 15:56:37 +02:00
Valera Rozuvan
f15887383e Refactoring. 2013-01-21 15:56:37 +02:00
Valera Rozuvan
8b3a8a30ab Refactoring. 2013-01-21 15:56:37 +02:00
Valera Rozuvan
79f5e98dfc Drag and Drop: refactoring + preparing for reuse of draggables. 2013-01-21 15:56:36 +02:00
Valera Rozuvan
ead346ee5f Refactoring. New feature: adding multiple draggables from one. 2013-01-21 15:56:36 +02:00
Valera Rozuvan
22014f7f58 New feature: Clicking on number for multiple icons on target will cycle all icons on target. Fixed bug with z-order ordering. 2013-01-21 15:56:35 +02:00
Valera Rozuvan
6d7cfe08df Slight UI modification. 2013-01-21 15:56:35 +02:00
Valera Rozuvan
15ffc1f64f New feature: added ability to define custom label background color. Upated demo to use this feature. Needs to be turned on Python side. 2013-01-21 15:56:35 +02:00
Valera Rozuvan
f92c0bdceb New feature: when the draggable is out of the slider container, if it has a label, the label will get a background. This way it is much easier to discern the label against the base image. 2013-01-21 15:56:34 +02:00
Valera Rozuvan
cd6e220ead Fixed annoying bug whre if you dragged any part of the base image or other parts of the Drag and Drop problem, then the browser would start highlighting the elements. 2013-01-21 15:56:34 +02:00
Valera Rozuvan
b7b25369e0 Added mouse event handlers to container of draggable. Now it is easier to initiate a dragging operation. 2013-01-21 15:56:34 +02:00
Valera Rozuvan
d531746236 Removed reliance on imageDir config setting. Now we expect the correct path to tbe set in XML. 2013-01-21 15:56:33 +02:00
Valera Rozuvan
a9e7890d6b Added correct handling of invalid (missing) base images. Now error is reported, and the damage is reduced to a minimum. 2013-01-21 15:56:32 +02:00
Valera Rozuvan
9817253850 Fixed problem with smaller and larger base images. Refactoring. Cleaning of code. 2013-01-21 15:56:32 +02:00
Valera Rozuvan
f283df9022 Cleaning up code. 2013-01-21 15:56:31 +02:00
Valera Rozuvan
ab95193252 Bugfixing. 2013-01-21 15:56:30 +02:00
Valera Rozuvan
17b01071d0 Fixed bug. 2013-01-21 15:56:30 +02:00
Valera Rozuvan
586a47a2ad Rewrote functionality to include labels as separate from the container. Fixed bugs. Refactoring. 2013-01-21 15:56:30 +02:00