Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,044 Commits 1 Branch 0 Tags
a4ee129f04171dde5fb7264ded1e91bc1c7e47ac
Commit Graph

4842 Commits

Author SHA1 Message Date
Don Mitchell
a4ee129f04 Merge pull request #1095 from edx/dhm/asset_bug 
Fixed missing read (cut/paste f'up)
 2013-09-23 12:17:56 -07:00
Calen Pennington
63b841bca9 Merge pull request #1062 from cpennington/speed-up-location-creation 
Speed up Location creation returning existing locations where possible
 2013-09-23 11:55:36 -07:00
Calen Pennington
25ea91ed4a Merge pull request #1061 from cpennington/faster-location-urls 
Turn Locations into dicts less often
 2013-09-23 11:55:00 -07:00
Don Mitchell
3daeb59aca Fixed missing read (cut/paste f'up) 2013-09-23 14:09:58 -04:00
Calen Pennington
cfa2b27f26 Turn Locations into dicts less often 2013-09-23 13:46:48 -04:00
Jason Bau
7c1a3e1ea1 wording changes for setting help 2013-09-20 14:23:05 -07:00
Jason Bau
9c4ff9ba95 Add setting on combinedopenended to allow peergrading of finished submissions 2013-09-20 14:23:05 -07:00
Vik Paruchuri
57fb306c74 Merge pull request #1068 from edx/feature/vik/oe-save 
Implement a save button for open ended responses
 2013-09-20 14:16:32 -07:00
Brian Talbot
936d2e0ffe Merge pull request #1047 from edx/talbs/lms-tablesupport 
Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays
 2013-09-20 14:01:03 -07:00
Vik Paruchuri
d9ce5e073b Implement a save button for open ended responses 2013-09-20 16:35:10 -04:00
Adam
065a1cf2bd Merge pull request #1078 from edx/adam/parse-xml-module 
don't remove comments from xml module
 2013-09-20 11:28:46 -07:00
Don Mitchell
464e0c77f4 Merge pull request #1045 from edx/assets/persist_lock 
save lock state in contentstore
 2013-09-20 10:51:31 -07:00
Vik Paruchuri
c3a155da93 Merge pull request #1064 from edx/fix/vik/pg-tests 
Add in peer grading tests to cover linking behavior
 2013-09-20 10:42:37 -07:00
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
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
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
polesye
78c9f7e398 Disable temporarily failed js unit tests. 2013-09-19 09:24:34 +03:00
Giulio Gratta
c90262ebcb Adding support for ICE track changes to calibration UI improvements 2013-09-18 12:52:20 -07: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
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