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
Don Mitchell
26e55f34a4
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 09:39:25 -05:00
cahrens
882eed4f89
Saving work.
2013-01-11 09:39:07 -05:00
Christina Roberts
5e28e59817
Merge pull request #1262 from MITx/feature/cas/speed-editor
...
explanation markdown
2013-01-11 06:37:26 -08:00
Don Mitchell
d53ca05d6c
Placeholder images for cheat sheet
2013-01-11 09:37:08 -05:00
Don Mitchell
e095a139b9
Cheat sheet updated for header and explanation. Video removed.
2013-01-11 09:36:29 -05:00
Diana Huang
5a211f566d
Make the rubric smaller so that we can accomodate more columns.
2013-01-11 09:31:38 -05:00
ichuang
4f869ad382
remove spurious comment
2013-01-11 00:10:52 -05:00
ichuang
b7ad39a0b9
instructor dashboard shouldn't import .grading anymore
2013-01-11 00:09:46 -05:00
ichuang
ed96046ad7
add documentation on remote gradebook xserver API
2013-01-10 23:59:20 -05:00
ichuang
37f848949d
only is_staff users can add/edit/delete course instructors
2013-01-10 23:32:49 -05:00
ichuang
5cc88ec1ad
example course_id for compute_grades management command
2013-01-10 23:32:48 -05:00
Calen Pennington
9853c6323f
Remove circular dependencies that connect student.models and django_comment_client
...
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py
Conflicts:
common/djangoapps/student/models.py
2013-01-10 23:32:48 -05:00
ichuang
ec94f7328c
remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260
2013-01-10 23:32:48 -05:00
ichuang
e5c958082b
list/add/delete instructors on instructor dashboard
2013-01-10 23:32:48 -05:00
ichuang
16b91cf732
remove spurious old migration file
2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c
add offline grade computation & DB table for this
2013-01-10 23:32:48 -05:00
ichuang
82e31d533b
Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py
2013-01-10 23:31:46 -05:00
ichuang
97fb054449
add export grades to remote gradebook to instructor dashboard
2013-01-10 23:31:46 -05:00
ichuang
200493a54f
instructor dashboard upgrade - add enrollment management
2013-01-10 23:31:45 -05:00
Vik Paruchuri
8dbbb021a7
Change value passing to hidden input type
2013-01-10 19:00:04 -05:00
Vik Paruchuri
c76786ae4e
Roll back hidden input changes
2013-01-10 19:00:04 -05:00
Vik Paruchuri
ee2990da4f
Change hidden div to input name
2013-01-10 19:00:04 -05:00
Vik Paruchuri
e4568c3a20
Use include clearfix in css
2013-01-10 19:00:04 -05:00
