cahrens
dd7ed956dd
Bug fix for Studio #55 .
2012-12-14 11:37:45 -05:00
cahrens
e77a67a93a
Protect against graceperiodjson being null.
...
r.don
2012-12-13 13:36:37 -05:00
chrisndodge
aee4fd912c
Merge pull request #1142 from MITx/feature/dhm/cms-settings
...
fix up some test failures
2012-12-13 08:30:58 -08:00
Chris Dodge
4ebc9a589d
fix up some test failures
2012-12-13 11:29:00 -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
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -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
5ea5a7c0a7
It works!!!
2012-12-10 18:55:35 -05:00
Don Mitchell
c43aa62fce
Need to still add create and delete but otherwise done.
2012-12-10 18:01:28 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05: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
