Brian Talbot
|
439addc130
|
resolving further Sass conflicts within unit editing view styling
|
2013-01-03 11:49:58 -05:00 |
|
Vik Paruchuri
|
2c469cad75
|
Wire in submit message
|
2013-01-03 11:49:01 -05:00 |
|
Vik Paruchuri
|
1ac75b9420
|
Add in message passing pipeline
|
2013-01-03 11:47:41 -05:00 |
|
David Ormsbee
|
86247139a9
|
Merge pull request #1129 from MITx/valera/require-js
Inclusion of namespaced Require JS
|
2013-01-03 08:44:30 -08:00 |
|
Brian Talbot
|
7b75703556
|
resolving Sass issues caused by previous merge conflict resolution in branch
|
2013-01-03 11:44:09 -05:00 |
|
Diana Huang
|
09ed3d12a2
|
Hook up the backend into the new feedback response for scores
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
c87d0f11d6
|
Show error when no score selected
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
de7d6f184a
|
Parse out the score given into an int.
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
8f4efb0456
|
Hook up new radio buttons to the Javascript
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
69ae1cc268
|
Clean up the styling and make the evaluation parts collapsible.
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
54c541de45
|
Fix up the feedback-on-feedback styling and add radio button score selection.
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
fa97187a31
|
Patch naming issue
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
ad41558379
|
Hide submit button
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
b06ce84afd
|
Wire in submit message
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
b71233fd50
|
Add in message passing pipeline
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
ce3b84d0e5
|
Message passing in lms
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
b782f712b9
|
Add in more js to handle student feedback
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
634b586085
|
Integrate new ajax action
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
d663d23257
|
Work on adding in a new ajax post type
|
2013-01-03 11:40:41 -05:00 |
|
Jay Zoldak
|
8c4edc459c
|
update testing doc
|
2013-01-03 11:22:21 -05:00 |
|
cahrens
|
68def8af5b
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-03 11:21:35 -05:00 |
|
cahrens
|
e60230dd5a
|
More deletion
|
2013-01-03 11:21:01 -05:00 |
|
Don Mitchell
|
4e9d5c8a6a
|
Placeholders for markdown editor js and reference to pull it in from
CapaDescriptor. Overrode XMLEditorDescription
|
2013-01-03 11:15:06 -05:00 |
|
Don Mitchell
|
702636c00c
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-03 11:01:56 -05:00 |
|
Don Mitchell
|
31141299e8
|
Cache to pull CR's cleanup of branch
|
2013-01-03 11:00:41 -05:00 |
|
cahrens
|
b91e85c09f
|
Remove tiny_mce.
|
2013-01-03 10:53:42 -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 |
|
cahrens
|
e1b7a266fb
|
Remove askbot.
|
2013-01-03 10:42:54 -05:00 |
|
cahrens
|
4ede8d6ab6
|
tiny_mce
|
2013-01-03 09:50:35 -05:00 |
|
cahrens
|
f95499b14d
|
Work in progress, related to rich HTML editor.
|
2013-01-03 09:48:36 -05:00 |
|
Brian Wilson
|
c76f37050a
|
introduce form to template
|
2013-01-03 03:22:37 -05:00 |
|
valera-rozuvan
|
233a35e01e
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
7a8d83a17f
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
c5cd67a6a5
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
f2cce07bd7
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
37c7967e8c
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
213ca3fa32
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
fd0ec0ed8a
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
de63541049
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
d0c72ebe16
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
8af93229d3
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
7cf848db9e
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
c4f336d8fd
|
Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
8f120f1d27
|
Work on RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
c94530cb01
|
Added initial RequireJS Jasmine test.
|
2013-01-03 10:14:06 +02:00 |
|
valera-rozuvan
|
62271fe5c6
|
Added namespaced RequireJS.
|
2013-01-03 10:14:06 +02:00 |
|
Brian Wilson
|
4abd9cd3d4
|
get closer to working again
|
2013-01-02 18:56:25 -05:00 |
|
Diana Huang
|
c89ff2ac0e
|
Basic peer grading view using mocks and some cleanup in
the peer grading service
|
2013-01-02 17:44:58 -05:00 |
|
Don Mitchell
|
4f32d5f34d
|
Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
Conflicts:
cms/static/sass/_assets.scss
cms/static/sass/_base.scss
cms/static/sass/_unit.scss
cms/templates/unit.html
|
2013-01-02 17:39:27 -05:00 |
|