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

17312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chrisndodge
b92d88fcbc Merge pull request #401 from edx/feature/ichuang/cas-authentication 
Provide CAS authentication integration
 2013-09-06 07:36:28 -07:00
Jim Abramson
1b4f9c662c Merge pull request #874 from edx/bug/jsa/FOR-150 
update mitxmako lookup / fixes FOR-150
 2013-09-06 05:32:44 -07:00
Valera Rozuvan
441eb3699b Merge pull request #869 from edx/valera/video_js_console_log_useful_debug_info 
Adding debugging messages for Video player.
 2013-09-06 04:51:23 -07:00
Valera Rozuvan
bd4b4c16b8 Merge pull request #867 from edx/valera/video_single_yt_xhr_jasmine_test 
Valera/video single yt xhr jasmine test
 2013-09-06 04:49:31 -07:00
Valera Rozuvan
73a9c43ebb Addressing Anton's comments on PR 869. 
Removed extra check for console.log() existance. Modified error
messages. Formatted entire file to fit in 80 lines or less.

Formatting files so that they fit under 80 lines. Adding debug info for
what type of YouTube video player is being used. Also comment on whether
playbackRates is available for HTML5 mode.

Changed back Anton's original function _checkPlaybackRates(). Now logging for
this function's result is done only on error (in the function that is invoking)
it).
 2013-09-06 14:16:47 +03:00
Valera Rozuvan
20c16ec69e Adding debugging messages for Video player. 
For now outputting main flow of loading YouTube or non-YouTube videos.
 2013-09-06 14:16:46 +03:00
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
faf1f54824 Merge pull request #854 from edx/jmclaus/bugfix_tabbing_video_speed_control 
Speed button know behaves like the volume button when tabbing forward or...
 2013-09-06 01:07:52 -07: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
jsa
6e7965d26c update mitxmako lookup / fixes FOR-150 2013-09-05 23:23:52 -04:00
chrisndodge
9aa024b585 Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline 
Fix capa optioninput template to honor inline flag
 2013-09-05 15:51:30 -07:00
Christina Roberts
a78c913d5e Merge pull request #872 from edx/christina/about-page 
Don't show course about page link when we have the marketing site.
 2013-09-05 12:40:51 -07:00
Adam Palay
25ce1fe745 Merge branch 'release' 2013-09-05 14:56:25 -04:00
David Baumgold
d20359aa44 Merge pull request #634 from antoviaque/vagrant-provisioning-resume 
vagrant: Add flag to ensure install is completed at least once
 2013-09-05 11:41:32 -07:00
cahrens
4e67783644 Don't show course about page link when we have the marketing site. 
STUD-733
 2013-09-05 14:26:08 -04:00
chrisndodge
545d5770d5 Merge pull request #871 from edx/fix/cdodge/re-enable-enrollment-start-stop 
due to the MixedModuleStore pending release, we need to make enrollment ...
 2013-09-05 11:02:00 -07:00
Chris Dodge
4a12cb60c9 due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio 2013-09-05 12:43:24 -04:00
Xavier Antoviaque
0a5b68263e vagrant: Add flag to ensure install is completed at least once 
The provisioning script used to check for the existence of the
`/opt/edx/node_modules` folder to decide if the installation has already
been completed. However, since additional instructions were executed
by the installer afterwards, any installation error (eg. download
timeouts on low quality connections) happening between the creation of
that folder and the end of the installation wouldn't be recovered from
on the next vagrant instance boot.
 2013-09-05 13:10:48 -03: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
polesye
5658e6bc22 Merge pull request #868 from edx/hotfix/lose_header_bug 
Fix bug when editing video causes other components to lose their header
 2013-09-05 07:26:09 -07: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
ichuang
69f72989c5 consistently use inline=False as default in capa inputtypes 2013-09-04 23:13:05 -04:00
Jason Bau
08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel 
Add link in lms legacy instructor dashboard to cms course_index
 2013-09-04 13:03:21 -07:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms 
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
 2013-09-04 11:29:22 -07:00
Ned Batchelder
ac2b7a3ac1 Merge pull request #863 from edx/ned/fix-simple-things-because,-damn 
fix simple things because, damn
 2013-09-04 09:12:43 -07:00
Chris Dodge
0847bc5e2b pep8/pylint violations fixes 2013-09-04 11:34:35 -04:00
Sarina Canelake
577aeed35a Don't fetch the editor for XML courses 2013-09-04 11:31:52 -04:00
Ned Batchelder
3a5f718a32 fix simple things because, damn 2013-09-04 11:10:05 -04:00
ichuang
00710f75d2 add CAS authentication via django_cas and mods to external_auth 2013-09-04 10:56:45 -04:00
Adam Palay
fb84541bbe add nltk to sandbox reqs 2013-09-04 10:15:39 -04:00
Adam
0916957812 Merge pull request #861 from edx/fix/adam/add-edge-reqs 
add requests and nltk to sandbox reqs
 2013-09-04 07:14:59 -07:00
Adam Palay
6078f4c67e add nltk to sandbox reqs 2013-09-04 10:12:44 -04:00
Will Daly
b2b23fa9c5 Pass in harvest args to fasttest_acceptance, not the args array 2013-09-04 08:34:52 -04:00
Will Daly
75b588e018 Merge pull request #858 from edx/will/harvest-args-fix 
Pass in harvest args to fasttest_acceptance, not the args array
 2013-09-04 05:29:46 -07:00
Will Daly
9b1a5b49a7 Pass in harvest args to fasttest_acceptance, not the args array 2013-09-03 21:17:15 -04:00
Sarina Canelake
51fcb5247d Merge pull request #855 from edx/sarina/bulkemail-violations 
Cleanup bulk email app
 2013-09-03 14:25:36 -07: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
3cc793b01b Merge pull request #856 from edx/adam/merge-conflicts 
Adam/merge conflicts
 2013-09-03 14:20:15 -07:00
Sarina Canelake
bfebe684b3 Cleanup bulk email app 2013-09-03 16:11:34 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Adam
6787fbbf04 Merge pull request #851 from edx/hotfix/release-multiple-video-bug 
Hotfix/release multiple video bug
 2013-09-03 12:23:00 -07:00
Will Daly
e284ac682a Merge pull request #837 from edx/will/faster-acceptance-test-startup 
Skip migrations if running acceptance in fasttest mode
 2013-09-03 11:58:43 -07: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
Adam
c7a537e412 Merge pull request #848 from edx/fix/adam/add-edge-reqs 
Fix/adam/add edge reqs
 2013-09-03 09:53:21 -07:00