Brian Talbot
|
f33efe3dde
|
settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer
|
2012-12-13 13:45:57 -05:00 |
|
Brian Talbot
|
34441759dd
|
settings - added in preventDefault() for all grading controls that needed it
|
2012-12-13 13:44:03 -05:00 |
|
Brian Talbot
|
6b17659195
|
styling - settings layout and delete buttons
|
2012-12-13 13:35:58 -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 |
|
Brian Talbot
|
7d823d9ed9
|
resolving styling merge conflicts
|
2012-12-13 11:43:48 -05:00 |
|
Brian Talbot
|
9f863fd96e
|
styling - adjusting collapse button CSS lost in cms-master rebase
|
2012-12-13 11:37:51 -05:00 |
|
Tom Giannattasio
|
2be1f852e7
|
clean up of users page
|
2012-12-13 11:28:59 -05:00 |
|
Tom Giannattasio
|
75c4909785
|
added modal cover for editors
|
2012-12-13 11:28:59 -05:00 |
|
Tom Giannattasio
|
d7b3f28d17
|
reworked add component steps
|
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
|
5b81d6b8cc
|
cleaned up subsection and unit page
|
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 |
|
Tom Giannattasio
|
131f475156
|
headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style
|
2012-12-13 11:19:22 -05:00 |
|
Tom Giannattasio
|
128a402b7f
|
fixed long header bug
|
2012-12-13 11:19:22 -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 |
|
Don Mitchell
|
41ca47edfc
|
Add flag to turn template caching on/off (default to off)
|
2012-12-13 09:47:51 -05:00 |
|
Christina Roberts
|
113c99e0b1
|
Merge pull request #1141 from MITx/feature/christina/misc
Try running xmodule Jasmine tests on Jenkins (again!).
|
2012-12-13 06:28:27 -08:00 |
|
Christina Roberts
|
c4e86140c1
|
Try running xmodule Jasmine tests on Jenkins (again!).
|
2012-12-13 09:26:46 -05:00 |
|
Chris Dodge
|
3421331f17
|
up the template caching version number to avoid stale caches since there's been a change to the underscore templates
|
2012-12-13 09:25:13 -05:00 |
|
Chris Dodge
|
fc8281d517
|
up the template caching version number to avoid stale caches since there's been a change to the underscore templates
|
2012-12-13 09:22:01 -05:00 |
|
chrisndodge
|
aa2d376b88
|
Merge pull request #1140 from MITx/fix/cdodge/remove-xmodule-jasmine-tests
trying backing out the addition of the xmodule jasmine tests and see if ...
|
2012-12-12 18:15:19 -08:00 |
|
Chris Dodge
|
e0469c35ce
|
trying backing out the addition of the xmodule jasmine tests and see if builds start passing again on Jenkins
|
2012-12-12 21:13:51 -05:00 |
|
chrisndodge
|
6e2159cb1a
|
Merge pull request #1139 from MITx/fix/cdodge/code-mirror-on-course-info
more tweeks on CodeMirror. Also do a re-ordering of operations when crea...
|
2012-12-12 17:49:38 -08:00 |
|
Chris Dodge
|
35317b0679
|
more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics.
|
2012-12-12 20:47:37 -05:00 |
|
Don Mitchell
|
e75f63e957
|
More merge repairs. Hopefully done.
|
2012-12-12 17:13:55 -05:00 |
|
Don Mitchell
|
ea6532efd7
|
Fix screwed up merge
|
2012-12-12 16:51:05 -05:00 |
|
chrisndodge
|
da73fc77d5
|
Merge pull request #1137 from MITx/fix/cdodge/code-mirror-on-course-info
call remove() on CodeMirror
|
2012-12-12 12:07:18 -08:00 |
|
Chris Dodge
|
84b08b5ef5
|
call remove() on CodeMirror
|
2012-12-12 15:03:49 -05:00 |
|
Calen Pennington
|
98b09a150c
|
Merge pull request #1136 from MITx/feature/christina/misc
Try running xmodule Jasmine tests on Jenkins.
|
2012-12-12 11:26:30 -08:00 |
|
Christina Roberts
|
94ee5b887a
|
Try running xmodule Jasmine tests on Jenkins.
|
2012-12-12 14:24:05 -05:00 |
|
chrisndodge
|
d3de52e649
|
Merge pull request #1134 from MITx/fix/cdodge/code-mirror-on-course-info
dispose of when we close the editor
|
2012-12-12 11:10:43 -08:00 |
|
Chris Dodge
|
0c68ba8bfa
|
dispose of when we close the editor
|
2012-12-12 14:09:09 -05:00 |
|
chrisndodge
|
710d73a938
|
Merge pull request #1133 from MITx/feature/christina/misc
Feature/christina/misc
|
2012-12-12 10:55:46 -08: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
|
cd23c8f8b6
|
Python path bug
|
2012-12-12 11:02:42 -05:00 |
|
Don Mitchell
|
d1c0eb8fc2
|
Somehow linked file disappeared again.
|
2012-12-12 10:55:57 -05:00 |
|
Don Mitchell
|
bb31fb748f
|
Somehow linked file disappeared again.
|
2012-12-12 10:49:22 -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
|
d7591bc0c1
|
Show the timezone and current time (on tooltip)
|
2012-12-11 18:02:09 -05:00 |
|
Don Mitchell
|
c4f4da5e46
|
Giving up for now on unit tests which mock http posts
|
2012-12-11 17:10:04 -05:00 |
|
chrisndodge
|
fbc0dfae74
|
Merge pull request #1116 from MITx/feature/btalbot/cms-tooltips
Added Tool Tip UI Assets and References
|
2012-12-11 12:33:19 -08:00 |
|