Commit Graph

7029 Commits

Author SHA1 Message Date
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
Calen Pennington
6083ba1dc3 Merge pull request #945 from MITx/feature/cas/tom/section-details
Feature/cas/tom/section details
2012-10-23 10:20:08 -07:00
Calen Pennington
2cd17eae6d Merge pull request #947 from MITx/bug/cas/tom/new-user-save
changed save button to add user
2012-10-23 10:18:37 -07:00
Calen Pennington
c1cebe0dc9 Merge pull request #949 from MITx/fix/cdodge/trim-section-name-edits
trim section name strings to remove whitespace
2012-10-23 06:27:51 -07:00
Tom Giannattasio
1d40fa3360 tweaked styles for section naming 2012-10-22 16:43:45 -04:00
Tom Giannattasio
f84b603133 wrapped up section date setting; need help with already published sections 2012-10-22 16:43:44 -04:00
Tom Giannattasio
e3457fa230 started styling section date pickers 2012-10-22 16:43:44 -04:00
Chris Dodge
90a55714c2 trim section name strings to remove whitespace 2012-10-22 16:35:22 -04:00
Calen Pennington
b005587951 Merge pull request #948 from MITx/fix/cdodge/import-improvements
have import be a bit more flexible in terms of the packaging of the cont...
2012-10-22 13:30:46 -07:00
Tom Giannattasio
df0ca3c445 changed save button to add user 2012-10-22 16:09:13 -04:00
Chris Dodge
1530341d55 have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder. 2012-10-22 16:01:57 -04:00
Calen Pennington
442516120c Merge pull request #936 from MITx/feature/cas/tomg/saving-conventions
new saving conventions
2012-10-22 12:58:05 -07:00
Tom Giannattasio
fb2925a28b changed nameString variable 2012-10-22 15:55:04 -04:00
Tom Giannattasio
a8aa8770bf add background to policy item being added 2012-10-22 15:55:04 -04:00
Tom Giannattasio
2541502669 added prompt on policy delete 2012-10-22 15:55:04 -04:00
Tom Giannattasio
6d595b96fb tweaked saving mechanisms on subsection page 2012-10-22 15:55:04 -04:00
Tom Giannattasio
33e6c583bf removed toast on save component 2012-10-22 15:55:04 -04:00
Tom Giannattasio
33df317d1b added spinner to unit input name 2012-10-22 15:55:04 -04:00
Tom Giannattasio
f6d046dd04 added autosaving to field inputs on unit and subsection pages 2012-10-22 15:55:04 -04:00
Tom Giannattasio
3a612a4da6 fixed reordering of subsection and units; they now save on update without error 2012-10-22 15:55:04 -04:00
Tom Giannattasio
00f3db370d whitespace trim 2012-10-22 15:55:04 -04:00
Tom Giannattasio
7655a5adfc added toast subsection save feedback 2012-10-22 15:55:04 -04:00
Tom Giannattasio
54937e4622 added delayed save after modifying display name on unit page 2012-10-22 15:55:04 -04:00
Tom Giannattasio
c34d42d8ce properties changed to settings 2012-10-22 15:55:03 -04:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup
Victor/test speedup
2012-10-22 10:45:23 -07:00
chrisndodge
35d50976de Merge pull request #946 from MITx/bug/cas/tom/password-tab-index
fixed tabindex
2012-10-22 10:43:53 -07:00
Tom Giannattasio
78a1743f9c fixed tabindex 2012-10-22 13:38:15 -04:00
David Ormsbee
9a4e21c010 Merge pull request #943 from MITx/feature/rocha/dashboard-software-licenses
Add fix for users with multiple licenses
2012-10-22 07:29:24 -07:00
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
bridger
853051bcc0 Merge pull request #941 from MITx/feature/rocha/dashboard-software-licenses
Use test database in licenses test instead of 6.002x
2012-10-19 15:42:00 -07:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -04:00
chrisndodge
87acaab6b5 Merge pull request #940 from MITx/fix/cdodge/pre-push-tweeks
remove cut/paste error which results in a server error.  is not defined ...
2012-10-18 18:58:35 -07:00