Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

1009 Commits

Author SHA1 Message Date
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
Valera Rozuvan
1cc23e3a4d Bugfixing. 2013-01-21 15:56:29 +02:00
Valera Rozuvan
2e08ece7ff Fixed drag behavior. Now drag of icon itself rather than container element. This allows for finer selection (no overlap of transparent areas), and positioning of icon precisely onto a target. This breaks labels - TODO fix. 2013-01-21 15:56:29 +02:00
Valera Rozuvan
f1f3b2ea8b Slight UI design change. Draggables are now positioned in the center of their container DIV. 2013-01-21 15:56:27 +02:00
Valera Rozuvan
108b0fc384 Refactoring and code documentation. 2013-01-21 15:55:47 +02:00
Valera Rozuvan
58483319a3 Refactoring. 2013-01-21 15:55:47 +02:00
Valera Rozuvan
3abdd1801d Removed debug comments. 2013-01-21 15:55:47 +02:00
Valera Rozuvan
9ef0c563ef Slight changes in UI styling. 2013-01-21 15:55:47 +02:00
Valera Rozuvan
3bbe0759ea Added support for reading answer from input element (as set by server). 2013-01-21 15:55:47 +02:00
Valera Rozuvan
86d133664a Fixing bugs. Now resize of window does not mess up targets. Dragging is much smoother on touch pad. Removed border from draggable when it is not in slider. The whole applet fits into min-width of main part of page. 2013-01-21 15:55:46 +02:00
Alexander Kryklia
b45fe0e652 update format 2013-01-21 15:55:46 +02:00
Valera Rozuvan
f9169613fc Making JS work with the new XML format. 2013-01-21 15:55:46 +02:00
Valera Rozuvan
4268f04069 Updated JS part to use new XML format. 2013-01-21 15:55:46 +02:00
Valera Rozuvan
c5d4f54aa2 Slight changes to UI design. Part 2. 2013-01-21 15:55:45 +02:00
Valera Rozuvan
545b1bea24 Slight changes to UI design. 2013-01-21 15:55:45 +02:00
Valera Rozuvan
3048853749 Added ability to communicate with server via input element. Work in progress. Part 8. 2013-01-21 15:55:45 +02:00
Valera Rozuvan
c34fbbe19f Added support for individual targets. Work in progress. Part 7. 2013-01-21 15:55:45 +02:00
Valera Rozuvan
e842415194 Added ability to define targets on the target container. Work in progress. Part 6. 2013-01-21 15:55:45 +02:00
Valera Rozuvan
06f1c54fa7 Fix. Now the z index stack is consistent. 2013-01-21 15:55:44 +02:00
Valera Rozuvan
f0850f4c4b Updated JS to use latest JSON def. 2013-01-21 15:55:44 +02:00
Valera Rozuvan
b1a73a5293 Client side drag and drop. Work in progress. Part 5. 2013-01-21 15:55:44 +02:00
Valera Rozuvan
4594986b38 Client side drag and drop. Work in progress. Part 4. 2013-01-21 15:54:56 +02:00
Valera Rozuvan
06fd823881 Client side drag and drop. Work in progress. Part 3. 2013-01-21 15:54:56 +02:00
Valera Rozuvan
f659247739 Client-side Drag and Drop: work in progress. Part 2. 2013-01-21 15:54:56 +02:00
Valera Rozuvan
8d69049746 Client-side Drag and Drop: work in progress. Part 1. 2013-01-21 15:53:44 +02:00
Valera Rozuvan
61c68b740c Set up of basic RequireJS skeleton structure. 2013-01-21 15:53:44 +02:00
Valera Rozuvan
757f955c5e Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course. 2013-01-21 15:53:44 +02:00
jmvt
bc268aa791 Merged to lastest master. 2013-01-17 17:39:12 -05:00
Brian Talbot
db7443ce7c studio html editor - added in visual assets needed for previous UI syncing 2013-01-16 16:56:22 -05:00
cahrens
b58577a913 Version 3.5.8 of tinyMCE. http://www.tinymce.com/ 2013-01-14 15:41:12 -05:00
cahrens
6312022b6e Delete old version of tiny_mce. 2013-01-14 15:41:12 -05:00
cahrens
3cc63f1b2f tiny_mce 2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a Work in progress, related to rich HTML editor. 2013-01-14 15:41:12 -05:00
jmvt
d230c1b03c Added example of geographic student distribution over world map. 2013-01-11 17:14:29 -05:00
Don Mitchell
04582f4e7c Update timepicker b/c it wasn't handling minutes from 01-09 and they'd 
fixed it
 2013-01-10 11:05:14 -05:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Chris Dodge
1d7baccb38 add info-icon.png 2013-01-04 11:41:16 -05:00
Chris Dodge
349fd89eb8 fix tests on merge 2013-01-04 10:32:31 -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
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02:00
chrisndodge
d965221ec7 Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips 
debugged tooltip latency/vanishing issue
 2012-12-14 06:26:48 -08:00
Brian Talbot
caf143514c debugged tooltip latency/vanishing issue 2012-12-12 14:11:30 -05:00
Don Mitchell
a46c1f4883 Updated underscore (using _.invert()) 
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
 2012-12-11 14:18:13 -05:00
Calen Pennington
3b2b8ad4fa Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests 
Capa Problem jasmine tests running independently
 2012-11-16 13:35:19 -08:00
Chris Dodge
0be0889d9c in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro 2012-11-15 15:21:40 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00