Commit Graph

5791 Commits

Author SHA1 Message Date
Adam
20c9a8af19 Merge pull request #6510 from smarnach/safari-video-speed
Work around a Youtube API bug that causes Safari to ignore the stored speed
2015-02-11 10:17:29 -05:00
Nimisha Asthagiri
9e7b916fd6 Merge pull request #6797 from edx/mobile/perf_improvements
Mobile performance improvements
2015-02-10 16:21:37 -05:00
Adam
296167e531 Merge pull request #6950 from edx/release
Release
2015-02-10 16:06:24 -05:00
Nimisha Asthagiri
e9e59e85fc Optimize video_module's __init__ method.
The overall behavior of the __init__ method has remained the same.
What's changed is how it determines whether a field is explicitly set.

Instead of using the slower performing editable_metadata_fields, it
calls _field_data.has directly to check for explicitly set fields.
2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
a6130507c1 Mobile Video Summary API: add filter for get_children 2015-02-10 14:02:50 -05:00
Calen Pennington
89d4749057 get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)
get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)

quality fixes

remove trailing comma
2015-02-10 09:47:44 -05:00
ahsan-ul-haq
c7c3e44076 Merge pull request #6932 from edx/ahsan/tnl-1073-Placeholder-text-iframe-inaccessible-content
Placeholder text for <iframe> encourages inaccessible content
2015-02-10 16:35:35 +05:00
Adam
2057f7db38 Merge pull request #6929 from edx/release
Release
2015-02-09 11:14:41 -05:00
Ahsan Ulhaq
cded2eb546 Changes in iframe placeholder text 2015-02-09 20:46:08 +05:00
Ahsan Ulhaq
4198b0a33f Placeholder text for <iframe> encourages inaccessible content
Iframe unit in the studio have accesibility issue as there was no title for
Iframe provided as well as placeholder does not specify what changes to made
to add new iframe

TNL-1073
2015-02-09 20:41:32 +05:00
cahrens
78a8fd807a If existing course is found on import, make sure dest_course_id is correct.
TNL-1362
2015-02-09 10:00:33 -05:00
cahrens
7a64e6f69f Support running test with split modulestore as the default.
With split, "name" returns "course" instead of the run name.
2015-02-09 10:00:32 -05:00
cahrens
7a3a48b15b Update to work with split_modulestore.
"run" should not be passed in kwargs to create.
2015-02-09 09:26:05 -05:00
Calen Pennington
61f86369ad Merge pull request #6843 from cpennington/test-for-plat-417
Add tests of PLAT-417
2015-02-09 09:15:12 -05:00
Sven Marnach
daaf22a9a1 Work around a Youtube API bug that causes Safari to ignore the stored speed setting.
Fixes https://openedx.atlassian.net/browse/TNL-408.

On Safari, the Youtube HTML5 player accepts playback rate changes before the
video is loaded, but doesn't actually play the video at the rate set.  This
patch works around this bug by first setting the playback rate back to 1 and
then to the actually desired speed.
2015-02-07 13:13:07 +00:00
Calen Pennington
4851062987 Don't instantiate bogus modulestores just to get template rendering in old ORA 2015-02-06 15:20:59 -05:00
John Eskew
46f64305f7 Merge pull request #6767 from edx/jeskew/split_course_export_slowdown_take_II
Fix performance problem with Split course import/export.
2015-02-06 15:18:26 -05:00
zubair-arbi
b01f7adce1 Merge pull request #6907 from edx/zub/bugfix/tnl-1335-html5-contextual-menu
fix contextual menu (make it clickable) for HTML5 videos
2015-02-06 21:38:09 +05:00
John Eskew
9388ba5968 Change new BlockData object from a dict to an object with specific
attributes that are serialized/de-serialized to/from MongoDB.

Change access of attributes from dict keys.

Add EditInfo object to encapsulate editing info for block data.
2015-02-06 11:28:54 -05:00
Calen Pennington
79fe947a92 Add test of PLAT-417 2015-02-06 09:59:49 -05:00
zubair-arbi
a750476c73 fix contextual menu (make it clickable) for HTML5 videos
TNL-1335
2015-02-06 16:18:09 +05:00
ahsan-ul-haq
c814323644 Merge pull request #6810 from edx/ahsan/tnl-1074-adaptive-hint-inaccessible
Problem with Adaptive Hint is inaccessible
2015-02-06 15:15:11 +05:00
Syed Hassan Raza
806a3d9af2 Quote the starts with expression id^
TNL-1240
2015-02-06 11:53:04 +05:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup
Clean up ModuleStoreTestCase
2015-02-04 15:57:01 -05:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Ahsan Ulhaq
8f71cb6015 Adaptive hint inaccessible
Remove the <p> and label from textline

tnl-1074
2015-02-04 21:42:20 +05:00
Ahsan Ulhaq
9b9301a5d4 Problem with Adaptive Hint is inaccessible
There were no label added for problem with adaptive hint so for the question
added the label and insteat of using for attribute used the label as the
parent of input field

TNL-1074
2015-02-04 21:41:25 +05:00
Calen Pennington
199a8b783f Enforce the use of XModuleFactory only in contexts where something will clean up after it 2015-02-04 09:09:14 -05:00
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Waheed Ahmed
e868db2e4d Fixed multiple textbooks links to only last uploaded textbook.
TNL-1304
2015-02-03 19:31:28 +05:00
Ned Batchelder
b048d98eb9 Merge pull request #6851 from edx/ned/fix-gettext-literals
Fix a number of incorrect translation string uses.
2015-02-03 08:38:58 -05:00
Ned Batchelder
fb595c89f3 Fix a number of incorrect translation string uses
These were found by the new pylint checker I wrote! :)
2015-02-02 22:38:27 -05:00
Sarina Canelake
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream
Add Cosmetic Display Price field to studio & logic to show it
2015-02-02 20:07:58 -05:00
Chris
2967f18d3f Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update
Accessibility fixes for UX-1572
2015-02-02 07:05:00 -05:00
zubair-arbi
7d7cb7850f don't add xblock with 'detached' tag as direct child of course for split in 'create_child' method
PLAT-420
2015-02-02 12:31:57 +05:00
Chris Rodriguez
3acb5c53f0 Accessibility issues addressing UX-1572 2015-01-30 14:16:59 -05:00
Chris
0a0d306b6a Merge pull request #6750 from edx/clrux/lms-navigation-content-focus-update
Accessibility issues addressing UX-1573
2015-01-30 12:26:23 -05:00
Sarina Canelake
011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl
TinyMCE RTL in course bulk email
2015-01-30 09:12:56 -05:00
Chris Rodriguez
370eb970b1 Accessibility issues addressing UX-1573
Conflicts:
	common/lib/xmodule/xmodule/css/sequence/display.scss
2015-01-29 16:39:27 -05:00
Jonathan Piacenti
f1fff439a6 Add clearer error message for library content blocks on incompatible modulestores. 2015-01-29 20:36:19 +00:00
Matt Drayer
1c839cc09d Addressed several outstanding issues related to initial entrance exams feature delivery 2015-01-28 23:56:32 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
jsa
dbc465a518 reuse instances of OSFS in old mongo 2015-01-28 18:23:23 -05:00
John Eskew
e600d6e3b1 Add BlockData class to wrap all block data loaded from the Split
modulestore, in order to separate serializable block data from
out-of-band, non-saved, temporary metadata.

Eliminate the deepcopy causing performance problems with import/export.

https://openedx.atlassian.net/browse/PLAT-416
2015-01-28 18:23:22 -05:00
Calen Pennington
6cb55e1a36 Stringify ObjectIds before attempting to make a filename out of them 2015-01-28 18:23:22 -05:00
Calen Pennington
1160306438 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-28 18:23:22 -05:00