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 |
|
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 |
|
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 |
|
Brian Talbot
|
210086fed3
|
studio - settings: grading revamp WIP
|
2013-02-08 13:42:36 -05:00 |
|
Brian Talbot
|
1b679750ad
|
studio - settings: more revamp of tabs to views WIP
|
2013-02-08 12:36:21 -05:00 |
|
Brian Talbot
|
dc07e7375f
|
studio - settings: revamp of tabs to views WIP
|
2013-02-08 09:36:18 -05:00 |
|
Don Mitchell
|
9f5eeaf815
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/templates/settings.html
cms/templates/widgets/header.html
|
2013-02-07 14:56:48 -05:00 |
|
Don Mitchell
|
31393043d0
|
More for that commit
|
2013-02-07 14:46:42 -05:00 |
|
Don Mitchell
|
9cd1162a60
|
Grading and details split out. Put the unimplemented tabs into a single
file not used.
|
2013-02-07 14:45:24 -05:00 |
|
Brian Talbot
|
ed42fa8830
|
studio - soft landing: revised page title structure and values
|
2013-02-07 14:23:00 -05:00 |
|
Brian Talbot
|
5b9609abf6
|
studio - soft landing: various fixes/tweaks
|
2013-02-07 14:09:47 -05:00 |
|
Brian Talbot
|
fedd0aac9a
|
studio - course nav: added in styling to account for stateful menus
|
2013-02-07 11:25:11 -05:00 |
|
Brian Talbot
|
903115d6a9
|
studio - soft landing: refined user icon vs. dropdown icon styles
|
2013-02-07 11:07:18 -05:00 |
|
Brian Talbot
|
5674dd19c4
|
studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS
|
2013-02-07 09:58:52 -05:00 |
|
Brian Talbot
|
cb9d960a28
|
studio - soft landing: style dropdown arrows
|
2013-02-06 15:46:10 -05:00 |
|
Brian Talbot
|
d00a1f35c7
|
studio - soft landing: resolved not signed in header nav length issue
|
2013-02-06 15:00:40 -05:00 |
|
Brian Talbot
|
d11f10cc66
|
studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately
|
2013-02-06 14:37:09 -05:00 |
|
Brian Talbot
|
946d1617e7
|
studio - resolving merge conflict in header widget
|
2013-02-06 14:18:55 -05:00 |
|
Brian Talbot
|
1dae21e969
|
studio - course nav: styled dropdown navigation
|
2013-02-06 14:16:49 -05:00 |
|
Don Mitchell
|
31d541e5ad
|
Wire up settings to menu (3 different ways just b/c it's possible)
|
2013-02-06 13:42:51 -05:00 |
|
Brian Talbot
|
b0be1cd3dc
|
studio - soft landing: revised app nav flexible grid
|
2013-02-06 11:36:08 -05:00 |
|
Brian Talbot
|
b98c643aaf
|
studio - merging soft landing local work with rebased branch
|
2013-02-06 10:59:59 -05:00 |
|
Brian Talbot
|
bb789e758b
|
studio - course nav: general flex-grid layout - WIP
|
2013-02-06 09:57:03 -05:00 |
|
Don Mitchell
|
0f5571f499
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-06 09:48:09 -05:00 |
|
Brian Talbot
|
280de111e1
|
studio - soft landing: fixed flexible grid proportions on sign up/in UI
|
2013-02-06 09:18:34 -05:00 |
|
Diana Huang
|
95d3957377
|
Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
Patch peer grading tab to work
|
2013-02-06 06:07:18 -08:00 |
|
Brian Talbot
|
8c86eb2522
|
studio - soft landing: revised copy
|
2013-02-06 09:03:07 -05:00 |
|
Brian Talbot
|
1687a99c5c
|
studio - soft landing: added in modal copy and resolved image dimensions issue
|
2013-02-06 08:53:23 -05:00 |
|
David Ormsbee
|
92f2149daa
|
Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph
Allow policy.json to disable progress graph
|
2013-02-06 05:48:03 -08:00 |
|
ichuang
|
6a7e30e331
|
add doc about disable_progress_graph
|
2013-02-06 04:01:28 +00:00 |
|
ichuang
|
0936f448fc
|
add disable_progress_graph key to course metadata
|
2013-02-06 03:45:10 +00:00 |
|
Victor Shnayder
|
6b468df57d
|
Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes
Revert "Fix permissions bug and add test cases for django comment client...
|
2013-02-05 15:54:25 -08:00 |
|
David Ormsbee
|
a3a886bd0f
|
Revert "Add tests for django-comment-client models" (which actually had
a model change as well)
This reverts commit 053547453e.
|
2013-02-05 18:51:16 -05:00 |
|
David Ormsbee
|
119b4206a4
|
Revert "Fix permissions bug and add test cases for django comment client permissions."
This reverts commit e745087455.
|
2013-02-05 18:42:01 -05:00 |
|
Brian Talbot
|
56b8353dfd
|
studio - soft landing: refined sign in/up error states visually
|
2013-02-05 16:41:24 -05:00 |
|
Christina Roberts
|
3222e083eb
|
Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix
Fix bug where we imported two functions w/ the same name
|
2013-02-05 13:36:56 -08:00 |
|
Christina Roberts
|
0d8cfb9baa
|
Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
change from throwing a Http404 exception, which I believe will try to re...
|
2013-02-05 13:36:28 -08:00 |
|
Vik Paruchuri
|
0133c7c669
|
Patch peer grading tab to work
|
2013-02-05 16:32:40 -05:00 |
|
David Ormsbee
|
b68aff72f2
|
Merge pull request #1436 from MITx/debug/dave/sass
undo pipeline changes
|
2013-02-05 13:26:22 -08:00 |
|
Chris Dodge
|
3fa1fe0cd6
|
change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.
|
2013-02-05 16:26:07 -05:00 |
|
David Ormsbee
|
1ef9d6388f
|
re-add compression flag to sass
|
2013-02-05 16:25:59 -05:00 |
|
David Ormsbee
|
706a1072b9
|
undo pipeline changes
|
2013-02-05 16:24:53 -05:00 |
|