Commit Graph

3849 Commits

Author SHA1 Message Date
Bridger Maxwell
baa2b14405 Changed interface of StudentModuleCache. Other changes from code review. 2012-08-06 16:36:53 -04:00
Bridger Maxwell
fb7ff47b15 Accidentally commited local changes to envs. 2012-08-06 14:03:49 -04:00
Bridger Maxwell
d7cab471f2 Accidentally had left a print statement commented out. 2012-08-06 14:00:45 -04:00
Bridger Maxwell
ba42c0225d Moved the generation of the 'grading context' to a lazy property in course descriptor. 2012-08-06 13:57:41 -04:00
Bridger Maxwell
2348f71cc6 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
Conflicts:
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/views.py
2012-08-06 11:48:42 -04:00
Bridger Maxwell
a9c122d737 Removed cache for UserTestGroup in debug mode. 2012-08-06 11:37:47 -04:00
Bridger Maxwell
cbab4f1006 Fixed some imports on gradebook.html 2012-08-06 11:32:26 -04:00
Bridger Maxwell
7f5246f653 Removed test view for grading. 2012-08-06 10:17:53 -04:00
Bridger Maxwell
6d650d1825 Got the gradebook working again with the new fast grading method. 2012-08-03 17:55:25 -04:00
Bridger Maxwell
694520ebb2 StudentModuleCache now allows a list of descriptors. This speeds up grading significantly. 2012-08-03 17:00:04 -04:00
Calen Pennington
9b322f68b4 Merge pull request #337 from MITx/feature/victor/use-url-names
Feature/victor/use url names
2012-08-03 13:23:31 -07:00
Calen Pennington
b1494da02c Merge pull request #330 from MITx/ExternalAuth
External auth
2012-08-03 13:18:55 -07:00
Victor Shnayder
94e24c1626 Leftover name->url_name fixes 2012-08-03 14:45:43 -04:00
Bridger Maxwell
854508b006 Removed the unnecessary creation of StudentModules when calling module_render's get_module. 2012-08-03 14:30:45 -04:00
Victor Shnayder
0b2069c619 make clean_xml script work with stringified errors 2012-08-03 11:53:35 -04:00
Bridger Maxwell
408e988fbc Started working on fast_grade method. It skips loading sections that a student doesn't have any answers for. 2012-08-03 11:41:06 -04:00
Victor Shnayder
b46172da9b Rename module.name and descriptor.name to url_name
* update templates and code references
* also a display_name property that defaults to cleaned url_name
2012-08-03 11:36:54 -04:00
Victor Shnayder
2f911fd3b2 add error-handling TODOs to capa_problem 2012-08-02 14:28:44 -04:00
Victor Shnayder
987b9c11a9 Use url_name for chapters and sections in lms views
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
2012-08-02 14:28:44 -04:00
Victor Shnayder
3b6f33f5a7 Fix github_sync tests
* CMS no longer syncs, it just imports when it gets a commit note
  from github
2012-08-02 14:26:24 -04:00
ichuang
dff380e807 cleanup lms urls (remove cruft from debugging openid) 2012-08-02 14:19:56 -04:00
Victor Shnayder
95e139f39b Merge pull request #336 from MITx/feature/victor/xml-verify
Feature/victor/xml verify
2012-08-02 11:12:43 -07:00
ichuang
10b2c212b6 fix javascript for signup modal .click() in index.html for safari 2012-08-02 13:52:25 -04:00
ichuang
46bc7bc499 remove unnecessary hidden fields 2012-08-02 13:44:37 -04:00
Victor Shnayder
26ae88faac Factor out get_item_error() into a new ModuleStoreBase class
* may be temporary if we move errors into the items themselves.
2012-08-02 13:41:54 -04:00
ichuang
a7103ff893 switch to PascalCase, remove unnecessary assignment 2012-08-02 13:39:12 -04:00
Calen Pennington
477b7062d4 Merge pull request #335 from MITx/feature/cale/cms-no-roundtrip
Only import from github when changes are made, rather than exporting. Th...
2012-08-02 10:39:01 -07:00
ichuang
3eff9ffecd match external_domain as well when retrieving ExternalAuthMap objects 2012-08-02 13:28:52 -04:00
David Ormsbee
73fb8f5464 Merge branch 'hotfix/1.0.3'
Conflicts:
	lms/urls.py
2012-08-02 11:51:50 -04:00
Victor Shnayder
64346d727b todos and comments 2012-08-02 11:33:53 -04:00
Victor Shnayder
fd796478d8 add a handy supertrace script 2012-08-02 11:33:04 -04:00
Victor Shnayder
31b8270cfb remove too-clever lazy dictionary 2012-08-02 10:14:35 -04:00
Victor Shnayder
41eca8a0a5 Move files into xmodule module per comment on #326
* move html_checker.py
* move stringify.py
* move tests into module
* remove duplicate progress.py
* fix module imports
2012-08-02 10:13:58 -04:00
ichuang
613c53a710 slight cleanup, no need to import all of django_openid_auth 2012-08-02 10:05:26 -04:00
ichuang
f2a9110bda change model to have external_id and external_domain be unique_together 2012-08-02 09:56:33 -04:00
Victor Shnayder
fc0f938eae Responding to comments on pull #326
* cleaned up error module:
  - only one template
  - save error message in xml and reload
* better display of problem definition and metadata to staff
* save error messages as string, not exception objects.
2012-08-02 09:56:01 -04:00
ichuang
b2e9d980ff don't overwrite oid_backend 2012-08-02 09:42:26 -04:00
ichuang
23c3c5a652 print -> log.debug, rename function from camel case 2012-08-02 09:37:24 -04:00
Calen Pennington
a7ae7905ea Merge pull request #334 from MITx/feature/victor/metadata-inherit
Feature/victor/metadata inherit
2012-08-02 06:25:09 -07:00
Calen Pennington
052ae88111 Only import from github when changes are made, rather than exporting. This prevents bugs in the cms from preventing changes via git 2012-08-02 09:19:25 -04:00
ichuang
727e51411f small change so that ssl authenticated user can logout to see main screen 2012-08-02 08:59:02 -04:00
ichuang
4a0d0a08db minor change so that SSL code doesn't interfere with non-nginx instances 2012-08-01 23:37:35 -04:00
ichuang
938871571b Merge branch 'master' of github.com:MITx/mitx into ExternalAuth 2012-08-01 23:01:29 -04:00
ichuang
a759850e3e add SSL / MIT certificates auth; clean up external_auth.views 2012-08-01 22:42:06 -04:00
ichuang
102d4906d0 fix problem with add_histogram (expects module as second argument) 2012-08-01 22:41:27 -04:00
ichuang
ec78e1a126 add missing trailing slash 2012-08-01 20:19:33 -04:00
Victor Shnayder
e2ce54612c remove debugging assert from test 2012-08-01 19:25:47 -04:00
Victor Shnayder
652e2aa24c fix for inheriting metadata bug
* problem was on import to json--got all the metadata,
  but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
2012-08-01 19:25:47 -04:00
Victor Shnayder
b63f05b651 update clean_xml script to use error trackers properly 2012-08-01 19:25:47 -04:00
Victor Shnayder
82899323e8 Add metadata inherit test
* also make a placeholder roundtrip export test
2012-08-01 19:25:47 -04:00