Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,641 Commits 1 Branch 0 Tags
642a4fa2f399649982ea68f5376a84ded1bd4b21
Commit Graph

285 Commits

Author SHA1 Message Date
Chris Dodge
9e96b9525b tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py 2013-08-05 15:24:19 -04:00
Don Mitchell
d1ed6fbc34 More xblock.save() calls to handle fields set during inits 2013-07-29 09:08:37 -04:00
Adam
420b092033 Merge pull request #467 from edx/fix/adam/file-upload 
Fix/adam/file upload
 2013-07-23 15:05:18 -07:00
Chris Dodge
345d2af540 address review feedback 2013-07-23 12:15:56 -04:00
Chris Dodge
63c5cfda94 add comment and fix mistake in test 2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
Adam Palay
af522af2ca formatting 2013-07-22 17:39:11 -04:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Adam Palay
dfa435012b notify students for NotFoundErrors from capa_module, improve error logging 2013-07-17 11:03:47 -04:00
Adam Palay
e123a5f8ad fix to problems with uploading files 2013-07-09 15:00:53 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Adam Palay
c692428fe5 fix pylint violations 2013-07-02 10:22:26 -04:00
Don Mitchell
8b23eeca7e Minor pylint/whitespace changes 2013-06-25 22:34:29 -04:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha
2f02496c8f Reorder imports on module_render 2013-06-25 13:31:53 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
616d18e1e3 Post-rebasing fixes to re-enable masquerading. 2013-06-18 11:13:17 -04:00
Brian Wilson
95c1c4b8a8 Refactor tracking and xqueue initialization to no longer require a request. Get tracking logs to work. Add transaction annotations. 
Make sure to read only once from result objects when getting result status,
so that values are consistent.
 2013-06-18 11:04:05 -04:00
Diana Huang
f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor 2013-06-03 17:21:41 -04:00
Vik Paruchuri
5050eab74a Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-24 14:26:33 -04:00
Greg Price
d724223a4c Merge pull request #2053 from edx/fix/gprice/modulestore-500-errors 
Handle ItemNotFoundError from the modulestore to avoid 500 errors
 2013-05-22 10:58:06 -07:00
Vik Paruchuri
d0e8965a3c Fix pep8/pylint issues 2013-05-20 16:42:27 -04:00
Vik Paruchuri
3b3cf19c47 Fix tests and add in jasmine test 2013-05-20 15:52:19 -04:00
Vik Paruchuri
23269359c1 Jasmine tests, fix some review issues 2013-05-20 15:31:56 -04:00
Vik Paruchuri
16e1ecf686 fix some pylint violations 2013-05-20 12:46:12 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
Vik Paruchuri
4c80325db3 Start working on COE editor, fix name checking in module_render 2013-05-20 08:11:54 -04:00
Greg Price
37ec01dd8d Handle ItemNotFoundError from the modulestore to avoid 500 errors 2013-05-16 16:50:03 -04:00
Ned Batchelder
7cb3987f94 Ugh, missing import. 2013-05-06 11:39:21 -04:00
Ned Batchelder
d8c22dbeb3 Add a Django setting for course allowed to run unsafe code. 2013-05-06 11:39:21 -04:00
Ned Batchelder
5e7d328e7f Use the Django cache for sandboxed code execution. 2013-05-06 11:39:19 -04:00
ichuang
0ffc399f7d move masquerade call up, to make sure it is used for start date checks 2013-04-17 22:12:12 -04:00
ichuang
168a3aadf6 masquerade - remove debug line, careful with ifs in course_nav.html 2013-04-13 22:46:55 -04:00
ichuang
fb0a23238a allow staff to masquerade as student - works 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html
 2013-04-13 22:46:39 -04:00
Calen Pennington
e97e8ce5b6 Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup 
clean up xqueue callback url generation; allow override from settings
 2013-04-04 11:54:13 -07:00
Victor Shnayder
9c4a88b570 Merge pull request #1743 from MITx/fix/will/bug_288 
Fix/will/bug 288
 2013-04-01 07:22:20 -07:00
ichuang
15d1bc372d clean up xqueue callback url generation; allow override from settings 2013-03-31 19:40:39 +00:00
Will Daly
9c671163fd Added exc_info=True to log.warning 
Changed log.exception to log.warning
 2013-03-27 17:11:02 -04:00
Will Daly
df1be87739 * Changed 404 errors to 400 errors 
* Removed duplicate traceback log message
* Now provide string, not Exception, as second tuple item to raise
 2013-03-27 15:20:40 -04:00
Will Daly
ac86687fa1 Added exception handling that solves SchematicResponse exceptions 
causing a 500 error.

When XModule raises a ProcessingError during an AJAX request,
this module_render now returns a 404 to further reduce number of 500
responses.
 2013-03-27 14:33:59 -04:00
brianhw
a04881ceda Merge pull request #1740 from MITx/fix/vik/peer-image-grading 
Fix/vik/peer image grading
 2013-03-27 09:06:54 -07:00
Calen Pennington
2c0e5b82ff Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029 2013-03-27 07:29:22 -04:00
Vik Paruchuri
97cb4910a7 Add in default bucket, edit image url checks 2013-03-26 11:04:14 -04:00
Vik Paruchuri
df935d422d Fix issues with open ended image grading and peer grading centralized module finder. 2013-03-26 09:52:26 -04:00
Diana Huang
af1af8c6d1 Address code review feedback: 
- improve docstrings
- only pass in the state for a particular input and
not the whole dictionary
- refactor some common code
- minor syntax cleanup
 2013-03-20 14:14:54 -04:00
Diana Huang
eda6169b8b Pass along a url creator as opposed to just a url through 
the ModuleSystem.
 2013-03-20 09:23:25 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
131e3120b9 Try to make psychometrics work with new storage model code 2013-03-13 16:35:50 -04:00