Chris Dodge
bca2018ab5
add unit tests for all methods in MixedModuleStore
2013-08-16 00:53:15 -04:00
Chris Dodge
cf715cb727
fix pylint violations
2013-08-15 22:58:04 -04:00
Chris Dodge
ed584a9abb
fix pep8 violations
2013-08-15 22:58:04 -04:00
Chris Dodge
c6cde6a722
resolve incorrect merge conflict resolution
2013-08-15 22:58:04 -04:00
Chris Dodge
61219169d4
change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration
2013-08-15 22:58:04 -04:00
Chris Dodge
0b8866ef29
forgot to return dictionary on get_errored_courses
2013-08-15 22:58:04 -04:00
Chris Dodge
5ee5beafbe
fix bad merge conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
9cc796df83
fix one more 'revision' -> 'branch' argument name change
2013-08-15 22:58:03 -04:00
Chris Dodge
7a80a9c02a
fix broken test after rebase
2013-08-15 22:58:03 -04:00
Chris Dodge
7bdc4c5134
fix errant conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
52928d165a
update SplitModuleStore tests to pull the course_id from the locator
2013-08-15 22:58:03 -04:00
Chris Dodge
e4eea6cc4f
some additional comments to clarify the partially bogus course_id.
2013-08-15 22:58:03 -04:00
Chris Dodge
aa8b054590
fix missed conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
9f14f1ee62
update file comment on MixedModuleStore
2013-08-15 22:58:03 -04:00
Chris Dodge
54bd3170bc
remove another debug logging message
2013-08-15 22:58:03 -04:00
Chris Dodge
fa61bdf69f
remove debugging logging
2013-08-15 22:58:02 -04:00
Chris Dodge
5298f54f4c
fix tests
2013-08-15 22:58:02 -04:00
Chris Dodge
cff93d324b
WIP
2013-08-15 22:58:02 -04:00
Chris Dodge
2616d8f7a2
remove unneeded type check on the modulestore
2013-08-15 22:58:02 -04:00
Chris Dodge
82988972ad
WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type()
2013-08-15 22:58:02 -04:00
Chris Dodge
b5253b52b6
add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier
2013-08-15 22:56:32 -04:00
Chris Dodge
6f11b98b4f
initial commit for a mixed module store which can interoperate with both XML and Mongo module stores
2013-08-15 22:56:32 -04:00
jkarni
a260115b01
Merge pull request #685 from edx/jkarni/fix/cms_pylint
...
Contentstore views pylint fixes
2013-08-15 16:05:09 -07:00
Jonah Stanley
796667cbdb
Merge pull request #701 from edx/jonahstanley/fix-lms-acceptance-issue
...
Workaround for issue
2013-08-15 14:01:35 -07:00
JonahStanley
a067fb58d6
Workaround for issue
...
Better wording of commit
Workaround for issue
Better wording of commit
Fixed spacing
2013-08-15 16:59:30 -04:00
David Ormsbee
5f8eab5f95
Merge pull request #687 from edx/bugfix/ichuang/optioninput-msg
...
capa optioninput template was missing msg output (needed for hints)
2013-08-15 13:52:50 -07:00
Christina Roberts
03b6050348
Merge pull request #667 from edx/christina/read-only-api
...
Make split mongo read-only API consistent with other modulestores.
2013-08-15 13:05:58 -07:00
Carlos Andrés Rocha
f4fe6de38f
Merge pull request #684 from rocha/test-invalid-youtube-ids
...
Add test for invalid YouTube IDs strings
2013-08-15 10:13:26 -07:00
cahrens
9f229a4605
Make get_errored_courses part of the modulestore API (with default implementation).
...
Also clarifies the contraction of location.course_id by throwing an exception for lcoations that are not of category course.
Add test for course_id method.
2013-08-15 12:50:37 -04:00
Vik Paruchuri
c9e0d36d16
Merge pull request #621 from edx/fix/vik/oe-issues
...
Fix/vik/oe issues
2013-08-15 08:27:34 -07:00
Carlos Andrés Rocha
9199f1d08b
Add test for invalid YouTube IDs strings
2013-08-15 11:06:53 -04:00
Jay Zoldak
bbb5059d36
Merge branch 'release'
2013-08-15 10:59:09 -04:00
Jay Zoldak
0350dea2eb
Merge pull request #682 from edx/sarina/hotfix/fix-combinedopenended
...
Fix error seen in combinedopenended modules
2013-08-15 07:48:55 -07:00
Peter Baratta
55b67e39bb
Merge pull request #680 from edx/peterb/move-numpy-seterr
...
Move the silencing of numpy's warnings into test_calc.py
2013-08-15 07:31:03 -07:00
Julian Arni
80619da429
Review fixes
2013-08-15 10:24:38 -04:00
Peter Baratta
5f3dd37f98
Move the silencing of numpy's warnings into test_calc.py
...
..because that is where it is the most annoying/visible. Otherwise it really
has no effect on the LMS or anything else.
2013-08-15 08:54:43 -04:00
chrisndodge
0db4c98782
Merge pull request #658 from edx/bugfix/ichuang/delete_course_group_not_exist
...
catch error in delete_course management script when group does not exist
2013-08-15 04:57:43 -07:00
Valera Rozuvan
8ba9497fd9
Merge pull request #675 from edx/anton/disable_0-25x_speed
...
Add filter for playback rates.
2013-08-14 19:46:58 -07:00
ichuang
501c089f41
capa optioninput template was missing msg output (needed for hints)
2013-08-14 21:51:40 -04:00
Julian Arni
3ed4198204
Contentstore views pylint fixes
2013-08-14 19:10:00 -04:00
Adam Palay
c5d52b8b74
turn off i18n
2013-08-14 17:14:05 -04:00
Adam
bcb4ae0751
Merge pull request #683 from edx/adam/turn-off-i18n
...
turn off i18n
2013-08-14 14:10:26 -07:00
Adam Palay
4855fd5af4
turn off i18n
2013-08-14 17:03:21 -04:00
Sarina Canelake
6a1e88cf77
Merge pull request #681 from edx/sarina/hotfix/fix-combinedopenended
...
Fix error seen in combinedopenended modules
2013-08-14 13:53:52 -07:00
Sarina Canelake
f438922a88
Fix error seen in combinedopenended modules
2013-08-14 16:36:33 -04:00
Jay Zoldak
c65c9eb069
Merge pull request #657 from edx/zoldak/fix-i18n-enroll
...
The enrollment_action value enroll should not be translated.
2013-08-14 13:18:00 -07:00
Diana Huang
cc86fb3f23
Merge pull request #676 from edx/diana/course-modes
...
Add Course Modes to LMS
2013-08-14 12:33:55 -07:00
Diana Huang
7d44379c99
Add admin site for CourseMode
2013-08-14 15:13:11 -04:00
John Jarvis
4c469cc414
Merge pull request #666 from edx/jarv/add-get-grades
...
adding django-admin commands to dump grades to a csv file
2013-08-14 11:42:51 -07:00
John Jarvis
7dc7406d3c
updating help for --course
2013-08-14 14:42:24 -04:00
