Brian Talbot
|
e13db29efc
|
resolving merge from feature/btalbot/studio-softlanding
|
2013-02-13 12:42:15 -05:00 |
|
Brian Talbot
|
03e7d2e77b
|
studio - soft landing: changing 'sign into' to 'sign in to' copy
|
2013-02-13 12:18:27 -05:00 |
|
Brian Talbot
|
b09c3b6aff
|
studio - resolving local merge due to editor alias
|
2013-02-13 12:06:54 -05:00 |
|
Brian Talbot
|
d3e67be766
|
studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling
|
2013-02-13 12:03:30 -05:00 |
|
Don Mitchell
|
7f7fb60b7d
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-13 11:53:42 -05:00 |
|
Don Mitchell
|
6e5968e2cd
|
html changed; so, removed mostly meaningless comparison and fixed one.
|
2013-02-13 11:53:26 -05:00 |
|
Brian Talbot
|
3088e60d79
|
resolving local merge issues
|
2013-02-13 11:38:12 -05:00 |
|
Brian Talbot
|
fdd809409f
|
studio - nav: resolved Firefox browser chrome page-shifting bug
|
2013-02-13 11:37:47 -05:00 |
|
Don Mitchell
|
f7e635a7cd
|
fix npe w/ prev commit
|
2013-02-13 11:22:35 -05:00 |
|
Don Mitchell
|
4e3e2ec707
|
If user was trying to get to a specific page but had to log in, let them
get to that page once they've logged in.
|
2013-02-13 11:20:08 -05:00 |
|
Don Mitchell
|
3450c72833
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-13 09:31:09 -05:00 |
|
Don Mitchell
|
6f3a954d7b
|
howitworks is default home page if not logged in. Otherwise course
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
|
2013-02-13 09:30:54 -05:00 |
|
Brian Talbot
|
714f69a57e
|
studio - resolving merge conflicts in settings from a recent rebase
|
2013-02-13 09:07:53 -05:00 |
|
Brian Talbot
|
fccb3d7a73
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:36:36 -05:00 |
|
Brian Talbot
|
0a2b74110e
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:03:48 -05:00 |
|
Don Mitchell
|
d569c559ca
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
|
2013-02-12 16:57:00 -05:00 |
|
Don Mitchell
|
40668133f7
|
Fix bug which I know I fixed before (perhaps on another branch?) to
ensure old time had a value before comparing it to new time.
|
2013-02-12 15:11:35 -05:00 |
|
Brian Talbot
|
70e11e823c
|
studio - made all page heading chrome have consistent markup
|
2013-02-12 15:07:32 -05:00 |
|
Brian Talbot
|
540710f553
|
studio - nav revamp: added in dynamic course org and number to header
|
2013-02-12 14:22:42 -05:00 |
|
Don Mitchell
|
c9c026be62
|
Fixed urls
|
2013-02-12 12:15:07 -05:00 |
|
Brian Talbot
|
7ca267fd78
|
studio - debugging grading settings JS errors WIP
|
2013-02-12 11:56:54 -05:00 |
|
Brian Talbot
|
22b959d657
|
studio - link wiring and spot styling changes for new nav/soft landing/settings work
|
2013-02-12 11:16:37 -05:00 |
|
Calen Pennington
|
23bb87e0bb
|
Merge pull request #1486 from MITx/feature/ned/clean_up_tests
We no longer need override_settings, Django has a better one.
|
2013-02-12 07:22:27 -08:00 |
|
Brian Talbot
|
8976818c78
|
studio - header UI: in progress markup changes WIP
|
2013-02-12 09:16:24 -05:00 |
|
Ned Batchelder
|
aa2d0ecaf2
|
We no longer need override_settings, Django has a better one.
|
2013-02-11 17:06:35 -05:00 |
|
Christina Roberts
|
f18618e35b
|
Merge pull request #1482 from MITx/bug/dhm/misc
bug 155
|
2013-02-11 13:46:20 -08:00 |
|
Don Mitchell
|
8bc9564d92
|
clean up note to self
|
2013-02-11 16:45:36 -05:00 |
|
Don Mitchell
|
777e0ef9c5
|
The other one was too inclusive
|
2013-02-11 16:36:34 -05:00 |
|
Don Mitchell
|
565f5f0adc
|
Stop simple clicks from paging to top w/o disrupting dnd
|
2013-02-11 16:28:22 -05:00 |
|
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 |
|
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 |
|
Don Mitchell
|
de0fd2ef0c
|
Cross reference the settings pages
|
2013-02-11 15:02:02 -05:00 |
|
Chris Dodge
|
33009eba7d
|
add exporting of grading_policy.json
|
2013-02-11 14:30:26 -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 |
|
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 |
|