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

17334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
4b9df2e998 Add datadog tracking for bulk email 2013-09-06 16:18:40 -04:00
David Baumgold
3b627e8c80 Merge pull request #879 from edx/db/remove-template-loader 
Remove Studio JS template loader
 2013-09-06 12:26:50 -07:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata 
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
 2013-09-06 11:58:36 -07:00
Calen Pennington
0cac1c3bee Merge pull request #881 from cpennington/dhm/editable_metadata 
Include mixins in advanced component class loading and preview modules
 2013-09-06 10:52:03 -07:00
Calen Pennington
38de05c76c Include mixins in advanced component class loading and preview modules 2013-09-06 13:37:03 -04:00
Vik Paruchuri
d3580994c8 Merge pull request #870 from edx/fix/vik/oe-nopath 
Fix nopathtoitem error
 2013-09-06 10:01:19 -07:00
Adam Palay
8fe38236d0 Merge branch 'release' after hotfix 5c39c79 2013-09-06 12:36:53 -04:00
Adam
12e82221e5 Merge pull request #877 from edx/hotfix/jsa/FOR-150 
update mitxmako lookup / fixes FOR-150
 2013-09-06 09:33:50 -07:00
Will Daly
99b47da2f4 Merge pull request #878 from edx/will/static-page-test-fix 
Updated static-pages test to add retry logic
 2013-09-06 09:22:46 -07:00
Will Daly
e20f2109d2 Updated static-pages test to add retry logic 2013-09-06 12:21:02 -04:00
Don Mitchell
0099ee0970 Clarify repr by naming 2013-09-06 12:19:51 -04:00
Don Mitchell
b81e5504db Fix pylint and typos 2013-09-06 12:19:51 -04:00
Don Mitchell
fc131fa841 Add InheritanceKVS and standardize inherited attr patterns 2013-09-06 12:19:50 -04:00
David Ormsbee
ed508f8400 Merge pull request #556 from edx/ormsbee/requirments_notice 
Dependency warning message on requirements files
 2013-09-06 08:35:36 -07:00
Vik Paruchuri
66655080f6 Log a warning if assumption about path is not correct. 2013-09-06 11:12:10 -04:00
chrisndodge
b92d88fcbc Merge pull request #401 from edx/feature/ichuang/cas-authentication 
Provide CAS authentication integration
 2013-09-06 07:36:28 -07:00
David Baumgold
bcef1994dd remove load_templates.html template 2013-09-06 10:24:27 -04:00
David Baumgold
d984311b2e Remove references to template loader JS library 2013-09-06 09:59:56 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
jsa
5c39c794c8 update mitxmako lookup / fixes FOR-150 2013-09-06 09:31:57 -04:00
David Baumgold
2c2668ca02 Removed template loader JS library 2013-09-06 09:21:55 -04: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
Vik Paruchuri
9e1813041a Fix nopathtoitem error 2013-09-05 14:16:28 -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