Christina Roberts
|
14234c8106
|
Merge pull request #1481 from MITx/bug/dhm/misc
Bug 180
|
2013-02-11 13:23:08 -08:00 |
|
Brian Talbot
|
8f5d8a98c7
|
studio - resolved sidebar content organization and styling
|
2013-02-11 16:20:25 -05:00 |
|
Arthur Barrett
|
a144896154
|
Style and behavior changes to the header and tooltips.
|
2013-02-11 16:17:34 -05:00 |
|
cahrens
|
98920e7e05
|
Switch to new notification/Save/Cancel mechanism (attached to bottom of viewport).
|
2013-02-11 16:17:32 -05:00 |
|
Brian Talbot
|
2150386a21
|
studio - resolved scss that hid works in progress
|
2013-02-11 16:16:10 -05:00 |
|
Brian Talbot
|
715cea51a4
|
studio - resolved scss that relied on old body classes
|
2013-02-11 16:09:33 -05:00 |
|
Brian Talbot
|
3eead4701b
|
studio - settings: hiding link to advanced settings for now
|
2013-02-11 15:59:10 -05:00 |
|
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 |
|
Don Mitchell
|
ae4a854e18
|
Bug 180
|
2013-02-11 15:46:58 -05:00 |
|
Your Name
|
a3b4697573
|
fix css for comments popping
|
2013-02-11 15:34:28 -05:00 |
|
Brian Talbot
|
2478178237
|
studio - resolving merge
|
2013-02-11 15:28:38 -05:00 |
|
Brian Talbot
|
707e781148
|
studio - manual policy editor: stubbed in notification UI and testing code
|
2013-02-11 15:16:45 -05:00 |
|
Don Mitchell
|
de0fd2ef0c
|
Cross reference the settings pages
|
2013-02-11 15:02:02 -05:00 |
|
David Ormsbee
|
75ff2bd6cb
|
Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
Fix/cdodge/dangling discussion modules
|
2013-02-11 11:40:00 -08:00 |
|
Chris Dodge
|
33009eba7d
|
add exporting of grading_policy.json
|
2013-02-11 14:30:26 -05:00 |
|
cahrens
|
437c806fce
|
Enable/disable new entry button.
|
2013-02-11 14:16:04 -05:00 |
|
Victor Shnayder
|
0014b28925
|
Merge remote-tracking branch 'origin/master' into 700x-sandbox
|
2013-02-11 14:12:29 -05:00 |
|
cahrens
|
67a557d59a
|
Update Save/Cancel button state on typing events.
|
2013-02-11 14:07:11 -05:00 |
|
Your Name
|
a6d336dd0e
|
merger master
|
2013-02-11 13:55:55 -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 |
|
Brian Talbot
|
04e3d68bd5
|
studio - settings: added back in broken links for Don to check out
|
2013-02-11 13:47:03 -05:00 |
|
Brian Talbot
|
8367f565dc
|
studio - settings: revised URLs for temporary consistency and added in help/explanation text 1st draft
|
2013-02-11 13:21:35 -05:00 |
|
cahrens
|
044a8a5cf6
|
CodeMirror.
|
2013-02-11 12:37:31 -05:00 |
|
Brian Talbot
|
ea709684d0
|
studio - settings: synched up styling/controls for existing video with other existing fields
|
2013-02-11 12:13:25 -05:00 |
|
Brian Talbot
|
34272beba3
|
studio - merge resolving
|
2013-02-11 12:09:01 -05:00 |
|
Brian Talbot
|
77343519c6
|
studio - settings: revising enumerated item lists
|
2013-02-11 12:08:31 -05:00 |
|
Don Mitchell
|
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.
|
2013-02-11 12:04:45 -05:00 |
|
Brian Talbot
|
274d1752e0
|
studio - general UI cleanup in prep for this branch's end/release vs. future work
|
2013-02-11 11:49:03 -05:00 |
|
Vik Paruchuri
|
58a2186e71
|
Increase padding a bit
|
2013-02-11 11:33:44 -05:00 |
|
Vik Paruchuri
|
4e071d086f
|
Fix staff grading ML error info a bit
|
2013-02-11 11:31:26 -05:00 |
|
cahrens
|
039160f50c
|
Beginning of CodeMirror.
|
2013-02-11 11:20:14 -05:00 |
|
Vik Paruchuri
|
920acffd2c
|
Resize student submission box
|
2013-02-11 11:13:34 -05:00 |
|
Vik Paruchuri
|
838d948c15
|
Fix padding and border on staff and peer grading panels
|
2013-02-11 11:07:20 -05:00 |
|
David Ormsbee
|
5d894fdf03
|
Typo fix
|
2013-02-11 10:24:07 -05:00 |
|
David Ormsbee
|
04deb30fb6
|
Factor out the access group generation so we can check staff/instructor status without DB lookup.
|
2013-02-11 10:17:57 -05:00 |
|
David Ormsbee
|
00b3717829
|
Use prefetch on user to load groups and prevent extra DB lookups.
|
2013-02-11 10:16:57 -05:00 |
|
Brian Talbot
|
a3a0e8b5e5
|
studio - view header UI: unit page revamp WIP
|
2013-02-11 09:57:16 -05:00 |
|
Brian Talbot
|
0983df9463
|
studio - view header UI: added in initial markup for several pages WIP
|
2013-02-11 09:35:31 -05:00 |
|
Diana Huang
|
d3d3a03c61
|
Add checkbox and make sure to uncheck it after submission
|
2013-02-11 09:23:55 -05:00 |
|
Diana Huang
|
f3bb429915
|
Get and pass the new submission flagged information through
the controller to the backend.
|
2013-02-11 09:23:55 -05:00 |
|
Brian Talbot
|
1936b47ba5
|
studio - small display tweaks to setting form new/remove actions
|
2013-02-11 09:01:52 -05:00 |
|
Brian Talbot
|
5730cf45b7
|
studio - window class revamp
|
2013-02-11 08:57:34 -05:00 |
|
Brian Talbot
|
a5ccfc61cd
|
studio - hiding footer links until we have copy/pages
|
2013-02-11 08:48:58 -05:00 |
|
Brian Talbot
|
ed15997259
|
studio - settings: grading revamp WIP
|
2013-02-11 08:48:01 -05:00 |
|
David Ormsbee
|
754493597d
|
Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
Fix "staff debug" so it only appears where useful, instead of everywhere
|
2013-02-10 22:10:53 -08:00 |
|
Arthur Barrett
|
3a81ed0651
|
Updated styling and markup.
|
2013-02-10 19:40:18 -05:00 |
|
chrisndodge
|
de060a6085
|
Merge pull request #1477 from MITx/bugfix/dave/mmlans_check
Make type check for self.code a little more robust,
|
2013-02-10 16:12:32 -08: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 |
|
David Ormsbee
|
f94df6e3f5
|
Merge pull request #1476 from MITx/fix/cdodge/mitx-feature-disallow-new-courses
quick hack to give some protection from unauthorized users from making n...
|
2013-02-10 13:53:00 -08:00 |
|
Chris Dodge
|
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.
|
2013-02-10 16:17:08 -05:00 |
|