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 |
|
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 |
|
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 |
|
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 |
|
chrisndodge
|
c3d7c466ef
|
Merge pull request #1120 from MITx/feature/christina/misc
Bug fix: Show error if organization name has invalid characters
|
2012-12-10 13:08:52 -08:00 |
|
Christina Roberts
|
6acae5b440
|
Show error if organization name has invalid characters
|
2012-12-10 15:19:34 -05:00 |
|
chrisndodge
|
c0ca573dcf
|
Merge pull request #1117 from MITx/feature/dhm/course-info
we also need to set on window scope
|
2012-12-10 10:56:30 -08:00 |
|
Chris Dodge
|
e2e5246853
|
we also need to set on window scope
|
2012-12-10 13:54:35 -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 |
|
Christina Roberts
|
495b58241c
|
Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property.
|
2012-12-10 11:50:21 -05:00 |
|
chrisndodge
|
e55d8fb21c
|
Merge pull request #1115 from MITx/feature/dhm/course-info
on AWS instances, base.js gets wrapped into a single JS file, but it's i...
|
2012-12-10 08:26:08 -08:00 |
|
Chris Dodge
|
53f40e8d85
|
on AWS instances, base.js gets wrapped into a single JS file, but it's in a different scope. So to reference one of the globals in base.js, we have to reference it as window.XXXXXX.
|
2012-12-10 11:25:25 -05:00 |
|
chrisndodge
|
e1c452bc08
|
Merge pull request #1113 from MITx/feature/dhm/course-info
move the underscore tempaltes to /static/client-templates and update the...
|
2012-12-10 07:17:19 -08:00 |
|
Chris Dodge
|
79e48dde97
|
move the underscore tempaltes to /static/client-templates and update the references
|
2012-12-10 10:01:08 -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 |
|
Don Mitchell
|
457b4aa645
|
Merge pull request #1108 from MITx/feature/cdodge/course-info
Feature/cdodge/course info
|
2012-12-07 12:51:09 -08:00 |
|
Chris Dodge
|
402e031ecc
|
forgot to add a if {} guard on the CodeMirror instantiation on one use case
|
2012-12-07 15:27:00 -05:00 |
|
Chris Dodge
|
b81f802b1d
|
get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror
|
2012-12-07 14:38:03 -05: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 |
|
Calen Pennington
|
1a89c14b62
|
Merge pull request #1087 from MITx/fix/cdodge/lms-runtime-bugs
Fix/cdodge/lms runtime bugs
|
2012-12-07 06:38:16 -08: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 |
|
Don Mitchell
|
d943f44f10
|
Append screw up (naive python goof)
|
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
|
335c6949f8
|
started consolidating editor functions
|
2012-11-30 10:41:10 -05:00 |
|
Tom Giannattasio
|
5dd90aa9cb
|
working on date picker; conflicts with ids
|
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
|
b41ab37c4e
|
fixed padding on a few buttons
|
2012-11-30 07:51:14 -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 |
|