Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2460 Commits

Author SHA1 Message Date
Tom Giannattasio
75c4909785 added modal cover for editors 2012-12-13 11:28:59 -05:00
Tom Giannattasio
66004aeb2d pulled out component types from behind add component button 2012-12-13 11:28:59 -05:00
Tom Giannattasio
052b6f695a cleaned up editor styles; cleaned up static tabs page 2012-12-13 11:26:10 -05:00
Tom Giannattasio
39a882e278 more defined header, new icons, cleaner static tabs page 2012-12-13 11:25:15 -05:00
Tom Giannattasio
95dfc730dc new header styles; collapse all button added to courseware 2012-12-13 11:20:30 -05:00
Tom Giannattasio
8294b05802 style tweaks to tabs and static pages; key bindings for new user form 2012-12-13 11:20:30 -05:00
Tom Giannattasio
197ea33235 tweaked body color and window styles; adjusting new buttons 2012-12-13 11:20:30 -05:00
Tom Giannattasio
74ce3d225f removed new course button on click to prevent multiple instantiations 2012-12-13 11:19:22 -05:00
Don Mitchell
909fd93c80 Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable 
Conflicts:
	cms/static/sass/_variables.scss
 2012-12-13 10:40:49 -05:00
chrisndodge
6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 06:52:49 -08:00
Brian Talbot
df7de980b3 added in additional tool tips for icon/graphic-based controls on overview 2012-12-12 13:33:31 -05:00
Brian Talbot
25e730d0c3 grading - added in tooltips for graded toggle on overview UI and moved icon libraries and tooltip asset references to base template 2012-12-12 13:31:59 -05:00
Brian Talbot
85e937cb94 grading - tooltip for grading UI link wip 2012-12-12 13:30:24 -05:00
Brian Talbot
fd41a2f6b1 grading - added in sub section controls 2012-12-12 13:30:24 -05:00
Brian Talbot
2b6bfc4f2b grading - added in gradable by type menu to sub section editing 2012-12-12 13:30:24 -05:00
Brian Talbot
4cd2114f3b grading - finalized style/states for grading UI on courseware overview 2012-12-12 13:30:24 -05:00
Brian Talbot
bdebc60266 assignments - wip 2012-12-12 13:30:24 -05:00
Brian Talbot
5239dcc9bd gradable sections - adding in assets and markup - wip 2012-12-12 13:23:02 -05:00
Christina Roberts
2f55583ee7 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/christina/misc 2012-12-12 13:08:22 -05:00
Christina Roberts
c87eb08b1e Bug fix for Lighthouse #22. 
html names are automatically converted to the symbols they describe.
 2012-12-12 12:57:31 -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
04ea2c8242 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_base.scss
 2012-12-12 10:23:06 -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
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -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
Brian Talbot
3f5254adb0 Added tool tip text to several other UI controls in templates 2012-12-10 13:32:06 -05:00
Brian Talbot
a3579e3183 added in basic styles and plug-in reference for tool tip UI across Studio + Courseware Overview tool tip text 2012-12-10 13:02:55 -05:00
chrisndodge
a4ed3a7ba9 Merge pull request #1088 from MITx/feature/dhm/course-info 
Course info style and implementation
 2012-12-10 05:59:59 -08:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Tom Giannattasio
7294e978d9 fixed firefox bug 2012-11-30 13:14:52 -05:00
chrisndodge
2d866418ad Merge pull request #1089 from MITx/feature/studio/tom/speedups 
some quick speedups
 2012-11-30 08:55:31 -08:00
Tom Giannattasio
63e38822bd course handouts styled and basic view handling added 2012-11-30 10:41:10 -05:00
Tom Giannattasio
b75bca2583 new styles for the handouts sidebar 2012-11-30 10:41:10 -05:00
Tom Giannattasio
a25d6b0862 wrapped up data syncing and date format issues 2012-11-30 10:41:10 -05:00
Tom Giannattasio
3d9961f874 started adding date picker 2012-11-30 10:41:10 -05:00
Tom Giannattasio
46d4e27cdc update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save 2012-11-30 10:41:10 -05:00
Tom Giannattasio
261c43aade add sidebar column; fixed main column float bug 2012-11-30 10:40:19 -05:00
Tom Giannattasio
f32388f2af markup tweaks to fix content crunching 2012-11-30 10:40:19 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
Tom Giannattasio
fbbf9e9c0f key bindings and speed reworkings for the my courses and courseware pages 2012-11-29 16:21:51 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Tom Giannattasio
6cfabb76c1 finished styling for static tabs; required some rework of global styles 2012-11-28 15:39:43 -05:00
Tom Giannattasio
6ad8a9aced most of the styling and function changes made 2012-11-28 15:10:46 -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