Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy 
add exporting of grading_policy.json
 2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
Victor Shnayder
0014b28925 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-11 14:12:29 -05:00
Your Name
7a1aed8945 Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui 2013-02-11 13:55:47 -05:00
cahrens
044a8a5cf6 CodeMirror. 2013-02-11 12:37:31 -05:00
Arthur Barrett
3a81ed0651 Updated styling and markup. 2013-02-10 19:40:18 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
Arthur Barrett
b7158e9f8a Switched to $.scrollTo instead of custom animation and refactored toggle method. 2013-02-09 14:38:04 -05:00
Vik Paruchuri
2523c1e189 Slight visual tweaks 2013-02-09 12:40:11 -05:00
Vik Paruchuri
e68103f3e7 Render results at needed times 2013-02-09 11:24:29 -05:00
David Ormsbee
9b6f8a3673 Merge pull request #1475 from MITx/feature/brian/pearson-exam 
change missingExamSeriesCode to missingPartnerID
 2013-02-09 08:08:37 -08:00
Vik Paruchuri
add3aa90e1 Fix peer grading interface transitions (reset feedback box, change message) 2013-02-09 11:01:34 -05:00
Vik Paruchuri
d6a2148bfb Clean up message and calibration page 2013-02-09 10:47:14 -05:00
Vik Paruchuri
50ba024ae8 Add additional calibration interstitial page, add in message when calibration essay saved. 2013-02-09 10:43:40 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Vik Paruchuri
67e364fa70 Fix spacing, slightly prune CSS 2013-02-09 09:13:21 -05:00
Vik Paruchuri
e8cb3590b1 Trim hint and submit messages out of self assessment 2013-02-09 09:06:14 -05:00
Vik Paruchuri
ae1df0108c Remove save successful message 2013-02-09 09:00:43 -05:00
Vik Paruchuri
6d0af13923 Fix respond to feedback 2013-02-09 08:46:24 -05:00
Vik Paruchuri
3eb18a9ebc Fix status display/make it more robust, and fix module render error 2013-02-09 08:17:20 -05:00
Brian Wilson
2a1c89bec5 change missingExamSeriesCode to missingPartnerID 2013-02-09 02:24:51 -05:00
Vik Paruchuri
85324ec83f Restyle creates a combined results view 2013-02-09 01:35:55 -05:00
Vik Paruchuri
e566005b5a Add in feedback dict and render the feedback table with it 2013-02-09 01:17:54 -05:00
Vik Paruchuri
a7a55e462d Create a combined results view 2013-02-09 01:11:21 -05:00
Vik Paruchuri
4421e09dda Pass through feedback dict, grader ids, submission ids 2013-02-09 00:49:14 -05:00
Vik Paruchuri
757ff604bf Start to abstract away rendering of feedback from the open ended module into the combined module 2013-02-09 00:44:50 -05:00
Vik Paruchuri
4dc0859fbd Finish refactor of rubric templates, redo some margins 2013-02-09 00:30:25 -05:00
Vik Paruchuri
efe5e491ef Separate rubric rendering 2013-02-09 00:19:34 -05:00
Vik Paruchuri
0feb8f66bc Fix colors on legend, add random assessment 2013-02-08 23:59:39 -05:00
Vik Paruchuri
8ef45915df Move legend and status around to find optimal placements 2013-02-08 23:52:44 -05:00
Vik Paruchuri
dbfc77e4a5 Add in legend, move status bar, fix js where it was constantly displaying a message 2013-02-08 23:37:03 -05:00
Vik Paruchuri
70f7185723 Make a legend 2013-02-08 23:27:45 -05:00
Vik Paruchuri
5ac6fad1f7 Properly display rubric scores at all times 2013-02-08 23:16:44 -05:00
Vik Paruchuri
8bfad8f2bd Work on properly displaying rubric icons 2013-02-08 23:11:51 -05:00
Vik Paruchuri
35babcf592 Properly show status on combined rubric 2013-02-08 22:55:20 -05:00
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 e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
 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