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

22888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
aa7a4cedaa BlockUsageLocators are not AssetKeys. 2014-05-15 08:39:58 -04:00
Julia Hansbrough
ce8e6cd0d0 Merge pull request #3711 from edx/flowerhack/fix-subhist 
Fix improper parsing of location string
 2014-05-14 11:19:12 -04:00
Diana Huang
43b2d670e7 Merge pull request #3713 from edx/fix-ora-errors 
More missing ORA fixes.
 2014-05-14 09:40:35 -04:00
Diana Huang
25e026438d More missing ORA fixes. 2014-05-13 17:47:26 -04:00
Diana Huang
72b27c1800 Merge pull request #3709 from edx/fix-ora-errors 
Some more places where we have ORA errors
 2014-05-13 17:37:03 -04:00
Julia Hansbrough
2eda8a677a Merge pull request #3699 from edx/flowerhack/fix-safe-exec 
Compare stringified course_ids to regexes for courses allowed to execute...
 2014-05-13 17:36:44 -04:00
Julia Hansbrough
6c46fb98ca Compare stringified course_ids to regexes for courses allowed to execute unsafe code 2014-05-13 21:34:15 +00:00
Julia Hansbrough
542dff194e Fix improper parsing of location string 2014-05-13 21:29:30 +00:00
Diana Huang
b39278309d More ORA fixes for opaque-keys. 2014-05-13 16:39:56 -04:00
Will Daly
7fcaa20c61 Merge pull request #3702 from edx/will/opaque-keys-ora-fixes 
Will/opaque keys ora fixes
 2014-05-13 16:01:20 -04:00
Will Daly
c6a02870e1 Update instructor dash to support ora2 submissions API with opaque keys 2014-05-13 13:28:55 -04:00
Don Mitchell
741cdf9557 Merge pull request #3688 from edx/dhm/opaque-keys-bugs 
Dhm/opaque keys bugs
 2014-05-12 17:06:10 -04:00
Don Mitchell
45e8984997 Merge pull request #3530 from edx/dhm/opaque-locator 
Make Locators comply with UsageKey accessors
 2014-05-12 16:26:12 -04:00
Don Mitchell
bf8ca487bb fix staff_grading server error 2014-05-12 16:25:27 -04:00
Julia Hansbrough
66bbe17e86 Merge pull request #3687 from edx/flowerhack/fix-discussion-opaque 
Flowerhack/fix discussion opaque
 2014-05-12 15:45:48 -04:00
Don Mitchell
ded28af8b4 Make Locators comply with UsageKey accessors 2014-05-12 15:35:54 -04:00
Julia Hansbrough
f6f802f3db Pass deprecated course keys through 2014-05-12 18:35:40 +00:00
Don Mitchell
2f8d7e8cbe Fix @feanil Traceback from Logs(TypeError: 'SlashSeparatedCourseKey' object is not iterable) 2014-05-12 12:29:06 -04:00
Don Mitchell
6d7fe5619a Merge pull request #3675 from edx/opaque-keys-migrate 
Opaque keys migrate
 2014-05-12 12:10:48 -04:00
Don Mitchell
75280e8577 fixup! Migration refactoring 2014-05-12 12:02:16 -04:00
Don Mitchell
2238ce2cda Let sql tell us if the data is unique 2014-05-12 11:55:35 -04:00
Don Mitchell
7b70c4b8da Migration refactoring 2014-05-12 11:55:35 -04:00
Calen Pennington
b8f669eb09 Merge pull request #3669 from cpennington/opaque-keys-fix-discussion-tests 
Fix discussions by correctly serializing outgoing course_ids
 2014-05-12 11:10:10 -04:00
Calen Pennington
cbcb1059a3 fixup! Fix discussions by correctly serializing outgoing course_ids 2014-05-09 16:47:39 -04:00
Julia Hansbrough
0e07c27d03 Merge pull request #3674 from edx/flowerhack/fix-ora 
Flowerhack/fix ora
 2014-05-09 16:45:37 -04:00
Julia Hansbrough
9fb82d5357 Fixing ORA 2014-05-09 19:27:15 +00:00
Calen Pennington
76a04fa805 Fix discussions by correctly serializing outgoing course_ids 2014-05-09 14:51:03 -04:00
Nimisha Asthagiri
754ada9c62 Merge pull request #3668 from edx/opaque-keys-fix-cache-content-diff-runs 
Fix delete cache so it also deletes location with run = None.
 2014-05-09 14:36:48 -04:00
Nimisha Asthagiri
e9052dc2fb Fix delete cache so it also deletes location with run = None. 2014-05-09 14:17:32 -04:00
Diana Huang
558e9c8f20 Merge pull request #3662 from edx/diana/minor-ddt-fix 
Fix ddt decorators
 2014-05-09 11:33:11 -04:00
Diana Huang
f3a7be5a15 Use ddt decorators as specified in doc. 2014-05-09 11:24:57 -04:00
Don Mitchell
01ae09aa6c Merge pull request #3661 from edx/opaque-keys-mod_key 
Opaque keys mod key
 2014-05-09 11:23:14 -04:00
Don Mitchell
bd4595fad2 Fix missing field access 2014-05-09 11:19:54 -04:00
Don Mitchell
660f905028 Merge pull request #3658 from edx/opaque-keys-location-to-son 
Opaque keys location to son
 2014-05-09 10:48:51 -04:00
Don Mitchell
ae99a1700a Merge pull request #3659 from edx/opaque-keys-validate 
Opaque keys validate
 2014-05-09 10:47:41 -04:00
Don Mitchell
a558980e3c Merge pull request #3645 from edx/opaque-keys-student-module 
Opaque keys student module
 2014-05-09 10:42:25 -04:00
Don Mitchell
7be81341d7 Revert StudentModule.module_state_key to field rather than computed property 2014-05-09 10:41:12 -04:00
Don Mitchell
b89b1e0727 Merge pull request #3657 from edx/opaque-keys-access 
Don't fetch the course just to find out if the user has access to it.
 2014-05-09 10:30:09 -04:00
Nimisha Asthagiri
46a976d7e1 fixed asset search query. 
moved location_to_son to LocationBase.py.
 2014-05-09 10:28:34 -04:00
Don Mitchell
69a2d9882e Validate the args to SSCK 2014-05-09 10:26:06 -04:00
Don Mitchell
b337d4f893 Merge pull request #3651 from edx/opaque-keys-xmodule-lib-cleanup 
Responses to comments on https://github.com/edx/edx-platform/pull/3539
 2014-05-09 10:24:17 -04:00
Don Mitchell
f73939ab7d Responses to comments on https://github.com/edx/edx-platform/pull/3539 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py
 2014-05-09 10:18:22 -04:00
Don Mitchell
b3b118ee49 Merge pull request #3655 from edx/opaque-keys-common-lib-xmodule 
Opaque keys common lib xmodule
 2014-05-09 10:13:00 -04:00
Don Mitchell
6834376b8a Don't fetch the course just to find out if the user has access to it. 2014-05-09 10:12:21 -04:00
Calen Pennington
d5468fff4e Merge pull request #3642 from cpennington/opaque-keys-return-course 
Fix some tests on the opaque keys branch
 2014-05-09 10:06:38 -04:00
Calen Pennington
e042eb62c3 Use a validly formed bogus task id 2014-05-09 09:23:52 -04:00
Calen Pennington
002bfd475e Clean up partial import statemen 2014-05-09 09:23:52 -04:00
Calen Pennington
ac7675be2c Make dashboard.tests a python module 2014-05-09 09:23:52 -04:00
Calen Pennington
60cecc4e12 Fix syntax error 2014-05-09 09:23:52 -04:00
Calen Pennington
6334d7ddaa Clean up how courses are iterated on instructor dashboard 2014-05-09 09:23:51 -04:00