Chris Dodge
|
f4822c23de
|
lots of tweeks to better support importing of existing courseware
|
2012-10-30 11:52:31 -04:00 |
|
Chris Dodge
|
5a96820929
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-26 14:09:15 -04:00 |
|
chrisndodge
|
9cf1ac4ea8
|
Merge pull request #979 from MITx/feature/cale/text_fixes
Fixing description of import format
|
2012-10-26 11:08:18 -07:00 |
|
chrisndodge
|
793197e916
|
Merge pull request #978 from MITx/feature/cale/cas-fix-visibility-selector
Remove references to #visibility id that was changed to .visibility-sele...
|
2012-10-26 10:36:59 -07:00 |
|
Calen Pennington
|
3d9c92c574
|
Remove references to #visibility id that was changed to .visibility-select
|
2012-10-26 13:34:21 -04:00 |
|
Chris Dodge
|
206b1e26d3
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-26 10:02:45 -04:00 |
|
Chris Dodge
|
b7c830a861
|
use existing _replace() method on Location to do the re-namespacing on import
|
2012-10-25 16:37:31 -04:00 |
|
Chris Dodge
|
ba15735214
|
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
|
2012-10-25 14:27:26 -04:00 |
|
chrisndodge
|
550114704e
|
Merge pull request #974 from MITx/feature/cale/cas-dont-delete-subsection-children
Only update data in modules that have been set when passing into save_it...
|
2012-10-25 11:04:45 -07:00 |
|
Calen Pennington
|
bd1233d38c
|
Only update data in modules that have been set when passing into save_item, and don't force callers to set everything
|
2012-10-25 13:56:24 -04:00 |
|
Calen Pennington
|
5ab8e312f5
|
Fixing description of import format
|
2012-10-25 13:23:11 -04:00 |
|
chrisndodge
|
4bf5f97004
|
Merge pull request #972 from MITx/bug/cas/tom/fakepath
fixed fakepath on import
|
2012-10-25 09:52:26 -07:00 |
|
Tom Giannattasio
|
a0f4e67235
|
fixed fakepath on import
|
2012-10-25 12:51:21 -04:00 |
|
chrisndodge
|
b9d96df1bd
|
Merge pull request #970 from MITx/feature/cale/cas-password-reset
Point Studio forgot password at corresponding lms forgot password. There...
|
2012-10-25 09:33:54 -07:00 |
|
Calen Pennington
|
f19ec64659
|
Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment
|
2012-10-25 10:47:41 -04:00 |
|
Chris Dodge
|
606e2dba15
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-24 20:57:08 -04:00 |
|
Chris Dodge
|
fec6c42adc
|
implement importing of course info sections as modules in the course
|
2012-10-24 20:55:04 -04:00 |
|
chrisndodge
|
4432712e9c
|
Merge pull request #966 from MITx/feature/cale/cas-template-import-errors
Squelch some (but not all, yet) errors during template loading
|
2012-10-24 17:34:58 -07:00 |
|
chrisndodge
|
dfff435abc
|
Merge pull request #968 from MITx/bug/lyla/typo
typo fix
|
2012-10-24 17:33:43 -07:00 |
|
Lyla Fischer
|
957a72ae32
|
typo fix
|
2012-10-24 18:12:29 -04:00 |
|
Calen Pennington
|
bacd728efc
|
Squelch some (but not all, yet) errors during template loading
|
2012-10-24 16:25:20 -04:00 |
|
Calen Pennington
|
44bc1a06dd
|
Merge pull request #962 from MITx/bug/cas/tom/fakepath
fixed multiple file picker bug; removed 'fakepath' from uploading file n...
|
2012-10-24 13:00:22 -07:00 |
|
Tom Giannattasio
|
b4ce13af8e
|
more specific fakepath cut
|
2012-10-24 15:58:29 -04:00 |
|
Calen Pennington
|
f970da6da2
|
Fix issue where import didn't work if no grading policy file existed
|
2012-10-24 15:51:43 -04:00 |
|
Calen Pennington
|
9022c0d661
|
Merge pull request #964 from MITx/bug/cas/tom/section-name-alert
replaced section name alert with a spinner
|
2012-10-24 12:47:08 -07:00 |
|
Tom Giannattasio
|
4e3f7626be
|
replaced section name alert with a spinner
|
2012-10-24 15:43:02 -04:00 |
|
chrisndodge
|
258d506ae7
|
Merge pull request #961 from MITx/feature/cale/cas-save-draft-tweaks
Feature/cale/cas save draft tweaks
|
2012-10-24 12:39:30 -07:00 |
|
Calen Pennington
|
171b6b56fe
|
Fix typo
|
2012-10-24 15:31:00 -04:00 |
|
Tom Giannattasio
|
4afda98420
|
fixed multiple file picker bug; removed 'fakepath' from uploading file name
|
2012-10-24 15:22:23 -04:00 |
|
Calen Pennington
|
9dc6cdbda0
|
Remove vestigial save-subsection button
|
2012-10-24 15:18:03 -04:00 |
|
Calen Pennington
|
2dd77656cc
|
Make all edits on unit page happen immediately, and restore the delete draft button
|
2012-10-24 15:00:33 -04:00 |
|
Calen Pennington
|
fb06344290
|
Allow for deletion of all components in a draft
|
2012-10-24 14:59:00 -04:00 |
|
Calen Pennington
|
cf4f1118ea
|
Merge pull request #959 from MITx/feature/cas/tomg/saving-conventions
tweaked saving mechanisms
|
2012-10-24 11:58:23 -07:00 |
|
Tom Giannattasio
|
ddf3e2e39c
|
removed unused edit policy function
|
2012-10-24 14:56:30 -04:00 |
|
Tom Giannattasio
|
1e988c3f5e
|
disabled policy names always and removed edit button
|
2012-10-24 14:46:46 -04:00 |
|
Tom Giannattasio
|
dee6219510
|
brought delete button back to drafts; save on delete component
|
2012-10-24 14:46:46 -04:00 |
|
Tom Giannattasio
|
ef5ce4e8f4
|
fixed policy editing workflow
|
2012-10-24 14:46:45 -04:00 |
|
Tom Giannattasio
|
b73ceb5642
|
show spinner more than once
|
2012-10-24 14:46:45 -04:00 |
|
chrisndodge
|
14a94bacdb
|
Merge pull request #954 from MITx/feature/cale/fixing-tests
Feature/cale/fixing tests
|
2012-10-24 09:44:44 -07:00 |
|
Calen Pennington
|
a6c8d90a08
|
Merge pull request #958 from MITx/feature/cdodge/import-grading-policy
Feature/cdodge/import grading policy
|
2012-10-24 09:36:56 -07:00 |
|
Chris Dodge
|
ae4df32e43
|
adjust implemented according to code review feedback. Move all of the grading_policy retrieval into a from_xml() override method. Also move in some of the grading inheritance logic into course_module.py
|
2012-10-24 12:27:30 -04:00 |
|
Calen Pennington
|
2802302162
|
Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course
|
2012-10-24 11:51:25 -04:00 |
|
Chris Dodge
|
d2c46f51ea
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-grading-policy
|
2012-10-23 23:56:02 -04:00 |
|
Chris Dodge
|
91e50f13cb
|
implement importing of grading policy during import. This is stored in definition.data.grading_policy.
|
2012-10-23 23:55:55 -04:00 |
|
Calen Pennington
|
dab77e7d79
|
Switch to using staff group names that are only specified by org/course, rather than the full course_id
|
2012-10-23 13:40:50 -04:00 |
|
Calen Pennington
|
cac8e3453c
|
Remove more remnants of askbot
|
2012-10-23 13:40:50 -04:00 |
|
Calen Pennington
|
0f043f35d7
|
Remove unused github_sync app
|
2012-10-23 13:40:49 -04:00 |
|
Calen Pennington
|
4122d8da62
|
Fix path to ui icon
|
2012-10-23 13:40:49 -04:00 |
|
Calen Pennington
|
ef1ba6d9f7
|
Remove leftover merge garbage
|
2012-10-23 13:40:34 -04:00 |
|
Calen Pennington
|
b52ed48221
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
|
2012-10-23 13:38:11 -04:00 |
|