98920e7e05
Switch to new notification/Save/Cancel mechanism (attached to bottom of viewport).
cahrens
2013-02-11 16:17:32 -05:00
2150386a21
studio - resolved scss that hid works in progress
Brian Talbot
2013-02-11 16:16:10 -05:00
715cea51a4
studio - resolved scss that relied on old body classes
Brian Talbot
2013-02-11 16:09:33 -05:00
3eead4701b
studio - settings: hiding link to advanced settings for now
Brian Talbot
2013-02-11 15:59:10 -05:00
46a7f7427a
Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
Don Mitchell
2013-02-11 12:53:36 -08:00
ae4a854e18
Bug 180
Don Mitchell
2013-02-11 15:46:58 -05:00
a3b4697573
fix css for comments popping
Your Name
2013-02-11 15:34:28 -05:00
2478178237
studio - resolving merge
Brian Talbot
2013-02-11 15:28:38 -05:00
707e781148
studio - manual policy editor: stubbed in notification UI and testing code
Brian Talbot
2013-02-11 15:16:45 -05:00
de0fd2ef0c
Cross reference the settings pages
Don Mitchell
2013-02-11 15:02:02 -05:00
75ff2bd6cb
Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
David Ormsbee
2013-02-11 11:40:00 -08:00
33009eba7d
add exporting of grading_policy.json
Chris Dodge
2013-02-11 14:30:26 -05:00
437c806fce
Enable/disable new entry button.
cahrens
2013-02-11 14:16:04 -05:00
0014b28925
Merge remote-tracking branch 'origin/master' into 700x-sandbox
Victor Shnayder
2013-02-11 14:12:29 -05:00
67a557d59a
Update Save/Cancel button state on typing events.
cahrens
2013-02-11 14:07:11 -05:00
a6d336dd0e
merger master
Your Name
2013-02-11 13:55:55 -05:00
7a1aed8945
Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui
Your Name
2013-02-11 13:55:47 -05:00
04e3d68bd5
studio - settings: added back in broken links for Don to check out
Brian Talbot
2013-02-11 13:47:03 -05:00
8367f565dc
studio - settings: revised URLs for temporary consistency and added in help/explanation text 1st draft
Brian Talbot
2013-02-11 13:21:35 -05:00
ea709684d0
studio - settings: synched up styling/controls for existing video with other existing fields
Brian Talbot
2013-02-11 12:13:25 -05:00
34272beba3
studio - merge resolving
Brian Talbot
2013-02-11 12:09:01 -05:00
77343519c6
studio - settings: revising enumerated item lists
Brian Talbot
2013-02-11 12:08:31 -05:00
773dfce68d
Try to make server and validation errors work together. Getting double errors when there are parent and child views both defining on error handlers still.
Don Mitchell
2013-02-11 12:04:45 -05:00
274d1752e0
studio - general UI cleanup in prep for this branch's end/release vs. future work
Brian Talbot
2013-02-11 11:49:03 -05:00
58a2186e71
Increase padding a bit
Vik Paruchuri
2013-02-11 11:33:44 -05:00
4e071d086f
Fix staff grading ML error info a bit
Vik Paruchuri
2013-02-11 11:31:26 -05:00
039160f50c
Beginning of CodeMirror.
cahrens
2013-02-11 11:20:14 -05:00
fb1e7f3dc1
Make type check for self.code a little more robust, give default val for mmlans so it's never undefined
David Ormsbee
2013-02-10 19:03:25 -05:00
f94df6e3f5
Merge pull request #1476 from MITx/fix/cdodge/mitx-feature-disallow-new-courses
David Ormsbee
2013-02-10 13:53:00 -08:00
4f67c6c052
quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button.
Chris Dodge
2013-02-10 16:17:08 -05:00
757ff604bf
Start to abstract away rendering of feedback from the open ended module into the combined module
Vik Paruchuri
2013-02-09 00:44:50 -05:00
4dc0859fbd
Finish refactor of rubric templates, redo some margins
Vik Paruchuri
2013-02-09 00:30:25 -05:00
efe5e491ef
Separate rubric rendering
Vik Paruchuri
2013-02-09 00:19:34 -05:00
995a075f8f
Separate the rubric templates
Vik Paruchuri
2013-02-09 00:18:04 -05:00
0feb8f66bc
Fix colors on legend, add random assessment
Vik Paruchuri
2013-02-08 23:59:39 -05:00
8ef45915df
Move legend and status around to find optimal placements
Vik Paruchuri
2013-02-08 23:52:44 -05:00
dbfc77e4a5
Add in legend, move status bar, fix js where it was constantly displaying a message
Vik Paruchuri
2013-02-08 23:37:03 -05:00
70f7185723
Make a legend
Vik Paruchuri
2013-02-08 23:27:45 -05:00
5ac6fad1f7
Properly display rubric scores at all times
Vik Paruchuri
2013-02-08 23:16:44 -05:00
8bfad8f2bd
Work on properly displaying rubric icons
Vik Paruchuri
2013-02-08 23:11:51 -05:00
35babcf592
Properly show status on combined rubric
Vik Paruchuri
2013-02-08 22:55:20 -05:00
0c6ac1c743
Add in BC
Vik Paruchuri
2013-02-08 22:43:38 -05:00
5fc7f1a892
Constrain comments to viewport.
Arthur Barrett
2013-02-08 21:27:35 -05:00
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.
Arthur Barrett
2013-02-08 20:38:24 -05:00
f500806247
make hide/show synchronous for cohort filters
Your Name
2013-02-08 18:18:12 -05:00
cc0a6a2da9
make hide/show synchronous for cohort filters
Your Name
2013-02-08 18:03:27 -05:00
7761f6cb04
make cohort filter visibility conditional on selected commentable cohortedness
Your Name
2013-02-08 17:22:29 -05:00
ac732f6b07
Beginnings of feedback regarding unsaved and saved changes.
cahrens
2013-02-08 17:19:19 -05:00
09e8628037
add editor to new entries and when key changes
Don Mitchell
2013-02-08 16:58:50 -05:00
bcf9dfc2b3
add css change to cohort dropdown for zoom support
Your Name
2013-02-08 15:44:56 -05:00
b980399f5f
change cohort dropdown verbiage
Your Name
2013-02-08 15:41:11 -05:00
5254af2918
Letting render do its thing. The wrap confused the this pointer.
Don Mitchell
2013-02-08 15:36:42 -05:00
0e06f5f587
Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui
Victor Shnayder
2013-02-08 15:01:30 -05:00
6d9a9ec46f
Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
Victor Shnayder
2013-02-08 15:00:25 -05:00
df0b6aca7d
inline mustache working
Your Name
2013-02-08 14:41:36 -05:00
4e9d70254f
inline mustache working
Your Name
2013-02-08 14:29:00 -05:00
21c06c741b
inline mustache working
Your Name
2013-02-08 14:28:48 -05:00
80843c1561
Merge pull request #1463 from MITx/feature/brian/pearson-exam
David Ormsbee
2013-02-08 11:07:15 -08:00
1e197df3c1
Merge pull request #1471 from MITx/victor/jobs-page
David Ormsbee
2013-02-08 10:53:27 -08:00