Vik Paruchuri
|
0567e8f0aa
|
Factor out rubric rendering
|
2013-01-14 10:35:53 -05:00 |
|
Diana Huang
|
1680336da6
|
Fix some minor bugs in the staff grading interface
|
2013-01-14 10:22:22 -05:00 |
|
Vik Paruchuri
|
c7339ee664
|
Minor bug fix
|
2013-01-14 10:16:57 -05:00 |
|
cahrens
|
c1c64e6b92
|
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
|
2013-01-14 09:53:39 -05:00 |
|
Christina Roberts
|
c9c9f7e54f
|
Merge pull request #1268 from MITx/feature/cas/speed-editor
menu bar for heading and explanation
|
2013-01-14 06:39:07 -08:00 |
|
Brian Talbot
|
e82987a32d
|
problem editor - revised classes on editor cheatsheet text and explanation tooltip text
|
2013-01-14 09:37:38 -05:00 |
|
chrisndodge
|
fdba0e48dc
|
Merge pull request #1270 from MITx/bug/dhm/jan13
Fixed bug 114: randomized problems never right b/c state not preserved
|
2013-01-14 06:21:47 -08:00 |
|
Diana Huang
|
a0c0005e95
|
Updates to the javascript and the grading controller
to handle rubric input
|
2013-01-14 08:58:33 -05:00 |
|
Brian Talbot
|
11656feba3
|
one last style tweak to problem header styling
|
2013-01-13 13:10:29 -05:00 |
|
Brian Talbot
|
2429192765
|
resolved problem headers/general H1 elements floating by default in component views
|
2013-01-13 13:07:11 -05:00 |
|
Brian Talbot
|
1cf5e10a34
|
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
|
2013-01-13 12:47:30 -05:00 |
|
Brian Talbot
|
04e9447367
|
added in icons for header and explanation markdown elements
|
2013-01-13 12:15:29 -05:00 |
|
Brian Wilson
|
8e059ff934
|
fix placeholders for phone_country_code values, and subject line of exam_help email.
|
2013-01-12 00:58:04 -05:00 |
|
Brian Wilson
|
3d0384692c
|
add pearson_make_tc_registration command
|
2013-01-11 17:50:02 -05:00 |
|
Diana Huang
|
f3e8d01e08
|
Pull out old rubric and score selection logic
and set up the new rubric
|
2013-01-11 17:29:39 -05:00 |
|
jmvt
|
d230c1b03c
|
Added example of geographic student distribution over world map.
|
2013-01-11 17:14:29 -05:00 |
|
Don Mitchell
|
1bf2cdd528
|
Changed order of buttons to match order of cheat sheet
|
2013-01-11 17:01:50 -05:00 |
|
Don Mitchell
|
033264b58d
|
Change case of Explanation to match markdown (although it's functionally
equivalent)
|
2013-01-11 16:57:00 -05:00 |
|
Don Mitchell
|
06aa4a553e
|
Correct file name case (which I thought mac os would catch :-(
|
2013-01-11 16:53:23 -05:00 |
|
Don Mitchell
|
7d8276b6c5
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-11 16:52:10 -05:00 |
|
Don Mitchell
|
208ed0a438
|
Fixed bug 114: randomized problems never right b/c state not preserved
on server
|
2013-01-11 16:48:19 -05:00 |
|
cahrens
|
a4b6851e6c
|
Remove some dead css.
|
2013-01-11 16:11:09 -05:00 |
|
Vik Paruchuri
|
7d0bb7b3fe
|
Minor string to boolean fix
|
2013-01-11 16:02:09 -05:00 |
|
cahrens
|
caf55f5f8d
|
Merge branch 'feature/cas/speed-editor' into feature/christina/tiny-mce
|
2013-01-11 15:51:42 -05:00 |
|
Vik Paruchuri
|
682ac3455b
|
Address some comments from code review, fix rubric display
|
2013-01-11 15:51:37 -05:00 |
|
cahrens
|
dcad564044
|
Pretty much works.
|
2013-01-11 15:50:46 -05:00 |
|
chrisndodge
|
4efe5789ed
|
Merge pull request #1269 from MITx/feature/cdodge/cms-master-merge3
Feature/cdodge/cms master merge3
|
2013-01-11 12:23:29 -08:00 |
|
Don Mitchell
|
ab7be1a6e0
|
Unit tests
|
2013-01-11 15:22:30 -05:00 |
|
Don Mitchell
|
5920142f71
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-11 15:05:30 -05:00 |
|
Don Mitchell
|
755bf709a5
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-11 14:44:38 -05:00 |
|
Chris Dodge
|
9479ef3c84
|
fix up call signatures for get_parent_locations()
|
2013-01-11 14:29:53 -05:00 |
|
Brian Talbot
|
7d445f5630
|
studio - tweaking problem editor's advanced editor toggle control UI and prompt message
|
2013-01-11 14:25:22 -05:00 |
|
Chris Dodge
|
08adf9c0d5
|
Merge branch 'master' into feature/cdodge/cms-master-merge3
Conflicts:
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/search.py
common/lib/xmodule/xmodule/modulestore/xml.py
doc/development.md
lms/envs/common.py
|
2013-01-11 14:04:46 -05:00 |
|
Vik Paruchuri
|
9a752f51c7
|
Fix rubric return, add in score field
|
2013-01-11 12:48:15 -05:00 |
|
Vik Paruchuri
|
7febe2c2c8
|
Integrate minimal rubric display
|
2013-01-11 12:43:57 -05:00 |
|
Jay Zoldak
|
d0c4e2e916
|
Merge pull request #1267 from MITx/bug/btalbot/cms-sectiontoggling-test
studio - changed expectation of lettuce test for course overview toggle
|
2013-01-11 09:33:15 -08:00 |
|
Brian Talbot
|
e7e26a471c
|
studio - changed expectation of lettuce test for course overview section toggling
|
2013-01-11 12:03:17 -05:00 |
|
chrisndodge
|
445a923ab8
|
Merge pull request #1266 from MITx/fix/cdodge/preview-failing
need to add the depth parameter to the DraftMongoStore implementation ...
|
2013-01-11 08:59:24 -08:00 |
|
Chris Dodge
|
476e6c7b3b
|
need to add the depth parameter to the DraftMongoStore implementation of get_instance
|
2013-01-11 11:57:41 -05:00 |
|
Vik Paruchuri
|
52164f58ff
|
Fix self.get call in peer grading service
|
2013-01-11 11:39:32 -05:00 |
|
Calen Pennington
|
5dd83e4d5f
|
Remove import
|
2013-01-11 11:10:51 -05:00 |
|
chrisndodge
|
0919c185f6
|
Merge pull request #1265 from MITx/bug/dhm/jan13
Handle metadata from save being empty
|
2013-01-11 07:55:51 -08:00 |
|
Don Mitchell
|
c05d887904
|
Handle metadata from save being empty
|
2013-01-11 10:39:57 -05:00 |
|
Don Mitchell
|
64507bd5fd
|
Drop down for markup done but w/o new icons
|
2013-01-11 10:36:42 -05:00 |
|
chrisndodge
|
5368a9ad3e
|
Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf
Decrease the number of queries needed for LMS courseware
|
2013-01-11 07:23:00 -08:00 |
|
Christina Roberts
|
4eca8254ae
|
Merge pull request #1264 from MITx/feature/cas/speed-editor
Cheat sheet for heading and explanation.
|
2013-01-11 06:53:26 -08:00 |
|
Brian Talbot
|
5d40d22136
|
revised rejected state error message content, markup, and styling on registration's right hand side status area
|
2013-01-11 09:52:46 -05:00 |
|
Vik Paruchuri
|
1dca370a7f
|
Better initial documentation of combined open ended
|
2013-01-11 09:50:43 -05:00 |
|
Vik Paruchuri
|
bcbf65e2b9
|
Code reformat, line length fix, change text names to variables
|
2013-01-11 09:45:10 -05:00 |
|
cahrens
|
cbf5174bcd
|
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
|
2013-01-11 09:40:05 -05:00 |
|