Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

6956 Commits

Author SHA1 Message Date
kimth
1ff8e271f5 Partial scoring 2012-08-13 10:14:29 -04:00
Calen Pennington
801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response 
Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py
 2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches 
Provide content QA (quality assessment) interface
 2012-08-13 06:55:05 -07:00
Calen Pennington
a3d7c4892d Merge pull request #397 from MITx/feature/server_split 
Model replication to course databases
 2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00
Calen Pennington
a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules 
Hide errors from non-staff users
 2012-08-13 06:17:13 -07:00
Calen Pennington
fdee13e4c0 Merge pull request #393 from MITx/feature/victor/bad-content-warn-not-error 
Feature/victor/bad content warn not error
 2012-08-13 06:13:19 -07:00
David Ormsbee
3cabb2dea6 Remove the no-longer-used is_valid_course_id code 2012-08-13 01:00:55 -04:00
David Ormsbee
d24ee25615 Remove debug checking for UserProfile 2012-08-13 00:57:33 -04:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
ichuang
47c48e9c66 fix student.views.create_account to handle errors from _do_create_account 2012-08-12 19:07:31 -04:00
ichuang
f072979a6c fix error in student views - js was undefined in _do_create_account 2012-08-12 18:45:24 -04:00
ichuang
2c9652ab74 change xqa server location to suburl 2012-08-12 18:29:48 -04:00
Victor Shnayder
3455f8f64d Hide errors from non-staff users 2012-08-12 18:03:12 -04:00
Victor Shnayder
af7e70a979 Log content problems as warnings, not errors 
* will avoid newrelic complaining
* NOTE: Is this what we want post-ship?
  - need some way of notifying instructors of problems
 2012-08-12 17:21:40 -04:00
Victor Shnayder
622eebc473 Don't error on missing static files 
* Just log a warning and return a dummy url
* May want smarter checking later
  (e.g. would be nice to tell staff what files are missing.)
 2012-08-12 16:21:38 -04:00
David Ormsbee
54b0a465fa Ugly hack so that an LMS-specific test of the shared Student djangoapp doesn't break CMS test runs 2012-08-12 16:10:08 -04:00
ichuang
656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] 2012-08-12 12:43:08 -04:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
Calen Pennington
14bfbb06a5 If there is a missing static file, don't break the server, just leave a dead url 2012-08-10 21:22:12 -04:00
Calen Pennington
b5d377adb5 Merge pull request #388 from MITx/kimth/lms-coderesponse 
Spinner on waiting for queue
 2012-08-10 17:48:54 -07:00
ichuang
241d445f30 changes to xml_module to allow problem metadata to be added via <meta> 2012-08-10 19:00:50 -04:00
Bridger Maxwell
e462fad367 Converted wiki edit page and breadcrumbs. 2012-08-10 18:15:21 -04:00
David Ormsbee
cbfdf59760 Fix test error regarding UserProfiles (a UserProfile must exist before a CourseEnrollment) 2012-08-10 16:41:46 -04:00
ichuang
f556e3f7d9 revert double-mangling patch in xmodule_modifiers; cale fixed in 
replace_urls
 2012-08-10 15:25:43 -04:00
ichuang
b6c38d3c59 replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:42 -04:00
ichuang
881f07f3c3 revert double-mangling patch in xmodule_modifiers; cale fixed in 
replace_urls
 2012-08-10 15:25:42 -04:00
ichuang
c0a4ff3717 more useful debugging message for capa problem script errors 2012-08-10 15:25:42 -04:00
ichuang
27cd9ef986 minor change to allow github url to be overridden by metadata 2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:41 -04:00
kimth
125bbbf934 Spinner on waiting for queue 2012-08-10 15:25:07 -04:00
Calen Pennington
c867560662 Merge pull request #385 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-10 12:19:36 -07:00
Tom Giannattasio
f2012e1d2a additional processing class 2012-08-10 15:07:08 -04:00
Bridger Maxwell
3f4c4d7487 Got most of the wiki article page working. It shows the article menu now. 2012-08-10 14:46:53 -04:00
David Ormsbee
b3676cd760 Add replication tests 2012-08-10 14:43:43 -04:00
Tom Giannattasio
185ab1f615 added spinner class and image 2012-08-10 14:22:34 -04:00
Victor Shnayder
feba37cf78 respond to comments on merge 2012-08-10 13:39:58 -04:00
Victor Shnayder
67949f8a32 Fix metadata inheritance 
* with xml datastore, re-do all inheritance once the whole course is loaded
 2012-08-10 13:15:14 -04:00
kimth
f6b2cabd83 Position change in sequence kills polling thread, rather than new Problem creation 2012-08-10 13:10:53 -04:00
kimth
64eba4332c Remove temp xqueue url 2012-08-10 12:01:53 -04:00
kimth
36091697a5 Student browser polls for queued submission result 2012-08-10 11:59:45 -04:00
Victor Shnayder
6882b4b53d responding to review comments on #383 2012-08-10 11:42:54 -04:00
Victor Shnayder
1d8dcf30f9 docstring cleanups 2012-08-10 11:42:53 -04:00
Victor Shnayder
5882a89c82 Add management command to create random users 
* required some refactoring in create_account() view
 2012-08-10 11:41:05 -04:00
Bridger Maxwell
45baccae85 Added a django template loader that can return Mako templates. Started pulling in new wiki. 2012-08-10 11:31:29 -04:00
Calen Pennington
5f44b08f9c Merge pull request #382 from MITx/feature/victor/check-access-control 
Did a quick security scan through views.
 2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837 Did a quick security scan through views. 
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
 2012-08-10 10:43:20 -04:00
Calen Pennington
4f27dd436e When in debug mode, check the staticfiles.finders before mangling urls 2012-08-10 10:13:18 -04:00
David Ormsbee
8d9297ea04 Some refactoring of how user info is copied over when enrollments are created. 2012-08-10 02:02:44 -04:00
David Ormsbee
731e04e013 Add an explanation of replication 2012-08-10 02:02:44 -04:00