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
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
Carlos Andrés Rocha
bbfe3662e2
Enable the django_nose app by default
...
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
2013-08-15 19:31:30 -04:00
Vik Paruchuri
7b9dde78fe
Fetch the correct rubric
2013-08-15 19:21:28 -04:00
Vik Paruchuri
8218a4a220
Show the right rubric, be more explicit about "next step"
2013-08-15 19:09:09 -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
Vik Paruchuri
b97dbc37a6
Fix test, strip out more of show results
2013-08-15 18:57:32 -04:00
Vik Paruchuri
a49da5d530
Fix rubrics, strip out get results
2013-08-15 18:55:42 -04:00
Jason Bau
fa3bd7a19a
small change in aggregating peer eval grades (rounds up)
2013-08-15 15:00:38 -07:00
Vik Paruchuri
b6a5808548
Show submit button correctly for self assessment
2013-08-15 17:50:36 -04:00
Vik Paruchuri
35a540a0f6
Fix bug with leaving open ended response page and coming back
2013-08-15 17:25:04 -04: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
Diana Huang
c8fdf6ad29
Add in tests for the marketing site button.
2013-08-15 16:34:48 -04:00
Diana Huang
6db1f6a6c0
Add new column to CourseMode table for currencies
2013-08-15 16:34:48 -04:00
Diana Huang
4946fbcd5b
Change registration button based on number of modes.
2013-08-15 16:34:48 -04:00
Peter Fogg
a93d7229ac
Fix grade range names not being editable.
2013-08-15 16:30:14 -04:00
Chris Dodge
71de34fca3
use same getattr pattern in the XModule constructor that exists in the XModuleDescriptor
2013-08-15 16:24:54 -04:00
Don Mitchell
03608a8931
have XModuleDescriptor properly ensure category is set
2013-08-15 16:21:31 -04:00
