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
James Tauber
b985722255
fixed encoding
...
xgettext seems to only like `utf-8` not `utf8` so string extraction
was failing without this
2013-08-16 13:52:07 -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
James Tauber
f3e282e3ed
Merge pull request #712 from edx/jtauber/fix-typo
...
fixed typo in faculty member settings text
2013-08-16 10:18:55 -07:00
Chris Dodge
d1ce55f65c
have the test teardown explicitly call destroy_db
2013-08-16 12:02:58 -04:00
James Tauber
97083d0f69
fixed typo in faculty member settings
...
This was confusing translators as didn't make sense in English
2013-08-16 11:49:20 -04:00
Frances Botsford
d4ea8388a6
updated styling for marketing side register button to accommodate second line of text - and IE-specific styling
2013-08-16 11:28:07 -04:00
Adam Palay
0a59cb6598
in grading, if problem cannot be created, return score as none
...
Conflicts:
lms/envs/dev.py
2013-08-16 11:27:55 -04:00
Peter Baratta
01c743f244
Merge pull request #664 from edx/peterb/fix/math-initial-display
...
Fix initial loading bug on `<formulaequationinput />`
2013-08-16 08:17:03 -07:00
JonahStanley
43bee86074
Tightened up wording
2013-08-16 11:08:05 -04:00
JonahStanley
967fdee6bc
Made filling field a bit safer
2013-08-16 10:55:14 -04:00
JonahStanley
97f70e8598
Fixed wording to better reflect BDD specs
2013-08-16 10:52:20 -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
Adam
321fc36e45
Merge pull request #691 from edx/fix/adam/progress-page
...
in grading, if problem cannot be created, return score as none
2013-08-16 07:40:51 -07:00
Frances Botsford
445cf39f8b
updated styling for marketing side register button to accommodate second line of text
2013-08-16 10:39:45 -04:00
JonahStanley
fc67c2ee6b
Wrote preliminary help modal acceptance tests
2013-08-16 10:36:12 -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
Adam Palay
8aee225136
in grading, if problem cannot be created, return score as none
2013-08-16 10:25:38 -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
polesye
a2dcf9aa9c
Merge pull request #689 from edx/anton/fix_video_speed_button
...
Video: disable speed controls for unsupported browsers.
2013-08-16 05:58:37 -07: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
Peter Fogg
346fb7b4fa
Merge pull request #698 from edx/peter-fogg/grading-cutoffs-fix
...
Fix grade range names not being editable.
2013-08-15 20:06:54 -07: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
