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

4196 Commits

Author SHA1 Message Date
Valera Rozuvan
b2c605a187 Addressing comments by Jean Michel for PR 867. 
Forgot to include local variables in var statement.
 2013-09-06 14:02:28 +03:00
Valera Rozuvan
8ffd16366f Fix for test. 
Must clear the state youtubeXhr variable before counting number
of ajax calls.
 2013-09-06 11:58:49 +03:00
Valera Rozuvan
545af7e854 Jasmine test to verify that only one check for YT is made. 
We test for the number of ajax calls made when there are 3
videos on the page.
 2013-09-06 11:58:49 +03:00
jmclaus
e1f75666fa Added test to verify that there is a certain order in the controls -- tabbing on the speed control will malfunction if it is not the case. 2013-09-06 09:22:33 +02:00
jmclaus
8e2c5bca7b Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button. 2013-09-06 09:22:33 +02:00
jmclaus
578e02b589 Speed button know behaves like the volume button when tabbing forward or backward. 2013-09-06 09:22:33 +02:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -04:00
Anton Stupak
5d55714cad Fix test. 2013-09-05 10:27:41 -04:00
Anton Stupak
961bd4c9cb Fix selector. 2013-09-05 10:27:29 -04:00
Anton Stupak
d93215c0b9 Fix test. 2013-09-05 17:02:53 +03:00
Anton Stupak
af6d0eb145 Fix selector. 2013-09-05 10:49:42 +03:00
Adam
ef042c39aa Merge pull request #853 from edx/fix/adam/pylint-pep8 
fix pep8 and pylint errors
 2013-09-03 14:22:11 -07:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Adam Palay
300f7f13a6 fix pep8 and pylint errors 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
 2013-09-03 14:55:11 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Peter Baratta
fe47dcb122 Acceptance tests for visual correctness reset feature 2013-08-30 17:24:33 -04:00
Peter Baratta
48cb05c037 Reset 'correctness' visual indicator of a problem on new input 
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
 2013-08-30 12:03:41 -04:00
Christina Roberts
d893e6d440 Merge pull request #827 from edx/christina/course-info-links3 
Rewriting of links for Course Updates and Course Handouts.
 2013-08-30 07:32:01 -07:00
Vik Paruchuri
df03b09136 Merge pull request #824 from edx/fix/vik/oe-progress 
Properly display student progress
 2013-08-29 14:39:11 -07:00
Vik Paruchuri
9b57ef0b54 Pep8 fixes 2013-08-29 17:28:14 -04:00
Vik Paruchuri
a06226aad6 Address review comments 2013-08-29 16:34:17 -04:00
Will Daly
fc5a24dfc0 Merge pull request #801 from edx/will/remove-test-network-calls 
Remove network calls in test suite
 2013-08-29 11:42:19 -07:00
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts. 
STUD-669.
 2013-08-29 14:35:16 -04:00
Vik Paruchuri
940a337dd3 Properly display student progress 2013-08-29 12:14:30 -04:00
Will Daly
23805ca52f Studio JS fixture files no longer need individual symlinks 2013-08-29 07:50:28 -04:00
Valera Rozuvan
0a110b672d Using native Jasmine-jQuery method to check for hidden el. 2013-08-28 17:23:42 +03:00
Valera Rozuvan
33fa1e2c7f Applying code changes as suggested by Anton. 
Fixed 2 failing Jasmine tests. Removed unnecessary console.log() call.
Initializing of variables in a single var statement.
 2013-08-28 17:15:52 +03:00
Valera Rozuvan
2a4f7f61c5 Remove caption panel when anything bad happens. 
Now the captions panel will be shown with captions only after successful
retrieval of captions.
 2013-08-28 17:01:02 +03:00
Valera Rozuvan
ba954ff164 Fixing code as per suggestions on PR 771. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
e788d6ce37 Added Jasmine test for bug fix. Updated comments. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
4936b5044b Fix for bug BLD-277 
"There is a white panel over a non-youtube video."
When the captions file is not specified, we simply do not render the captions panel.
 2013-08-28 17:01:02 +03:00
ichuang
d8345b4b39 fix course tabs from being imported with display_name=None due to overwriting policy 2013-08-27 19:39:40 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
chrisndodge
e3810b7576 Merge pull request #799 from edx/fix/ichuang/inheritance-needs-videosequence 
FIX: videosequence was not inheriting metadata, eg start date
 2013-08-27 13:07:58 -07:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Will Daly
88b28ae0b6 Merge pull request #808 from edx/will/randomize-cms-mongo-collections 
Use randomized mongo collection names in Studio tests
 2013-08-27 10:58:49 -07:00
Felix Sun
b5e1d57e28 Merge pull request #442 from edx/felix/formula-hints 
Crowdsourced Hints - "0.2 release"
 2013-08-27 10:26:25 -07:00
Will Daly
e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo 
collection names
 2013-08-27 12:57:14 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Vik Paruchuri
0e4b114278 Merge pull request #633 from edx/fix/vik/oe-state 
Fix/vik/oe state
 2013-08-27 07:01:32 -07:00
Felix Sun
444f51d6de Fixed some pep/pylint violations. 2013-08-27 09:46:02 -04:00
Will Daly
db6d76d643 Patched textbook TOC request during course import. 
Patched Snuggletex server calls
 2013-08-27 08:28:15 -04:00
Anton Stupak
dd9b16c2cf Replace the description in the studio editing module. 2013-08-27 15:22:47 +03:00
ichuang
83f8b033ea fix common/lib/xmodule/xmodule/modulestore/mongo/base.py 2013-08-26 20:23:11 -04:00
ichuang
4d73961a44 'videosequence' and 'proctor' need to be in inheritable moduletypes in 
modulestore/mongo/base.py
 2013-08-26 20:22:25 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Vik Paruchuri
3c55a44b6b Address review comments 2013-08-26 10:36:24 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
1f9eafeede Addressed some minor PR comments. 2013-08-26 09:40:06 -04:00