Commit Graph

3005 Commits

Author SHA1 Message Date
John Jarvis
29ed95c147 "ungenerated_certs" command update
Updated for testing (for now)
This will eventually be run periodically and/or server
as a way to generate certificate requests from the commandline
2012-11-09 18:18:34 -05:00
John Jarvis
b326b83fb6 Adding XQueueCertificate interface.
Adding, removing and updating certs
2012-11-09 18:18:34 -05:00
John Jarvis
8ccaafd758 adding migration for certificate changes 2012-11-09 18:18:34 -05:00
John Jarvis
22ed22d956 Updating the certificate app for testing
Conflicts:

	lms/djangoapps/certificates/models.py
2012-11-09 18:18:34 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master
Conflicts:
	rakefile
2012-11-08 12:28:40 -05:00
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
David Ormsbee
53c5170dbc Simple PEP8 issues. 2012-11-06 18:14:57 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -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
Calen Pennington
6212507b55 Merge pull request #1008 from MITx/ie8patch
merge to master
2012-11-06 06:18:01 -08:00
Arjun Singh
d9b553b378 Adding a better command for assigning roles. 2012-11-05 15:29:49 -08:00
Don Mitchell
7f4bb63dff Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
David Ormsbee
d1aa0a254e Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides. 2012-11-02 17:21:00 -04:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Chris Dodge
b788b9d659 add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc. 2012-11-01 15:08:26 -04:00
David Ormsbee
8a453e99ca Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view. 2012-11-01 04:37:16 -04:00
Chris Dodge
87dadd40c4 address some of Cale's feedback 2012-10-31 14:11:24 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Chris Dodge
34c442a1dc removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering 2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90 addressed Cale's feedback 2012-10-30 16:01:28 -04:00
Chris Dodge
ba9a03410b remove unneeded debugging traces 2012-10-30 15:56:02 -04:00
Chris Dodge
ee1098c032 remove unused line 2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Victor Shnayder
a155265409 minor whitespace + comment fixes 2012-10-29 23:44:38 -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
Chris Dodge
fec6c42adc implement importing of course info sections as modules in the course 2012-10-24 20:55:04 -04:00
David Ormsbee
ab676d9d6d Merge pull request #952 from MITx/vik/add_instrumentation
Vik/add instrumentation
2012-10-24 12:23:31 -07:00
Vik Paruchuri
dba04ab6d8 added docstrings 2012-10-24 15:14:06 -04:00
Vik Paruchuri
a75acffe01 made requested changes to statsd names, score bucket 2012-10-24 15:11:41 -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
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
Vik Paruchuri
64b117a7c2 changed metric names, added into render page 2012-10-23 18:14:16 -04:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -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
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
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -04:00
Carlos Andrés Rocha
e7c62b0fc6 Add migrations to license django application 2012-10-16 11:57:38 -04:00
Carlos Andrés Rocha
a8cedf8ab9 Update lms/djangoapps/licenses/views.py
Remove annoying print statements
2012-10-15 21:04:10 -03:00
Carlos Andrés Rocha
e9ec63e4b6 Add ajax endpoint to retrieve and assign course software licenses 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
3808ff85a8 Added django command to generate random serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
9cf8c02dc6 Added import_serial_numbers command test. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
516c41f342 Added html view of serial numbers. Refactored code. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
b2de8199b7 Added licenses view helper functions. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
ed88708d71 Renamed models and commands for importing serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00