Commit Graph

3927 Commits

Author SHA1 Message Date
Chris Dodge
afd8584569 remove explicit 'null' for child collection on saveName on unit code paths. I had seen cases where save was posting back an empty set on renames - deleting the components. But I can no longer reproduce it now. 2012-11-07 09:34:44 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Conflicts:
	lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
Chris Dodge
3f01bef1eb Add changelog information 2012-11-06 10:34:51 -05:00
Chris Dodge
a9c4493a70 always make the spinner spin on unit renames 2012-11-05 12:26:44 -05:00
Chris Dodge
6b45b4c741 bind the disabling/enabling of the unit name input field based on whether the page state is public or not. We shouldn't be able to edit when public. 2012-11-05 12:02:08 -05:00
Tom Giannattasio
7887f92e3b removed log 2012-11-01 11:34:31 -04:00
Tom Giannattasio
a6d5edce5e polished grade range slider 2012-11-01 11:34:02 -04:00
Tom Giannattasio
ef4b2f044f basic settings framework – wip 2012-10-31 17:03:06 -04:00
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Calen Pennington
827f7d5aa3 Merge pull request #988 from MITx/feature/cale/changelogs
Add changelogs for the CMS and LMS
2012-10-30 13:48:57 -07:00
Calen Pennington
d4a6b589f1 Add comment about the target of change log entries 2012-10-30 16:48:47 -04:00
Calen Pennington
6221baf3e5 Use TEST_ROOT log directory when running jasmine tests 2012-10-30 15:58:59 -04:00
Chris Dodge
ba9a03410b remove unneeded debugging traces 2012-10-30 15:56:02 -04:00
Calen Pennington
cd9fbaeb02 Add timeout so that jasmine tests eventually fail if the server doesn't start 2012-10-30 15:51:21 -04:00
Chris Dodge
ded19f761a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-10-30 15:10:06 -04:00
Tom Giannattasio
d68945de33 started adding settings page 2012-10-30 15:04:21 -04:00
Calen Pennington
b8dcf0c40c Merge pull request #993 from MITx/bug/cas/tom/long-class-names
added handling for long class names in the header
2012-10-30 09:59:36 -07:00
Tom Giannattasio
ceb17ad411 added handling for long class names in the header 2012-10-30 12:57:47 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Tom Giannattasio
d63f82ae57 moved error message into form area; tweaked cancel behavior 2012-10-30 11:39:08 -04:00
Calen Pennington
e8be6b3111 Get jasmine tests running on cms 2012-10-30 11:33:21 -04:00
Calen Pennington
6d5a1264b9 Move jasmine tests to their own environment 2012-10-30 10:58:38 -04:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
Calen Pennington
e422716045 Add changelogs for the CMS and LMS 2012-10-29 09:07:49 -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
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
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
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
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
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
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
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
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