Commit Graph

5216 Commits

Author SHA1 Message Date
Julian Arni
0972f2207d Catch IOError and ignore if OS X companion file 2013-09-18 15:24:52 -04: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
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
Chris Dodge
5886118afe in XML deserializations, we can get get floats for start/stop times, so we need to be able to parse those
add test video with float-based end-time
2013-09-17 10:38:21 -04:00
Calen Pennington
5ec6cd85f2 Merge pull request #929 from cpennington/remove-get-sample-state
Remove unused XModuleDescriptor.get_sample_state method
2013-09-17 07:01:30 -07:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use"
This reverts commit 3b29d6056e.
2013-09-16 20:22:18 -07:00
ichuang
61d5c4efc5 Merge pull request #888 from edx/fix/ichuang/add-capital-greek-to-formulaequationinput
formulaequationinput: add capital greek letters and hbar to calc preview
2013-09-16 15:04:24 -07:00
ichuang
ab203fb649 hbar only add once 2013-09-16 17:37:56 -04:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
2013-09-16 10:27:13 -07:00
Will Daly
adabef7256 Disabled broken test in master. 2013-09-16 11:32:24 -04:00
jkarni
fb363fb90b Merge pull request #919 from edx/jkarni/fix/keep-comments
Make default parser keep comments
2013-09-16 07:26:44 -07:00
David Ormsbee
a2034c5bb9 Merge branch 'release' 2013-09-15 16:11:31 -04:00
Jason Bau
ac05b5c28e Merge pull request #956 from edx/giulio/ice-pr
Implementing NYT's ICE track changes to Open Ended Assessements
2013-09-15 10:11:34 -07:00
Giulio Gratta
fe59a8ce62 Implementing NYT's ICE track changes to Open Ended Assessements
Squashed commits to facilitate cherry-picking.  Committers and
original commit messages are:
- ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
* Refactor peer_grading_problem to lookup track_changes variable by problem location.
* Whitelist ICE insert, delete tags
* Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* Introduction ICE means we need its inline tags to get passed through
  to the feedback target, but we don't want malicious peer feedback
  providers introducing <script>, etc, so we use lxml.html.clean to
  scrub peer grading input.
* Adds feedback URL autoheating.
* Allows ICE <insert> and <delete> tags but not others.

~ add helptext re: EXPERIMENTAL FEATURES

~ address a bunch of @VikParuchuri review comments on ICE for OEE
  ~ remove extraneous code
  ~ change to new xmodule accessors
  ~ refactor filtering

~ fix broken test test_peer_grading_problem

~ Create track_changes.coffee and remove <script> from
  peer_grading_problem.html
~ Remove all reliance on id in favor of local scoping and classes

~ bring up test coverage somewhat

~ remove superflous $.scrollTo

~ TODO: Filtering
2013-09-15 09:49:28 -07:00
Vik Paruchuri
6e8c8a647c Remove due date setting 2013-09-15 12:34:46 -04:00
Calen Pennington
33f13846a5 Merge branch 'release' 2013-09-14 07:00:17 -04:00
Ned Batchelder
ed1a07382e Merge pull request #974 from edx/ned/keep-bson-in-mongo-code
keep-bson-in-mongo-code
2013-09-13 14:36:13 -07:00
Diana Huang
47ce9082e4 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
2013-09-13 17:15:44 -04:00
Calen Pennington
ce4c76ef37 Add mixins to XModuleDescriptors as they are loaded during xml parsing 2013-09-13 16:56:33 -04:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -04:00
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Ned Batchelder
37e81007d6 keep-bson-in-mongo-code 2013-09-13 14:29:56 -04:00
Vik Paruchuri
c6e5e67483 Fix linking problem for peer grading, add in a test
Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4 Address review comments 2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5 Fix problem with peer grading list not rendering, test 2013-09-13 11:07:22 -04:00
Valera Rozuvan
27015578f2 Removed an inclusion of t-copy-sub1 in SCSS.
This line was not doing anything and simply causing a warning while
SASS was compiling. The following is the warning:

---
WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static
/xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss:
".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header
.component-name" failed to @extend ".t-copy-sub1".

  The selector ".t-copy-sub1" was not found.
  Use "@extend .t-copy-sub1 !optional" if the extend should be able to
    fail.
---
2013-09-13 10:11:45 +03:00
Felipe Montoya
45a1e551f9 i18n: problem submit buttons. 2013-09-12 18:13:16 -05:00