Vik Paruchuri
0c6ac1c743
Add in BC
2013-02-08 22:43:38 -05:00
Arthur Barrett
5fc7f1a892
Constrain comments to viewport.
2013-02-08 21:27:35 -05:00
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
f500806247
make hide/show synchronous for cohort filters
2013-02-08 18:18:12 -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
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
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
cahrens
98026e4325
A couple minor bug fixes.
...
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Brian Talbot
1b679750ad
studio - settings: more revamp of tabs to views WIP
2013-02-08 12:36:21 -05:00
Jay Zoldak
0d0049ec76
Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
...
fix test_conditional
2013-02-08 08:13:01 -08:00
Calen Pennington
dd4db0601f
Remove generated files
2013-02-08 10:45:59 -05:00
Calen Pennington
bda46c423d
Fix some issues that were prevent lms start
2013-02-08 10:41:02 -05:00
Brian Wilson
ab6f383be1
support for Pearson test user
2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f
for starting pearson exam, just call jump_to() instead of reverse(jump_to...)
2013-02-08 02:15:45 -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
17cc6b4dff
Fix minor display issue
2013-02-07 19:26:21 -05:00
Vik Paruchuri
a49f740e87
Fix rubric and make images display with tooltips
2013-02-07 19:22:54 -05:00
Kevin Chugh
3cfc5c4545
cohort filter wokorking
2013-02-07 19:18:21 -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
f5fcd3e1ff
Make grader image dict a constant
2013-02-07 18:37:03 -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
ichuang
7b7b0690b6
fix test_conditional
2013-02-07 18:19:48 -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
5154068d75
Debug some score tuple issues
2013-02-07 17:33:03 -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
Vik Paruchuri
0f81b0f816
Aggregate rubric feedback
2013-02-07 16:51:51 -05:00
Vik Paruchuri
47d5fe60ef
Return feedback items individually
2013-02-07 16:43:21 -05:00
Vik Paruchuri
091f34668b
Support centralized results
2013-02-07 16:40:25 -05:00
Victor Shnayder
c81abe1e35
Merge remote-tracking branch 'origin/master' into 700x-sandbox
2013-02-07 16:27:08 -05:00
John Hess
f39a98f9ba
Revert "Protex now loads correctly in every scenario" --- actually breaks grading, though it did fix loading
...
This reverts commit 2627a2f12c
2013-02-07 16:14:42 -05:00
Vik Paruchuri
4b5457c997
Fixing some rubric score errors
2013-02-07 16:13:07 -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
Vik Paruchuri
4a897d4e7f
Save rubric scores in self assessment
2013-02-07 15:52:23 -05:00
Vik Paruchuri
3874fe545a
Working on making a combined rubric
2013-02-07 15:46:49 -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
Julian Arni
8a75e1ad19
Added comment
2013-02-07 14:50:18 -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
