Arthur Barrett
a9773eb888
Updated markup, styling, and tooltip behavior for displaying instructor comments. Added drag/drop to the comments so the user can organize them as they wish after clicking on the span. When the user hides the annotations, their positions on the screen are remembered so they can be restored later. Also modified the markup so that block content can be displayed.
2013-02-08 20:38:24 -05:00
Your Name
cc0a6a2da9
make hide/show synchronous for cohort filters
2013-02-08 18:03:27 -05:00
Your Name
7761f6cb04
make cohort filter visibility conditional on selected commentable cohortedness
2013-02-08 17:22:29 -05:00
Your Name
bcf9dfc2b3
add css change to cohort dropdown for zoom support
2013-02-08 15:44:56 -05:00
Your Name
b980399f5f
change cohort dropdown verbiage
2013-02-08 15:41:11 -05:00
Victor Shnayder
0e06f5f587
Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui
2013-02-08 15:01:30 -05:00
Victor Shnayder
6d9a9ec46f
Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
...
This reverts commit e4819a1b55b6ec41cae0
2013-02-08 15:00:25 -05:00
Your Name
df0b6aca7d
inline mustache working
2013-02-08 14:41:36 -05:00
Your Name
21c06c741b
inline mustache working
2013-02-08 14:28:48 -05:00
David Ormsbee
80843c1561
Merge pull request #1463 from MITx/feature/brian/pearson-exam
...
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Victor Shnayder
a68094515c
fix capitalization and spacing
2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6
fix typo; fix phrasing for software engineer job
2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885
Posting lots of new jobs
2013-02-08 12:15:09 -05:00
ichuang
96d119965c
limit staff debug verbosity to locations of specific categories
2013-02-08 10:52:03 -05:00
ichuang
04cc257bdd
fix module staff accesss - by has_access, not by user.is_staff
2013-02-08 10:46:17 -05:00
Calen Pennington
bda46c423d
Fix some issues that were prevent lms start
2013-02-08 10:41:02 -05:00
Kevin Chugh
727843d32e
added cohorted mustache template for inline
2013-02-08 10:39:59 -05:00
ichuang
ad0d304e67
fix instructor dashboard datadump error message to be useful
2013-02-08 09:21:36 -05:00
Kevin Chugh
c6bece8620
more updates
2013-02-08 09:11:41 -05:00
Arthur Barrett
7ea87793c2
Modified annotatable to retrieve and display instructor comments from span elements. Instructor commentaries are displayed in tooltips with a reply link when the highlighted area is clicked. The commentaries are connected to inline discussion forums by anchors (for now).
2013-02-07 19:51:22 -05:00
Vik Paruchuri
a49f740e87
Fix rubric and make images display with tooltips
2013-02-07 19:22:54 -05:00
Vik Paruchuri
14372a4079
Address some issues with robustness, make images work properly throughout flow
2013-02-07 19:02:01 -05:00
Vik Paruchuri
68eb802516
Remove images from status bar after finding out that they run afoul of the rewriting of static links. Need to send them back via ajax to avoid
2013-02-07 18:48:13 -05:00
Vik Paruchuri
4973363353
Attach images to rubric to indicate which graders scored what
2013-02-07 18:35:09 -05:00
Vik Paruchuri
a2d9e66634
Centralized rubric now displays properly
2013-02-07 18:21:50 -05:00
Your Name
7dd252178c
cohort filter almost done
2013-02-07 18:14:46 -05:00
Your Name
3965f9129d
cohort filter almost done
2013-02-07 18:13:53 -05:00
Vik Paruchuri
9fa16b07d6
Remove ability to manually get results
2013-02-07 18:02:48 -05:00
Vik Paruchuri
c4bf9a0be4
Modify rubric category rendering
2013-02-07 17:47:19 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Vik Paruchuri
7bf0532a04
Fix some issues with displaying grader info on rubric
2013-02-07 17:28:31 -05:00
Vik Paruchuri
41d35632f3
Working on combined rubric stuff
2013-02-07 17:18:53 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3
Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam
2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05:00
Calen Pennington
4f555f6480
Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model
...
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/module_info_model.py
cms/djangoapps/contentstore/tests/factories.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_details.py
cms/djangoapps/models/settings/course_grading.py
cms/templates/edit_subsection.html
common/djangoapps/mitxmako/shortcuts.py
common/djangoapps/static_replace.py
common/djangoapps/util/converters.py
common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/abtest_module.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/discussion_module.py
common/lib/xmodule/xmodule/error_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/js/src/video/display.coffee
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/raw_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_export.py
common/lib/xmodule/xmodule/tests/test_import.py
common/lib/xmodule/xmodule/video_module.py
common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/templates/staff_problem_info.html
lms/templates/video.html
rakefile
2013-02-07 15:12:30 -05:00
Vik Paruchuri
9bf53026e6
Tweak box in peer and staff grading views
2013-02-07 14:18:38 -05:00
Vik Paruchuri
62435b4c27
Clean up results display
2013-02-07 14:12:14 -05:00
Vik Paruchuri
1cf8326b32
Make status bar, minor CSS fixes
2013-02-07 14:03:43 -05:00
Vik Paruchuri
b1726dae99
Fix prompt UI in combined open ended to close by default and be collapsible
2013-02-07 13:48:32 -05:00
Vik Paruchuri
5ef4af5afd
Fix peer and staff grading interfaces
2013-02-07 12:54:36 -05:00
Vik Paruchuri
ade44c330d
Make staff grading interface much nicer
2013-02-07 12:45:08 -05:00
Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0
Fix JS, style student response box
2013-02-07 12:36:57 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00
David Ormsbee
b947b88453
Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain
...
remove CSRF cookie domain setting in aws.py
2013-02-07 08:17:34 -08:00
Chris Dodge
0394e33652
remove CSRF cookie domain setting in aws.py
2013-02-07 11:15:23 -05:00
Vik Paruchuri
c195fe65cd
Restyle rubric list, submission container
2013-02-07 11:10:29 -05:00
