Tom Giannattasio
d1520792b8
removed extra width
2012-12-12 17:00:54 -05:00
Tom Giannattasio
b4321931a0
pearson ie7 bugs fixed (ish)
2012-12-12 16:59:38 -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
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -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
Brian Talbot
833a58d626
grading - post- cms-master rebase CSS tweaks on overview template
2012-12-12 13:44:12 -05: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
cd23c8f8b6
Python path bug
2012-12-12 11:02:42 -05:00
Chris Dodge
95c6719447
initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from
2012-12-12 10:57:06 -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
Calen Pennington
96daea5c0a
Ignore discussion modules with missing keys when building the global discussion info
2012-12-12 09:40:31 -05:00
Victor Shnayder
6e492aba7e
Merge pull request #1128 from MITx/diana/instructor-skip-button
...
Add skip button to instructor grading
2012-12-11 15:12:55 -08:00
Diana Huang
59829a897c
Add error message when encountering an error posting back
...
without a proper error response object
2012-12-11 18:09:25 -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
Diana Huang
4e81d9b2c5
Add some helpful indents and move the submission box to make
...
grading easier to read
2012-12-11 16:10:26 -05:00
Your Name
6b59fd4de2
update 2
2012-12-11 15:54:46 -05:00
Your Name
df5a62305c
update
2012-12-11 15:51:17 -05:00
Your Name
41167a49a1
Merge branch 'master' into bugfix/kevin/mathjax-rendering
2012-12-11 15:47:43 -05:00
Diana Huang
85bffa6aaf
Merge branch 'master' into diana/instructor-skip-button
2012-12-11 15:47:21 -05:00
Your Name
343dde6e29
fixed coffeescript to render mathjax correctly
2012-12-11 15:47:20 -05:00
Diana Huang
44d5a34180
Merge branch 'diana/instructor-skip-button' of github.com:MITx/mitx into diana/instructor-skip-button
2012-12-11 15:46:18 -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
Victor Shnayder
785974da67
Merge pull request #1126 from MITx/diana/open-ended-tests
...
Merge in updates to tests for open ended grading
2012-12-11 12:31:26 -08:00
Diana Huang
0e54592175
Add skip button logic to the LMS
2012-12-11 14:40:30 -05:00
Diana Huang
33f2d55a37
new test for problem lists
2012-12-11 14:40:30 -05: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
Diana Huang
43d76b9813
Add skip button logic to the LMS
2012-12-11 14:06:07 -05:00
Diana Huang
3b805fac1a
Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing
...
Fix for issues in open ended parsing
2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c
Fix for issues in open ended parsing
2012-12-11 13:14:34 -05:00
Chris Dodge
0e3a022086
fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo
2012-12-11 11:21:08 -05:00
