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

6578 Commits

Author SHA1 Message Date
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
Vik Paruchuri
f17987c13a Fix flagging, select rubric labels in peer grading 2013-08-16 17:37:53 -04:00
Don Mitchell
998a25e7b3 Use a sort of name to choose if > 1 map 
and some minor comment changes.
 2013-08-16 16:07:26 -04:00
Don Mitchell
8f530d12c7 Raise ItemNotFoundError rather than return None if no map found 2013-08-16 16:07:26 -04:00
Don Mitchell
bd8a7906f5 Clarify doc/comments on default v explicit mappings 2013-08-16 16:07:26 -04:00
Don Mitchell
2ad515d15a Move singleton accessor w/ django dependencies to same place as modulestore() singleton accessor 2013-08-16 16:07:26 -04:00
Don Mitchell
2702d8a636 Implement location mapper as stand-alone helper class 
with own db connection.
 2013-08-16 16:06:56 -04:00
Don Mitchell
47a2122a65 Require edx:// for urls 
But don't use this parser for urls embedded in a browser url request.
 2013-08-16 16:06:11 -04:00
Don Mitchell
1b63ecab48 Enable test via naming it correctly 2013-08-16 16:06:11 -04:00
Don Mitchell
37602edfec Translate locations <-> locators 
unit tests and fixes they implied
 2013-08-16 16:06:11 -04:00
Don Mitchell
3ee6b3c095 pep8 violation fix (shadowed identifier) 2013-08-16 16:04:58 -04:00
Don Mitchell
1abae6f093 Location to Locator mapping utilities 
partial impl
 2013-08-16 16:04:58 -04:00
Don Mitchell
0833f87fef Remove 'edu' from examples 
per our agreement not to use the domain
 2013-08-16 16:03:34 -04:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00
Vik Paruchuri
59336ee03c Fix prompt hiding issue in peer grading 2013-08-16 15:24:38 -04:00
Don Mitchell
7f126f13e9 Merge pull request #624 from edx/dhm/flatten_kvs 
xblock fields persist w/o breaking by scope
 2013-08-16 12:18:02 -07:00
Vik Paruchuri
48b0e570bc Disable submit buttons until rubric totally filled out 2013-08-16 15:10:55 -04:00
Vik Paruchuri
8248c33138 Grab the correct location to report data for 2013-08-16 14:48:11 -04:00
Valera Rozuvan
a5a6d2d54a Added test for Flash video player. 
Fix for video and captions sync. Test for this fix.
 2013-08-16 14:45:10 -04:00
Vik Paruchuri
bc8244b709 Rename reset to try again, hide and disable submit buttons 2013-08-16 14:43:37 -04:00
Jay Zoldak
e91205aff3 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module.py
 2013-08-16 14:25:03 -04:00
Vik Paruchuri
4f3ec68fb7 Scroll to top in peer and staff grading, preserve line breaks in submissions 2013-08-16 14:12:37 -04:00
Don Mitchell
4c28684014 pass xblock fields as top-level keywords on factories 2013-08-16 14:01:16 -04:00
Vik Paruchuri
be3291eeb0 Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work 2013-08-16 13:22:34 -04:00
Chris Dodge
d1ce55f65c have the test teardown explicitly call destroy_db 2013-08-16 12:02:58 -04:00
Don Mitchell
69a0683322 Remove obsolete attrs. 2013-08-16 10:42:53 -04:00
Don Mitchell
5029659327 Better explain behavior and todo's 2013-08-16 10:42:53 -04:00
Don Mitchell
438bbffb93 Add field iterator which includes namespaced fields 
And fix get_explicitly_set to use it and to get the json not native
field values.
 2013-08-16 10:42:53 -04:00
Don Mitchell
929597ce84 Move load_from_json to the test file only 
It's a reasonable demo of in memory xblock creation, but doesn't fit
the xblock pattern. Moving temporarily to keep the dag persistence test.
 2013-08-16 10:42:53 -04:00
Don Mitchell
857431f793 Clarify comments re behavior 2013-08-16 10:42:53 -04:00
Don Mitchell
a507ebc1b6 Clarify function name 
and fix some comments ref'g old names
 2013-08-16 10:42:53 -04:00
Don Mitchell
e4a69373d0 xblock fields persist w/o breaking by scope 
Letting xblocks handle scope rather than separating fields into
different attrs. Although, split still shunts content fields to a
different collection than setting and children fields.

The big difference is that content fields will always be a dict and not
sometimes just a string and there's no special casing of 'data' attr.

The other mind change is no more 'metadata' dict.
 2013-08-16 10:42:52 -04:00
Chris Dodge
13ff461461 add a filter to get_courses to not surface any courses that haven't been mapped, unless the store provider has been labeled as 'default' 2013-08-16 10:30:47 -04:00
Chris Dodge
ae6f97a368 add test for test_static_url_generation_from_courseid 2013-08-16 09:51:57 -04:00
Valera Rozuvan
4b5f77aa55 Added back old method of getting caption position for Flash video playback. 
Because with speed changing the time also changes for Flash playback,
a different way to calculate the current time is needed than for HTML5
playback. I have added conditions for Flash and HTML5 video, and put
old method of calculating time for Flash.

I have tested it on the YouTube video ZwkTiUPN0mg. Both HTML5 mode and
Flash mode have proper video-captions syncing with this fix. NOTE: to view
YouTube video in Flash mode you either have to use an old browser (ex. Firefox
version 18) or hard code in source that state.currentPlayerMode = 'flash' (in
function _setPlayerMode(), file 01_initialize.js).
 2013-08-16 09:42:14 -04:00
Peter Fogg
a66743128a Correctly seek in captions with non-1.0 speeds. 2013-08-16 09:42:04 -04:00
Anton Stupak
9b76b49292 Disable speed controls for unsupported browsers. 2013-08-16 14:44:44 +03:00
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
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
52928d165a update SplitModuleStore tests to pull the course_id from the locator 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
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