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

617 Commits

Author SHA1 Message Date
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
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02: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
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
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04: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
Tom Giannattasio
f84b603133 wrapped up section date setting; need help with already published sections 2012-10-22 16:43:44 -04:00
Chris Dodge
8ad26fc27e replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not. 2012-10-18 21:11:46 -04:00
chrisndodge
6011d6d333 Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks 
improvements on asset upload refresh. Now we don't need to refresh the w...
 2012-10-17 10:47:47 -07:00
Chris Dodge
82e77a26c6 add mustache.js to common static repo 2012-10-17 13:47:07 -04:00
Victor Shnayder
f4d8df94dd Make chem preview more robust 
- give the preview div an id, use that to look it up instead of dancing around in the DOM
 2012-10-14 11:35:32 -04:00
ichuang
bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface 2012-10-13 22:33:41 -04:00
Victor Shnayder
db8639e06a Fix preview code 
- I'm starting to vaguely understand js variable scope and closures.  Long way to go though :)
 2012-10-12 22:52:41 -04:00
Chris Dodge
a12baec599 add new files 2012-10-12 20:55:16 -04:00
Victor Shnayder
1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page 2012-10-12 19:18:58 -04:00