Alexander Kryklia
|
ff0f21614e
|
started tests and add graders to capa_problem
|
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 |
|
Alexander Kryklia
|
36b1d4f1d0
|
graders for draganddrop
|
2013-01-21 15:55:45 +02:00 |
|
Alexander Kryklia
|
9efe1c0a4b
|
added parameters and rename
|
2013-01-21 15:55:45 +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 |
|
Alexander Kryklia
|
57bec4083e
|
updated inpyttype to new req
|
2013-01-21 15:54:57 +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
|
de954a41be
|
Changed back rakefile.
|
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 |
|
Alexander Kryklia
|
95060f3930
|
updated python part to sync with new interface
|
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 |
|
Alexander Kryklia
|
313055fe96
|
transfer images list to html
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
ccb8e96acb
|
fix
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
a394419641
|
updates
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
c7add85c9a
|
added new tag
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
0001a67ce1
|
update tag name
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
cc78ebe329
|
rename tag
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
ea3b1f93b0
|
updated drag and drop files
|
2013-01-21 15:53:43 +02:00 |
|
Alexander Kryklia
|
5200534a4a
|
template for drag_and_drop capaproblem
|
2013-01-21 15:52:49 +02:00 |
|
Kevin Chugh
|
b26c59bda0
|
fix syntax error
|
2013-01-20 01:53:25 -05:00 |
|
Brian Wilson
|
6da9c7bd9a
|
get (openId) provider_login to work with POST requests
|
2013-01-18 18:37:24 -05:00 |
|
Carlos Andrés Rocha
|
9790881af3
|
Merge pull request #1319 from MITx/bug/remove_extra_require_js
Remove extra RequireJS.js entry.
|
2013-01-18 14:07:07 -08:00 |
|
David Ormsbee
|
0f035b7692
|
Remove extra RequireJS.js entry.
|
2013-01-18 17:03:55 -05:00 |
|
David Ormsbee
|
84fa4a0192
|
Merge pull request #1318 from MITx/hotfix/rocha/javascript-error-in-sequence-display
Add missing semicolon at the end of sequence display module javascript
|
2013-01-18 14:02:27 -08:00 |
|
Carlos Andrés Rocha
|
84efafc896
|
Add missing semicolon at the end of sequence display module javascript
|
2013-01-18 17:00:51 -05:00 |
|
Diana Huang
|
c7421f040b
|
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
|
2013-01-18 16:45:36 -05:00 |
|
Diana Huang
|
ef53bab5dd
|
One more fix
|
2013-01-18 16:41:00 -05:00 |
|
Diana Huang
|
6ab7afac4a
|
One more merge fix
|
2013-01-18 16:37:47 -05:00 |
|
Diana Huang
|
dd20226ec3
|
Merge branch 'master' into feature/diana/rubric-input
Fix some merge issues involving rubric rendering
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/open_ended_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
|
2013-01-18 16:36:22 -05:00 |
|
chrisndodge
|
2767610ef6
|
Merge pull request #1317 from MITx/feature/cdodge/cms-master-merge4
Feature/cdodge/cms master merge4
|
2013-01-18 13:28:02 -08:00 |
|
Diana Huang
|
8cdc118a1d
|
Typo fix
|
2013-01-18 16:26:47 -05:00 |
|
Diana Huang
|
e04f2f984a
|
Update tests for new behavior
|
2013-01-18 16:18:33 -05:00 |
|
Diana Huang
|
2291483c43
|
Merge branch 'master' into diana/open-ended-ui-updates
|
2013-01-18 16:16:21 -05:00 |
|
Chris Dodge
|
0efd6e6a15
|
Merge branch 'master' into feature/cdodge/cms-master-merge4
|
2013-01-18 16:14:27 -05:00 |
|
David Ormsbee
|
44e7d6b267
|
Merge pull request #1315 from MITx/diana/fix-sa-tests
Quick fixes to self assessment tests
|
2013-01-18 13:07:33 -08:00 |
|
Diana Huang
|
999a648c3f
|
Merge branch 'master' into diana/fix-sa-tests
|
2013-01-18 15:49:03 -05:00 |
|
Chris Dodge
|
550e805b74
|
Merge branch 'master' into feature/cdodge/cms-master-merge4
Conflicts:
common/lib/xmodule/xmodule/course_module.py
|
2013-01-18 15:44:41 -05:00 |
|
Chris Dodge
|
39101c76a5
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
|
2013-01-18 15:43:45 -05:00 |
|
David Ormsbee
|
878640b651
|
Merge pull request #1316 from MITx/bugfix/victor/beta_testers
fix tests--nosetests is overly excited about my code
|
2013-01-18 12:43:11 -08:00 |
|