cahrens
9ec658cf7d
Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests.
2013-01-07 10:25:42 -05:00
cahrens
534c294e08
Merge branch 'feature/cale/cms-master' into feature/christina/misc
2013-01-07 09:59:42 -05:00
cahrens
ab1173cfdc
Merge with cms-master.
2013-01-07 09:59:08 -05:00
Chris Dodge
1d7baccb38
add info-icon.png
2013-01-04 11:41:16 -05:00
Chris Dodge
349fd89eb8
fix tests on merge
2013-01-04 10:32:31 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Chris Dodge
725805f1cf
add forgotten new file
2012-12-28 13:52:49 -05:00
Chris Dodge
c0f12e69f7
fixes on the export. There's some attributes not being handled correctly
2012-12-27 16:15:52 -05:00
Chris Dodge
625237601f
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export
...
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
common/lib/xmodule/xmodule/contentstore/mongo.py
2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da
Merge pull request #1208 from MITx/feature/cdodge/clone-course
...
fix up some thumbnail issues. Also we need to manage the user permission...
2012-12-27 09:26:51 -08:00
Chris Dodge
28d9827468
fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course
2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8
Grader unit tests (partial)
2012-12-26 15:48:37 -05:00
Don Mitchell
58abb10c2d
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-26 10:31:10 -05:00
Don Mitchell
ff490599fa
Debugging unit tests
2012-12-26 10:29:35 -05:00
Don Mitchell
b65775c300
Merge pull request #1195 from MITx/feature/christina/misc
...
Fix typo in Formula Response name (Studio #101 ).
2012-12-20 14:15:01 -08:00
cahrens
37b83c1ecf
Fix typo in Formula Response name (Studio #101 ).
2012-12-20 17:06:12 -05:00
Chris Dodge
b40a8a3e9e
implement course clone and delete functionality from the command line
2012-12-20 13:55:15 -05:00
chrisndodge
c407012f2d
Merge pull request #1168 from MITx/bug/dhm/dec12
...
Import default grading_policy was setting it to a unicode empty string
2012-12-17 10:17:23 -08:00
Calen Pennington
c546c36858
Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine
...
Do not copy already compiled coffee to js files from xmodule video and a...
2012-12-17 09:39:43 -08:00
Don Mitchell
e2526a37d3
Import default grading_policy was setting it to a unicode empty string
...
rather than an empty dict and thus screwing up later updates.
2012-12-17 11:50:40 -05:00
Chris Dodge
d18f42224c
fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store
2012-12-17 10:41:54 -05:00
chrisndodge
ea38482946
Merge pull request #1156 from MITx/feature/christina/misc
...
Bug fix for Studio #55 .
2012-12-14 09:00:38 -08:00
cahrens
dd7ed956dd
Bug fix for Studio #55 .
2012-12-14 11:37:45 -05:00
chrisndodge
d965221ec7
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
...
debugged tooltip latency/vanishing issue
2012-12-14 06:26:48 -08:00
Jay Zoldak
c485e441a9
Do not copy already compiled coffee to js files from xmodule video and also do not save them in git
2012-12-13 14:26:27 -05:00
Chris Dodge
10b417c85e
initial checkin of export
2012-12-13 11:53:52 -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
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -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
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
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
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
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440
Show error if organization name has invalid characters
2012-12-10 15:19:34 -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
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
Calen Pennington
b4793b3277
Add an implementation of get_items to xml module store
2012-12-07 12:02:29 -05:00
Calen Pennington
3e568667fc
Fix merge badness
2012-12-07 11:24:25 -05:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
David Ormsbee
61c17cabfa
Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule
...
Fix/brian/nonascii html xmodule
2012-12-06 15:33:21 -08:00
David Ormsbee
cee0781a20
Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit.
2012-12-04 15:51:36 -05:00
Brian Wilson
c2d5c04d9d
Merge branch 'master' into fix/brian/nonascii-html-xmodule
2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8
cosmetic cleanup
2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100
clean up lms tests, and fix export/import
2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4
add support for utf8 in sequences, verticals and custom modules.
2012-12-04 03:54:36 -05:00
Brian Wilson
5b02e1e3ce
add additional html tests
2012-12-03 16:26:08 -05:00
