Commit Graph

6850 Commits

Author SHA1 Message Date
Peter Fogg
d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting
Make video captions respect course author's setting.
2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd Cannot set String field to a dict anymore! 2013-06-12 17:07:41 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
Peter Fogg
8da102c732 Update failing Jasmine tests for video. 2013-06-12 13:50:33 -04:00
Calen Pennington
5b8163dc9c Merge pull request #92 from edx/fix/cale/url-tests
Fix tests that vary urls.py
2013-06-12 10:47:13 -07:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00
JonahStanley
1b5050c9ac Changed the following:
% to format
css_find().click() to its actual function
A few name changes as well as step changes
Removal of drag testing
A refactoring of login and create user.  Login will no longer create the specified user
2013-06-12 13:25:33 -04:00
Peter Fogg
4e2c4f02d6 Fix times not being parse from HH:MM:SS format into floats and update video module logic tests. 2013-06-12 12:37:06 -04:00
Brian Talbot
14100ba14c syncs up font-weight across problem button/input actions 2013-06-12 11:44:00 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Brian Talbot
050846af71 abstracts height rule to apply to the capa check, show, save actions 2013-06-12 11:43:59 -04:00
Brian Talbot
664efb9887 removes HTML elemements from problem action Sass selectors 2013-06-12 11:43:59 -04:00
Brian Talbot
a17bf5e2ce resolves height issue when display the check and show answer actions alongside problems 2013-06-12 11:43:59 -04:00
Peter Fogg
681e96b702 Update display names and help text for video metadata. 2013-06-12 11:42:41 -04:00
Peter Fogg
52bf82ac17 Set Youtube ID defaults to the empty string. 2013-06-12 11:29:14 -04:00
Jean Manuel Nater
a25a0d71ac refactored tests in courseware to draw course info from mongo instead of xmlmodulestore 2013-06-12 10:42:52 -04:00
Peter Fogg
008c769ffb Update and fix acceptance to show captions when correct. 2013-06-12 10:27:05 -04:00
Calen Pennington
eccf800f47 Ignore files that don't exist when we try and delete them while compiling xmodule assets 2013-06-12 09:02:44 -04:00
Ned Batchelder
413202e7d6 Merged ned/whitelistable-sandbox 2013-06-11 16:49:45 -04:00
Peter Fogg
1ff72e0bae Convert show_captions to StringyBoolean. 2013-06-11 16:14:52 -04:00
Peter Fogg
94ac7fba31 Prevent showing video speeds that aren't set by course author. 2013-06-11 16:12:58 -04:00
Peter Fogg
872bf71c37 Remove data attribute from templates/video/default.yaml. 2013-06-11 15:53:50 -04:00
Peter Fogg
716da9c6bc Convert Floats to StringyFloats. 2013-06-11 15:38:02 -04:00
Peter Fogg
dbb127599f Merge peter-fogg/fix-video-captions-setting. 2013-06-11 15:11:14 -04:00
JonahStanley
81b06d5c70 Added tests for static pages
Also added in drag and drop helper.  Please be careful using this method as it is truly a hack to obtain the visual effects.  As of this commit, selenium does not support drag and drop for jQuery sortable items
2013-06-11 14:34:18 -04:00
Peter Fogg
fc6f0606c2 0;95;cRemove unnecessary boolean conversion. 2013-06-11 14:33:28 -04:00
Don Mitchell
64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv
Feature/dhm/timeconv
2013-06-11 11:11:05 -07:00
Peter Fogg
8543043f86 Make video captions respect course author's setting. 2013-06-11 13:39:15 -04:00
caesar2164
646e2bd486 Merge pull request #93 from edx/giulio/accessibility
A number of important accessibility changes
2013-06-11 08:38:53 -07:00
Peter Fogg
5b9e88e2db Enable exporting video to XML for backwards compatibility. 2013-06-11 11:37:00 -04:00
Peter Fogg
f9b825fe8b Fix failing acceptance tests and allow videos to be imported from XML. 2013-06-11 09:27:02 -04:00
JonahStanley
b7674679d9 Tests now use their own contentstore database
test.py was changed such that the database being used is test_xcontent
course_helpers.clear_courses now calls contentstore().fs_files.drop() such that all content is removed and the databse is started afresh in the same manner as the modulestore
2013-06-11 09:18:16 -04:00
Brian Talbot
47f91e79c4 adds in status for overall problem status indicator and replicates needed correctness django logic to show individual choice status 2013-06-10 16:22:20 -07:00
Brian Talbot
d778f2e9b9 updates jasmine tests to correspond to new capa template HTML 2013-06-10 16:22:20 -07:00
Brian Talbot
a377f86095 adds in aria attributes and semantic status content for vsepr input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
628b741742 adds in aria attributes and semantic status content for schematic input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
9552be6f19 adds in aria attributes and semantic status content for option input problems 2013-06-10 16:22:19 -07:00
Brian Talbot
2b08db57f0 adds in aria attributes and semantic status content for designprotein2d problems 2013-06-10 16:22:18 -07:00
Brian Talbot
04acd8790f adds in aria attributes and semantic status content for matlab problems 2013-06-10 16:22:18 -07:00
Brian Talbot
dba0eb78d3 adds in aria attributes and semantic status content for js-text input problems 2013-06-10 16:22:18 -07:00
Brian Talbot
d1ca8dc2bb adds in aria attributes and semantic status content for image input problems 2013-06-10 16:22:17 -07:00
Brian Talbot
cb78863984 adds in aria attributes and semantic status content for editamolecule problems 2013-06-10 16:22:17 -07:00
Brian Talbot
7ac75eae85 adds in aria attributes and semantic status content for editagene problems 2013-06-10 16:22:17 -07:00
Brian Talbot
254436aad1 adds in aria attributes and semantic status content for drag and drop problems 2013-06-10 16:22:16 -07:00
Brian Talbot
2c91f933e9 adds in aria attributes and semantic status content for crystallography problems 2013-06-10 16:22:16 -07:00
Brian Talbot
31a08bf42f adds in aria attributes and semantic status content for code input problems 2013-06-10 16:22:16 -07:00
Brian Talbot
a84dab0feb adds in aria attributes and semantic status content for choicegroup problems 2013-06-10 16:22:16 -07:00
Brian Talbot
832e05341b adds in aria attributes and semantic status content for chem eq problems 2013-06-10 16:22:15 -07:00
Brian Talbot
f4ef603d73 adds in aria attributes and semantic status content for annotation problems 2013-06-10 16:22:15 -07:00
Brian Talbot
4706b83a2b adds in aria attributes and semantic status content for textline problems 2013-06-10 16:22:15 -07:00