Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
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
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
Kevin Chugh
727843d32e added cohorted mustache template for inline 2013-02-08 10:39:59 -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
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
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
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
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
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
Vik Paruchuri
c195fe65cd Restyle rubric list, submission container 2013-02-07 11:10:29 -05:00
Vik Paruchuri
aa699905d6 Feedback and view only rubric restyle 2013-02-07 10:32:39 -05:00
Vik Paruchuri
f22849ebdd Re-arrange feedback, fix rubric HTML issue 2013-02-07 10:29:58 -05:00
Vik Paruchuri
b30407d7c8 Work on showing results properly 2013-02-07 10:22:33 -05:00
Vik Paruchuri
de8e1e9472 Change around some names, restyle rubric 2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe Restyle status, get rubric to work properly 2013-02-07 09:49:56 -05:00
Diana Huang
e6957a01a4 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-07 09:44:31 -05:00
Diana Huang
97655d0358 Remove the requirement that the problem peer grading module 
has to have a certain naming structure
 2013-02-07 09:40:30 -05:00
Vik Paruchuri
2542b6cb72 Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui 2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e Alter rubric list, restyle rubric 2013-02-07 09:26:27 -05:00
Victor Shnayder
37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object 
Hack to disable YouTube <iframe> API when they break it.
 2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Kevin Chugh
d047d826c7 update coffeescript to hide cohort choice if first commmentable is not cohorted 2013-02-06 22:00:03 -05:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
 2013-02-06 20:27:01 -05:00
Victor Shnayder
965e3b4c49 Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes 
addressed somme comments in pull request and instructor fixes and blank ...
 2013-02-06 15:40:33 -08:00
Kevin Chugh
1dd0ef274d addressed somme comments in pull request and instructor fixes and blank group fix 2013-02-06 18:26:41 -05:00
Victor Shnayder
1a7d2a06a8 Merge pull request #1442 from MITx/marketing/reg-tweak 
Fix placeholder email in signup form
 2013-02-06 15:26:26 -08:00
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
Vik Paruchuri
83608fd983 Restyle lists 2013-02-06 16:58:59 -05:00
Vik Paruchuri
28a0e44120 Quick rubric restyle 2013-02-06 16:57:10 -05:00