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

17866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
chrisndodge
0601761d27 Merge pull request #1000 from edx/fix/cdodge/courseware-index-perf-tweek 
Fix/cdodge/courseware index perf tweek
 2013-09-17 06:50:33 -07:00
Chris Dodge
1a5edcd998 we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB 
fix line indents
 2013-09-17 08:15:00 -04:00
Sef Kloninger
45d24b9961 Merge pull request #1011 from edx/jbau/apache-wsgi-fix 
apache lms wsgi fix
 2013-09-16 22:04:37 -07:00
Jason Bau
36085a692d apache lms wsgi fix 2013-09-16 21:46:57 -07:00
Jason Bau
1742f445e0 Merge pull request #1009 from edx/jbau/revert/recent-ora-fixes 
Revert "4 OE/ORA UI fixes to make it easier to use"
 2013-09-16 21:45:56 -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
Jay Zoldak
cbbfc41cb0 Merge pull request #995 from edx/zoldak/fix-acceptance 
Simplify retry logic for ui helper functions
 2013-09-16 14:30:58 -07:00
Brian Talbot
259d3124c0 Merge pull request #990 from edx/talbs/verification-sassplaceholders 
Verification: Switch class-based Sass @extend rules to use Sass placeholder syntax
 2013-09-16 13:50:48 -07:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Jay Zoldak
50f190c55d Merge pull request #1004 from edx/zoldak/skip-cert-tests 
Skip verified cert acceptance tests that upload to s3
 2013-09-16 13:46:26 -07:00
Brian Talbot
c101465fe9 Verification: converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-16 16:18:51 -04:00
Jay Zoldak
6531918af5 Skip verified cert acceptance tests that upload to s3 2013-09-16 16:11:21 -04:00
Greg Price
6296e2dc19 Fix a bug in links on forum user profile pages 
Previously, if a course id contained a '-' character, links from that
page to threads would lead to 404s.
 2013-09-16 15:32:56 -04:00
Diana Huang
cf8b7c6e92 Merge pull request #996 from edx/hotfix-2013-09-16 
Hotfix 2013-09-16
 2013-09-16 12:27:40 -07:00
David Ormsbee
b7836c94d4 Merge pull request #999 from edx/ormsbee/ssl_checking_for_ss 
Handle self-signed cert from Software Secure
 2013-09-16 11:39:46 -07:00
David Ormsbee
4245c229d8 Don't verify SSL cert when submitting to Software Secure (they're using self-signed cert for the moment). 2013-09-16 14:21:03 -04:00
caesar2164
54f103dd45 Merge pull request #993 from edx/giulio/ORA-fixes-squash 
4 OE/ORA UI fixes to make it easier to use
 2013-09-16 11:14:42 -07:00
Brian Talbot
ff492697a9 Merge pull request #998 from edx/talbs/verification-copytweaks 
Verification: Copy/Light UI Pre-Launch Edits
 2013-09-16 11:13:50 -07:00
Brian Talbot
e1d62cb395 Verification: further revises copy per edits/typos noted 2013-09-16 14:13:14 -04:00
Brian Talbot
d600e437d6 Verification: hiding technical help copy when on requirements/prep view 2013-09-16 13:36:03 -04:00
Brian Talbot
c1134acf05 Verification: revises copy and layout of the review step's confirm/next actions UI 2013-09-16 13:36:03 -04:00