Commit Graph

58450 Commits

Author SHA1 Message Date
David Ormsbee
bbbd976671 Added some more sample data. The command to export to Pearson reads from the table, but currently just adds the entries it needs at runtime. 2012-10-24 15:02:05 -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
David Ormsbee
e4ffb2a514 Add TestCenterUser model and export for Pearson 2012-10-24 11:15:14 -04:00
Victor Shnayder
a508556521 Fix typo 2012-10-24 11:50:38 -03: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
Vik Paruchuri
4360d10aec altered spacing 2012-10-23 19:12:08 -04:00
Vik Paruchuri
952b3468cf pep8 in views, remove instance state check 2012-10-23 19:07:06 -04:00
Vik Paruchuri
7dec1b3c3f bugfix 2012-10-23 19:00:26 -04:00
Vik Paruchuri
57a78637f2 pep8 fixes and score bucketing 2012-10-23 18:58:11 -04:00
David Ormsbee
8ce20b5e0f Merge pull request #957 from MITx/fix/rocha/increase-upload-file-limit
Increase the limit of files that can be uploaded by a student
2012-10-23 15:16:15 -07:00
Vik Paruchuri
64b117a7c2 changed metric names, added into render page 2012-10-23 18:14:16 -04:00
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
David Ormsbee
4db444d5fd Merge pull request #956 from MITx/feature/rocha/user-admin-commands
Add some extra console commands for handling user permissions
2012-10-23 14:24:01 -07:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -04:00
Louis Sobel
b1cfee4592 Add support for subtitle download link
Add a download link to the video player. The link is defined
in the content xml using the following structure:

<video youtube="youtubestring">
    <track kind="subtitle" src="subtitle_link" />
</video>
2012-10-23 14:50:17 -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
Victor Shnayder
be947770c0 Merge pull request #917 from MITx/victor/make-problemset-sequential
Make problemset render as a sequential, not a vertical.
2012-10-23 10:30:52 -07:00
Vik Paruchuri
51f3b7195e roll back changes to common 2012-10-23 13:20:37 -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
Vik Paruchuri
d76241e6ae prefix metrics with lms, use tags for enrollment 2012-10-23 10:56:00 -04: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
Vik Paruchuri
e02d8403e7 updated requirements 2012-10-23 09:25:08 -04:00
Vik Paruchuri
3ba45fec73 added instrumentation, including user logins,registrations,enrollment,correct answers 2012-10-22 20:01:39 -04:00
Vik Paruchuri
f296815d51 added instrumentation to count: user logins, registrations, correct answers, wrong answers, enrollment 2012-10-22 19:50:34 -04: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