Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

80 Commits

Author SHA1 Message Date
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
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
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
Brian Talbot
8f5d8a98c7 studio - resolved sidebar content organization and styling 2013-02-11 16:20:25 -05:00
Don Mitchell
de0fd2ef0c Cross reference the settings pages 2013-02-11 15:02:02 -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
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
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
ed15997259 studio - settings: grading revamp WIP 2013-02-11 08:48:01 -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
Brian Talbot
dc07e7375f studio - settings: revamp of tabs to views WIP 2013-02-08 09:36:18 -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
1144b0eeed studio - soft landing UI: initial header and templating work 2013-02-03 22:22:11 -05:00
Don Mitchell
19927a83a5 Ensure settings and course info CRUD operations tell the user if there's 
a server error and pull the server error handler into a common function.
 2013-01-30 11:24:55 -05:00
cahrens
91ce214964 Fix for Studio #96. 2012-12-20 14:59:21 -05:00
Don Mitchell
5709ff34f5 Refactored videos to a much simpler impl b/c about videos don't have 
speeds and don't use the video/default.yaml format.
 2012-12-18 12:46:54 -05:00
Brian Talbot
4e152952af cms settings - revised course overview textarea to display as codemirror field on page load 2012-12-14 11:57:46 -05:00
Brian Talbot
fb47f30918 bug - removed placeholdit image references in template HTML 2012-12-13 15:48:39 -05:00
Brian Talbot
3b784f2145 styling - setting form field layout 2012-12-13 13:21:43 -05:00
Brian Talbot
69c26a08e3 settings/style - general UI clean up - wip 2012-12-13 13:06:56 -05:00
Don Mitchell
71455f760e Check for null dates before setting time in timepicker. 
Remove syllabus as it's not instrumented.
 2012-12-12 11:37:04 -05:00
Don Mitchell
056bad4c66 Time zone prompt change and tooltip 
CodeMirror on overview entry
 2012-12-12 10:18:39 -05:00
Don Mitchell
70e2e04814 Remove not yet wired tabs 2012-12-10 18:57:48 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Don Mitchell
a68dee9743 Got rid of datepair as it was generating a jquery bug but also not 
doing what we wanted.
 2012-11-27 16:38:21 -05:00
Don Mitchell
54cc876075 Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 15:20:30 -05:00
Don Mitchell
5331ae055f Got time change hooked up but gained a spurious call to change on date 
change.
 2012-11-27 15:15:28 -05:00
Brian Talbot
075bc75a7d settings - adjusted markup to leverage Timepicker's datepair functionality for validating start/end dates 2012-11-27 15:00:19 -05:00
Don Mitchell
d165da3f81 Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 13:33:19 -05:00
Don Mitchell
5e2dba6bad Minor cache to pull talbott's changes 2012-11-27 13:22:44 -05:00
Brian Talbot
bffd425562 settings - revised date and time picker markup to use already set conventions with the .datepair class 2012-11-27 13:05:00 -05:00
Don Mitchell
8a27e1776b Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 12:12:43 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
Brian Talbot
c3e11b4217 settings - added in additional time fields for course dates 2012-11-27 09:50:25 -05:00
Tom Giannattasio
153285c3ea reset default tab 2012-11-26 16:28:52 -05:00
Tom Giannattasio
bb2e78ce30 reworked slider logic 2012-11-26 15:54:46 -05:00
Brian Talbot
be848023a2 settings - added in example of anon discussions disabled state 2012-11-26 14:21:01 -05:00
Brian Talbot
4027576e15 settings - resolved date and time picker UI bugs 2012-11-26 14:01:11 -05:00
Brian Talbot
4097bc1022 settings - revised grading slider UI cosmetics 2012-11-26 13:33:57 -05:00
Brian Talbot
ef95e1d95f settings - added in controls for sorting discussion categories 2012-11-26 11:48:56 -05:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Brian Talbot
baf8b481c8 settings - added in drag and drop anchors - wip 2012-11-21 13:58:56 -05:00
Don Mitchell
f8ee5c2614 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into 
feature/dhm/cms-settings

Conflicts:
	cms/templates/settings.html
 2012-11-20 11:55:19 -05:00
Don Mitchell
339949f934 Another checkpoint before pull/merge 2012-11-20 11:37:14 -05:00