Commit Graph

6956 Commits

Author SHA1 Message Date
Vik Paruchuri
ecb6f0f944 Add in peer grading tests to cover linking behavior 2013-09-20 11:47:26 -04:00
Don Mitchell
7d13eb8f7d Add locked attribute to assets. 2013-09-20 11:28:00 -04:00
Don Mitchell
e69955b437 Pylint/pep8 fixes 2013-09-20 11:28:00 -04:00
jkarni
b580aa0f1f Merge pull request #1024 from edx/jkarni/fix/IOError
Catch IOError and ignore if OS X companion file
2013-09-20 08:22:51 -07:00
Brian Talbot
9661cde5c5 xmodule - Capa/HTML: adds top/bottom margin to table elements 2013-09-20 11:10:56 -04:00
Brian Talbot
7362e267d7 xmodule - Capa/HTML: adds in standard text-justification class names authors can use within table cells 2013-09-20 11:10:56 -04:00
Don Mitchell
b9a7c7f752 Create new structure allows override of usage id and category 2013-09-20 10:58:17 -04:00
jmclaus
66bd8127e6 Acceptance tests now pass 2013-09-20 14:04:58 +02:00
jmclaus
7af892e66a Disabled video autoplay for students 2013-09-20 14:04:57 +02:00
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings
Features/fmo/lms i18n strings
2013-09-19 12:05:35 -07:00
Don Mitchell
2c90dc73cd Don't access kvs directly but use x_module and field_data mechanisms 2013-09-19 14:45:06 -04:00
Felipe Montoya
92d1f232ed Adding to the problem template 2013-09-19 12:33:58 -05:00
Calen Pennington
0d0cb56501 Speed up Location creation returning existing locations where possible 2013-09-19 12:15:20 -04:00
Usman Khalid
59c5baeb1b Disables the previous/next arrows on pdf books on the first/last pages respectively 2013-09-19 20:50:05 +05:00
polesye
78c9f7e398 Disable temporarily failed js unit tests. 2013-09-19 09:24:34 +03:00
Jay Zoldak
bd06877109 Merge pull request #1046 from edx/zoldak/quiet-fast-acceptance
Zoldak/quiet fast acceptance
2013-09-18 13:37:30 -07:00
Giulio Gratta
c90262ebcb Adding support for ICE track changes to calibration UI improvements 2013-09-18 12:52:20 -07:00
Jay Zoldak
be51ee2c46 Speed up lms login 2013-09-18 15:51:31 -04:00
Jay Zoldak
9e368b8d9a Quiet the output of passing acceptance tests 2013-09-18 15:51:10 -04:00
Adam
343456e314 don't remove comments from xml module 2013-09-18 15:39:18 -04:00
Julian Arni
e26b1be3a4 Remove useless try-except clause 2013-09-18 15:28:19 -04:00
Julian Arni
0972f2207d Catch IOError and ignore if OS X companion file 2013-09-18 15:24:52 -04:00
Jay Zoldak
da538b8770 Merge pull request #1044 from edx/zoldak/acceptance-grid
Add ability to run against generic selenium grid
2013-09-18 12:07:21 -07:00
Calen Pennington
1d2e0b6615 Merge pull request #930 from cpennington/rename-xblock-field-data
Rename xblock_field_data to xmodule_field_data
2013-09-18 11:33:25 -07:00
Brian Talbot
8815962356 Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-18 14:14:11 -04:00
Jay Zoldak
4c411e2121 Add ability to run against generic selenium grid 2013-09-18 13:49:34 -04:00
jmclaus
7659c5b130 Removed unfocused class and set the captions default values of outline-width and outline-style to it. 2013-09-18 17:34:49 +02:00
jmclaus
752e1d8b4f Caption have unfocused class as default 2013-09-18 17:34:48 +02:00
jmclaus
497f324d8a Replaced mouseenter and mouseleave event handlers by mouseover and mouseout. The former were failing Jasmine tests. Since the captions are li elements without descendants, they are identical. 2013-09-18 17:34:48 +02:00
jmclaus
27d006735c Bug fixes, mainly in tests 2013-09-18 17:34:48 +02:00
jmclaus
2fb6c02ba1 Added tests for tabbing through captions 2013-09-18 17:34:48 +02:00
jmclaus
5ccf717db2 Moved css from js file to relevant scss file. 2013-09-18 17:34:48 +02:00
jmclaus
c541fb7bf4 Added comments 2013-09-18 17:34:48 +02:00
jmclaus
165a122766 Removed unnecessary event handler 2013-09-18 17:34:48 +02:00
jmclaus
cf69e35f11 Adressed pull request comments 2013-09-18 17:34:48 +02:00
jmclaus
b2ff98f044 Tabbing through captions is completely functional. 2013-09-18 17:34:48 +02:00
jmclaus
dcabccc1c5 Tabbing through captions works except for persistence of outline after mouse click 2013-09-18 17:34:48 +02:00
Chris Dodge
b6cde36db5 Merge branch 'release'
Conflicts:
	CHANGELOG.rst
2013-09-18 11:33:40 -04:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Valera Rozuvan
02d8b68a9c Merge pull request #911 from edx/valera/bugfix_access_to_hidden_controls
Valera/bugfix access to hidden controls
2013-09-18 07:44:17 -07:00
jkarni
0e2d833a2e Merge pull request #830 from edx/jkarni/fix/unicode-import
Fix import errors with unicode filenames
2013-09-18 07:23:43 -07:00
Valera Rozuvan
54bbfb390a Adding comments to Jasmine "Video FocusGrabber" tests. 2013-09-18 17:03:42 +03:00
Valera Rozuvan
d4343309f8 Fixing tests.
Turned off jQuery animations. Went through all of the XModule tests and
checked that all spying on window.setTimeout() function is done properly.
2013-09-18 16:58:47 +03:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime
Replace references to .system
2013-09-18 05:43:20 -07:00
Valera Rozuvan
dabef8562e Adding Jasmine tests.
Problem with hideControls not being called via setTimeout().
2013-09-18 15:08:03 +03:00
Valera Rozuvan
a14aa6bcc8 Fix typo. 2013-09-18 15:08:02 +03:00
Valera Rozuvan
0e850aff52 Completed main functionality. Ready for code review.
Now when controls are uatohidden and focus is on one of them, we
switch the focus to the mian Video element.

Code documented a bit.

When controls are autohidden, we make sure that speeds and volume
controls drop downs are closed.
2013-09-18 15:08:02 +03:00
Valera Rozuvan
28888bda5d Initial commit. 2013-09-18 15:08:02 +03:00
Alexander Kryklia
1d03f4aab2 Revert "reformat for readability"
This reverts commit acd23ad933.
2013-09-18 13:40:22 +03:00
Giulio Gratta
d4687aa6df 4 OE/ORA UI fixes to make it easier to use
- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
2013-09-17 16:13:36 -07:00