Chris Dodge
3fa425c5d0
add unit test for import->export->import simple flow
2012-12-27 14:40:38 -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
6951865229
add unit tests for course cloning and deleting
2012-12-27 12:20:45 -05:00
Chris Dodge
9dff39dd6d
start adding clone unit test
2012-12-27 11:25:04 -05:00
Don Mitchell
da343fd1d7
Finally! Details unit tests work and pass. Grading ones are fairly far
...
along.
2012-12-27 11:22:15 -05:00
Chris Dodge
fe408be1cc
message edit
2012-12-27 10:32:07 -05:00
Chris Dodge
7088821233
fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message
2012-12-27 10:30:26 -05: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
8d9a221945
Delete not-yet-implemented file
2012-12-26 13:50:01 -05:00
Don Mitchell
a35c1386f2
Bug 99: don't show date as 'Unset' but leave out altogether if not set
...
plus commented out failing unit tests until I can get someone to help
debug them.
2012-12-26 11:30:31 -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
Brian Talbot
ed3f3b02d6
studio - course export UI alpha - roughing in states/views
2012-12-26 09:10:05 -05:00
Don Mitchell
866ce8d2ae
Merge pull request #1194 from MITx/feature/christina/misc
...
Feature/christina/misc
2012-12-20 13:45:27 -08:00
cahrens
91ce214964
Fix for Studio #96 .
2012-12-20 14:59:21 -05:00
cahrens
90ce6967aa
Fix for Studio #96 .
2012-12-20 14:58:02 -05:00
Don Mitchell
90e12ff46b
Merge pull request #1192 from MITx/feature/cdodge/clone-course
...
implement course clone and delete functionality from the command line
2012-12-20 11:29:49 -08:00
Chris Dodge
b40a8a3e9e
implement course clone and delete functionality from the command line
2012-12-20 13:55:15 -05:00
Don Mitchell
17a1e281b1
Unit tests now work!!!
2012-12-20 13:42:57 -05:00
Don Mitchell
683535d913
Another bug for when the content for an update is more than one element.
2012-12-20 11:09:10 -05:00
Don Mitchell
e37180e074
Generalized the grader drop down and applied to edit_subsection
2012-12-19 17:31:06 -05:00
Don Mitchell
b689d19bec
Ensure empty video string deletes the video record and doesn't create
...
a partial descriptor.
Use 400 not the contrived 515 for malformed html.
2012-12-19 11:11:14 -05:00
Don Mitchell
b5fd6c9012
Send back error to client if failed to save malformed update and have it
...
show an alert.
2012-12-18 15:22:07 -05:00
Don Mitchell
fc2b6f034b
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-18 14:29:10 -05:00
Don Mitchell
0192a04b20
Fixed course_info parsing bug.
...
Addressed some of Christina's review comments.
2012-12-18 14:28:53 -05:00
Don Mitchell
dd758c06f7
Merge pull request #1175 from MITx/fix/cdodge/initializing-tabs
...
initialize the tabs metadata on course if we go to the edit-tabs page. T...
2012-12-18 10:13:35 -08:00
Chris Dodge
2ae2e46880
initialize the tabs metadata on course if we go to the edit-tabs page. This will prevent the author from getting into a bad state in the LMS
2012-12-18 13:08:21 -05:00
Don Mitchell
5709ff34f5
Refactored videos to a much simpler impl b/c about videos don't have
...
speeds and don't use the video/default.yaml format.
2012-12-18 12:46:54 -05:00
Don Mitchell
521fa938b3
Fixed course info bug (and simplified parsing). Incidentally fixed 2
...
other course info bugs (not editing/deleting right element if > 10,
putting new elements at end rather than beginning of list).
Made Location more robust against parsing errors.
2012-12-15 15:56:51 -05:00
Christina Roberts
e57b5b1431
Merge pull request #1160 from MITx/feature/btalbot/cms-gradable
...
Overview page allows user to specify grading policy per subsection
2012-12-14 14:09:28 -08:00
Don Mitchell
ac7b0334a6
Code review changes.
2012-12-14 16:51:40 -05:00
Chris Dodge
ab9b208605
add some permissions asserting
2012-12-14 16:26:15 -05:00
Don Mitchell
0fc16dffee
Gradable impl'd for overview page
2012-12-14 12:29:57 -05:00
Don Mitchell
6c64032fcf
Overview should be ready to test.
2012-12-14 09:22:54 -05:00
chrisndodge
f87e5cefab
Merge pull request #1152 from MITx/feature/dhm/cms-settings
...
Don't save null about items to db as it chokes lms.
2012-12-13 17:20:56 -08:00
Don Mitchell
e2918c2dbd
Don't save null about items to db as it chokes lms.
2012-12-13 17:23:40 -05:00
Don Mitchell
e0849e8b5a
Cache to debug other branch
2012-12-13 16:34:58 -05:00
chrisndodge
094856e229
Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups
...
Various Style/UI Tweaks
2012-12-13 12:41:10 -08:00
cahrens
e77a67a93a
Protect against graceperiodjson being null.
...
r.don
2012-12-13 13:36:37 -05:00
Brian Talbot
69c26a08e3
settings/style - general UI clean up - wip
2012-12-13 13:06:56 -05:00
Chris Dodge
10b417c85e
initial checkin of export
2012-12-13 11:53:52 -05:00
Chris Dodge
4ebc9a589d
fix up some test failures
2012-12-13 11:29:00 -05:00
Don Mitchell
cd23c8f8b6
Python path bug
2012-12-12 11:02:42 -05:00
Don Mitchell
c4f4da5e46
Giving up for now on unit tests which mock http posts
2012-12-11 17:10:04 -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
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
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
