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
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
Diana Huang
370dfc77ea
Merge branch 'master' into diana/open-ended-tests
2012-12-11 09:53:05 -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
Carlos Andrés Rocha
5cf9982c4a
Merge pull request #1121 from MITx/feature/jarv/ipython
...
Adding ipython to requirements
2012-12-10 14:26:34 -08:00
John Jarvis
8aebb14eea
Adding ipython to requirements
...
We had this before as a python dependency but it was dropped
when we switched to virtual environments
2012-12-10 17:15:31 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Diana Huang
4a2dabd30a
new test for problem lists
2012-12-10 16:31:43 -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
Victor Shnayder
df578de11f
Merge pull request #1119 from MITx/diana/open-ended-response-styling
...
Updates to the styling of open ended problems
2012-12-10 11:36:04 -08:00
VikParuchuri
a651a7798e
Merge pull request #1118 from MITx/bugfix/victor/open-ended-parsing
...
Check for none.
2012-12-10 11:27:39 -08:00
Vik Paruchuri
ab84042435
Fix raised error
2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2
Add a reload button to open-ended input problems
2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85
Check for none.
2012-12-10 14:10:19 -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
Victor Shnayder
c5c4305f9e
Merge pull request #1110 from MITx/diana/instructor-grading-styling
...
Updates to the instructor grading pages
2012-12-10 10:39:19 -08: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
Diana Huang
3156c2b393
Add icon to the grading message
2012-12-10 12:29:46 -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
