Commit Graph

10228 Commits

Author SHA1 Message Date
Diana Huang
24f23176af Add the ability to set up custom text for short form and
and long form results.
2013-01-22 13:17:37 -05:00
Chris Dodge
9520290018 add optional course_id parameter to DraftMongoStore.get_items() 2013-01-22 11:55:36 -05:00
Don Mitchell
6ce300a3c8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
Conflicts:
	cms/static/js/base.js
	cms/static/js/hesitate.js
2013-01-22 11:47:49 -05:00
Don Mitchell
1b64faf610 Caching to change branches for other work 2013-01-22 11:42:23 -05:00
Don Mitchell
48fa4b4a5e Cache in order to try updated sortable lib 2013-01-22 11:39:23 -05:00
Don Mitchell
edda80d485 New style base python classes and basestring type. 2013-01-22 11:30:24 -05:00
Diana Huang
9a53c37530 Use something more visually easy to use for self-assessment. 2013-01-22 11:25:12 -05:00
Brian Wilson
9653631e9a Add initial openid_provider tests (covers xrds and authentication requests) 2013-01-22 11:15:30 -05:00
Diana Huang
ba1cd8117f Rename 'Pending' column to something more descriptive 2013-01-22 10:33:07 -05:00
Diana Huang
a34a9dd038 Merge branch 'master' into diana/open-ended-ui-updates 2013-01-22 08:40:40 -05:00
Diana Huang
e7bc32fd4d Merge branch 'master' into feature/diana/rubric-input 2013-01-22 08:38:17 -05:00
ichuang
5d6c5de8e9 Merge pull request #1324 from MITx/pbaratta/symmath
Added some symmath comments
2013-01-22 05:01:48 -08:00
Peter Baratta
45f2a690d0 Commented on high level functions 2013-01-22 01:40:13 -07:00
Victor Shnayder
26f7b984a7 Merge pull request #1323 from MITx/content/rocha/lewin-announcement
Content/rocha/lewin announcement
2013-01-21 14:19:54 -08:00
Carlos Andrés Rocha
183721ecf5 Correct last screenshot caption of media-kit page.
[#159]
2013-01-21 16:58:35 -05:00
Carlos Andrés Rocha
899c501d3d Add announcement of Walter Lewin's course
[#157]
2013-01-21 16:58:27 -05:00
Victor Shnayder
715a179015 Merge pull request #1321 from MITx/feature/alex/drag_and_drop-mitx
Feature/alex/drag and drop mitx
2013-01-21 09:36:11 -08:00
Alexander Kryklia
91281915c4 update of deleted comment 2013-01-21 19:28:49 +02:00
Alexander Kryklia
00f966a94a populate -> __init__ 2013-01-21 19:22:23 +02:00
Alexander Kryklia
a95e809824 documentation extended 2013-01-21 19:05:30 +02:00
Alexander Kryklia
2d67ee477e commend about rule in simple form 2013-01-21 18:58:30 +02:00
Alexander Kryklia
0f5e7cd9e4 explained for - else 2013-01-21 18:55:29 +02:00
Alexander Kryklia
e78c020a52 removed dublicate comment 2013-01-21 18:38:03 +02:00
Alexander Kryklia
07c1085966 improved readability of drag and drop render test 2013-01-21 18:33:17 +02:00
Alexander Kryklia
3e0333309d removed openendedinput 2013-01-21 18:03:04 +02:00
Valera Rozuvan
e273bb1259 Updated DOCS with sample XML for DnD. 2013-01-21 15:56:39 +02:00
Alexander Kryklia
b25d4224b5 updated docs 2013-01-21 15:56:39 +02:00
Alexander Kryklia
a4e8cb362d updated docs 2013-01-21 15:56:39 +02: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
Alexander Kryklia
a228c163c7 added test for alternative answer notation 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
Alexander Kryklia
35174dd36c resised picture 2013-01-21 15:56:37 +02:00
Valera Rozuvan
8b3a8a30ab Refactoring. 2013-01-21 15:56:37 +02:00
Alexander Kryklia
d231b9ed04 update docs 2013-01-21 15:56:37 +02:00
Alexander Kryklia
4215f4f923 add and update tests 2013-01-21 15:56:37 +02:00
Alexander Kryklia
de35d1e9e4 update docs 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
Alexander Kryklia
e47f0e45f2 unorderly->unordered 2013-01-21 15:56:36 +02:00
Alexander Kryklia
099c79c881 update docs 2013-01-21 15:56:36 +02:00
Alexander Kryklia
a6f87dcfdc updated docs 2013-01-21 15:56:36 +02:00
Alexander Kryklia
e017297d3f fix 2013-01-21 15:56:36 +02:00
Alexander Kryklia
c8bbcacfef labels reuse logic and tests 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