Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,902 Commits 1 Branch 0 Tags
27d006735cc57ad9cbb58cd7df026bfbe4fd75e0
Commit Graph

17902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
chrisndodge
2cdd005f71 Merge pull request #1037 from edx/rc/2013-09-18 
Rc/2013 09 18
 2013-09-18 08:18:42 -07: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
chrisndodge
71a5df7268 Merge pull request #1034 from edx/hotfix/lti_typo 
Hotfix/lti typo
 2013-09-18 06:52:43 -07:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07:00
Calen Pennington
cffd07abcb Merge pull request #946 from cpennington/add-rb-inotify 
Add rb-inotify dependency
 2013-09-18 05:42:22 -07:00
Calen Pennington
2103c4b70e Merge pull request #1 from singingwolfboy/add-rb-inotify 
Indicate that rb-inotify and rb-fsevent aren't actually necessary
 2013-09-18 05:41:56 -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
caesar2164
f8a49edd6a Merge pull request #980 from edx/giulio/ORA-fixes 
A few OE UI fixes
 2013-09-17 17:32:09 -07: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
Brian Talbot
c0fec1b211 Merge pull request #1006 from edx/talbs/lms-sassplaceholders 
LMS/Accounts: Switch class-based Sass @extend rules to use Sass placeholder syntax
 2013-09-17 13:11:41 -07:00
Brian Talbot
da7127e7ef LMS/Accounts: Converts many class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-17 16:11:26 -04:00
Brian Talbot
407b3a4f0c Merge pull request #981 from edx/talbs/fix-lms-loremipsum 
LMS: FIX - Removes unused/placeholder copy
 2013-09-17 13:10:31 -07:00
Brian Talbot
a6e92cda62 LMS: removes placeholder copy (lorem ipsum) that was never used or never replaced if cases are in use 2013-09-17 16:10:24 -04:00
Christina Roberts
042aaf94e8 Merge pull request #1030 from edx/christina/textbook-cleanup 
Minor cleanup.
 2013-09-17 11:53:23 -07:00
cahrens
e65e9b53a3 Minor cleanup. 2013-09-17 14:40:15 -04:00
chrisndodge
4ad0d8e93e Merge pull request #1027 from edx/fix/frances/sass-placeholder-fixes 
a few missed placeholder conversions in verification sass
 2013-09-17 11:14:58 -07:00
Frances Botsford
56a808c7ae a few missed placeholder conversions in verification sass 2013-09-17 13:57:13 -04:00
chrisndodge
3784a19665 Merge pull request #1022 from edx/zoldak/acceptance-element-handling 
Improve retry logic for Stale Element Exceptions
 2013-09-17 10:48:04 -07:00
chrisndodge
ea75fb438c Merge pull request #1026 from edx/talbs/fix-sassextends 
LMS: resolves direct class name references to extends that have been con...
 2013-09-17 10:47:24 -07:00
chrisndodge
366d279670 Merge pull request #1023 from edx/christina/readme 
Update changelong for due_date_display_format.
 2013-09-17 10:43:32 -07:00
cahrens
6513ded95a Update changelong for due_date_display_format. 2013-09-17 12:55:33 -04:00
Jay Zoldak
c3a957b4d2 Improve retry logic for Stale Element Exceptions 
Better exception retry logic

Change methods to lambdas
 2013-09-17 12:53:19 -04:00
Jay Zoldak
3717df2081 Merge pull request #1020 from edx/zoldak/acceptance-exception-handling 
Zoldak/acceptance exception handling
 2013-09-17 09:51:12 -07:00
Jay Zoldak
fe71ace529 Improve retry logic for Stale Element Exceptions 
Better exception retry logic

Change methods to lambdas
 2013-09-17 12:49:46 -04:00
Jason Bau
cd3063f67d Update CHANGELOG.rst 2013-09-17 08:55:44 -07:00
Jason Bau
41b6b4fc9a Update CHANGELOG.rst 2013-09-17 08:55:30 -07:00
Greg Price
15f620d37d Merge pull request #1003 from edx/gprice/fix-user-profile-links 
Fix a bug in links on forum user profile pages
 2013-09-17 08:26:39 -07:00
chrisndodge
d3dc9d27a8 Merge pull request #1017 from edx/fix/cdodge/parse-start-stop-times 
in XML deserializations, we can get get floats for start/stop times, so ...
 2013-09-17 08:09:51 -07:00
Diana Huang
d191847ff5 Merge branch 'release' 
Conflicts:
	lms/static/sass/views/_verification.scss
 2013-09-17 10:55:22 -04:00
Diana Huang
59c2898e8b Merge pull request #1015 from edx/ormsbee/audit_enroll 
Make sure audit enrollments are really marked audit.
 2013-09-17 07:43:31 -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
Brian Talbot
f965b15845 LMS: resolves direct class name references to extends that have been converted to placeholder Sass syntax 2013-09-17 10:32:43 -04:00
Greg Price
9e4b24daa2 Merge pull request #924 from edx/gprice/fix-forum-sidebar-overlap 
Fix forums nav sidebar overlapping content
 2013-09-17 07:22:40 -07:00
David Ormsbee
135f7e3b80 Make sure audit enrollments are really marked audit. 2013-09-17 10:16:22 -04:00