Skip to content

Commit

Permalink
Merge branch 'hotfix/5.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@miesgre
miesgre committed Mar 28, 2018
2 parents 40b3df4 + e378f14 commit 3a519b1
Show file tree
Hide file tree
Showing 6 changed files with 295 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ script:


before_deploy:
- export PRERELEASE=$(sh ./.publish_scripts/is_prerelease_version.sh ${TRAVIS_TAG})
- export PRERELEASE=$(bash ./.publish_scripts/is_prerelease_version.sh ${TRAVIS_TAG})


deploy:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CHANGELOG
=========

* Paella 5.3.2

* Bug fixed in paella.MessageBox
* Bug fixed in travis scripts
* Added Matomo (org.opencast.usertracking.MatomoSaverPlugIn) plugin (thanks to @rrolf)

* Paella 5.3.1

* Bug fixed in captions load
Expand Down
271 changes: 139 additions & 132 deletions config/config.json
View file
Original file line number Diff line number Diff line change
@@ -1,149 +1,156 @@
{
"player":{
"accessControlClass":"paella.AccessControl",
"player":{
"accessControlClass":"paella.AccessControl",
"profileFrameStrategy": "paella.ProfileFrameStrategy",
"videoQualityStrategy": "paella.LimitedBestFitVideoQualityStrategy",
"videoQualityStrategyParams":{ "maxAutoQualityRes":720 },
"reloadOnFullscreen": true,
"videoZoom": {
"enabled":true,
"max":800,
"minWindowSize":500
},
"videoQualityStrategy": "paella.LimitedBestFitVideoQualityStrategy",
"videoQualityStrategyParams":{ "maxAutoQualityRes":720 },
"reloadOnFullscreen": true,
"videoZoom": {
"enabled":true,
"max":800,
"minWindowSize":500
},

"deprecated-methods":[{"name":"streaming","enabled":true},
{"name":"html","enabled":true},
{"name":"flash","enabled":true},
"deprecated-methods":[{"name":"streaming","enabled":true},
{"name":"html","enabled":true},
{"name":"flash","enabled":true},
{"name":"image","enabled":true}],

"methods":[
{ "factory":"ChromaVideoFactory", "enabled":true },
{ "factory":"WebmVideoFactory", "enabled":true },
{ "factory":"Html5VideoFactory", "enabled":true },
{ "factory":"MpegDashVideoFactory", "enabled":true },
{ "factory":"HLSVideoFactory", "enabled":true },
{ "factory":"RTMPVideoFactory", "enabled":true },
{ "factory":"ImageVideoFactory", "enabled":true },
{ "factory":"YoutubeVideoFactory", "enabled":true },
{ "factory":"Video360ThetaFactory", "enabled":true },
{ "factory":"Video360Factory", "enabled":true }
],
"audioMethods":[
{ "factory":"MultiformatAudioFactory", "enabled":true }
],
"methods":[
{ "factory":"ChromaVideoFactory", "enabled":true },
{ "factory":"WebmVideoFactory", "enabled":true },
{ "factory":"Html5VideoFactory", "enabled":true },
{ "factory":"MpegDashVideoFactory", "enabled":true },
{ "factory":"HLSVideoFactory", "enabled":true },
{ "factory":"RTMPVideoFactory", "enabled":true },
{ "factory":"ImageVideoFactory", "enabled":true },
{ "factory":"YoutubeVideoFactory", "enabled":true },
{ "factory":"Video360ThetaFactory", "enabled":true },
{ "factory":"Video360Factory", "enabled":true }
],
"audioMethods":[
{ "factory":"MultiformatAudioFactory", "enabled":true }
],
"rtmpSettings":{
"bufferTime":5,
"requiresSubscription": false
"requiresSubscription": false
},
"slidesMarks":{
"enabled":true,
"color":"gray"
}
},
"defaultProfile":"slide_professor",
"data":{
"enabled":true,
"dataDelegates":{
"trimming":"CookieDataDelegate",
"visualAnnotations": "VisualAnnotationsDataDelegate",
"metadata":"VideoManifestMetadataDataDelegate",
"cameraTrack":"TrackCameraDataDelegate"
}
},
"folders": {
"profiles": "config/profiles",
"resources": "resources",
"skins": "resources/style"
},
"experimental":{
"autoplay":true
},
"plugins":{
"enablePluginsByDefault": false,
"slidesMarks":{
"enabled":true,
"color":"gray"
}
},
"defaultProfile":"slide_professor",
"data":{
"enabled":true,
"dataDelegates":{
"trimming":"CookieDataDelegate",
"visualAnnotations": "VisualAnnotationsDataDelegate",
"metadata":"VideoManifestMetadataDataDelegate",
"cameraTrack":"TrackCameraDataDelegate"
}
},
"folders": {
"profiles": "config/profiles",
"resources": "resources",
"skins": "resources/style"
},
"experimental":{
"autoplay":true
},
"plugins":{
"enablePluginsByDefault": false,

"//**** Instructions: Disable any individual plugin by setting its enable property to false": {"enabled": false},
"//**** For a list of available plugins and configuration, go to": "https://github.com/polimediaupv/paella/blob/master/doc/plugins.md",
"list":{
"//****": "Button Plugins",
"edu.harvard.dce.paella.flexSkipPlugin": {"enabled":true, "direction": "Rewind", "seconds": 10},
"edu.harvard.dce.paella.flexSkipForwardPlugin": {"enabled":true, "direction": "Forward", "seconds": 30},
"es.upv.paella.captionsPlugin": {"enabled":true, "searchOnCaptions":true},
"es.upv.paella.extendedTabAdapterPlugin": {"enabled":true},
"es.upv.paella.footprintsPlugin": {"enabled":false},
"es.upv.paella.frameControlPlugin": {"enabled": true, "showFullPreview": "auto"},
"es.upv.paella.fullScreenButtonPlugin": {"enabled":true, "reloadOnFullscreen":{ "enabled":true, "keepUserSelection":true }},
"es.upv.paella.helpPlugin": {"enabled":true, "langs":["en","es"]},
"es.upv.paella.multipleQualitiesPlugin": {"enabled":true, "showWidthRes":true},
"es.upv.paella.playbackRatePlugin": {"enabled":true, "availableRates": [0.75, 1, 1.25, 1.5]},
"es.upv.paella.playPauseButtonPlugin": {"enabled":true},
"es.upv.paella.searchPlugin": {"enabled":true, "sortType":"time", "colorSearch":false},
"es.upv.paella.socialPlugin": {"enabled":true},
"es.upv.paella.themeChooserPlugin": {"enabled":true},
"es.upv.paella.viewModePlugin": { "enabled": true },
"es.upv.paella.volumeRangePlugin":{"enabled":true, "showMasterVolume": true, "showSlaveVolume": false },
"es.upv.paella.pipModePlugin": { "enabled":true },
"es.upv.paella.ratePlugin": { "enabled":true },
"es.upv.paella.videoZoomPlugin": { "enabled":true },
"es.upv.paella.audioLanguage": { "enabled":true },
"es.upv.paella.videoZoomToolbarPlugin": { "enabled":false, "targetStreamIndex":0 },
"es.upv.paella.videoZoomTrack4kPlugin": { "enabled":true, "targetStreamIndex":0, "autoModeByDefault":false },
"es.upv.paella.airPlayPlugin": { "enabled":true },
"//**** Instructions: Disable any individual plugin by setting its enable property to false": {"enabled": false},
"//**** For a list of available plugins and configuration, go to": "https://github.com/polimediaupv/paella/blob/master/doc/plugins.md",
"list":{
"//****": "Button Plugins",
"edu.harvard.dce.paella.flexSkipPlugin": {"enabled":true, "direction": "Rewind", "seconds": 10},
"edu.harvard.dce.paella.flexSkipForwardPlugin": {"enabled":true, "direction": "Forward", "seconds": 30},
"es.upv.paella.captionsPlugin": {"enabled":true, "searchOnCaptions":true},
"es.upv.paella.extendedTabAdapterPlugin": {"enabled":true},
"es.upv.paella.footprintsPlugin": {"enabled":false},
"es.upv.paella.frameControlPlugin": {"enabled": true, "showFullPreview": "auto"},
"es.upv.paella.fullScreenButtonPlugin": {"enabled":true, "reloadOnFullscreen":{ "enabled":true, "keepUserSelection":true }},
"es.upv.paella.helpPlugin": {"enabled":true, "langs":["en","es"]},
"es.upv.paella.multipleQualitiesPlugin": {"enabled":true, "showWidthRes":true},
"es.upv.paella.playbackRatePlugin": {"enabled":true, "availableRates": [0.75, 1, 1.25, 1.5]},
"es.upv.paella.playPauseButtonPlugin": {"enabled":true},
"es.upv.paella.searchPlugin": {"enabled":true, "sortType":"time", "colorSearch":false},
"es.upv.paella.socialPlugin": {"enabled":true},
"es.upv.paella.themeChooserPlugin": {"enabled":true},
"es.upv.paella.viewModePlugin": { "enabled": true },
"es.upv.paella.volumeRangePlugin":{"enabled":true, "showMasterVolume": true, "showSlaveVolume": false },
"es.upv.paella.pipModePlugin": { "enabled":true },
"es.upv.paella.ratePlugin": { "enabled":true },
"es.upv.paella.videoZoomPlugin": { "enabled":true },
"es.upv.paella.audioLanguage": { "enabled":true },
"es.upv.paella.videoZoomToolbarPlugin": { "enabled":false, "targetStreamIndex":0 },
"es.upv.paella.videoZoomTrack4kPlugin": { "enabled":true, "targetStreamIndex":0, "autoModeByDefault":false },
"es.upv.paella.airPlayPlugin": { "enabled":true },

"//****": "Video Overlay Button Plugins",
"es.upv.paella.liveStreamingIndicatorPlugin": { "enabled": true },
"es.upv.paella.showEditorPlugin":{"enabled":true,"alwaysVisible":true},
"es.upv.paella.arrowSlidesNavigatorPlugin": {"enabled": true, "showArrowsIn": "slave"},
"es.upv.paella.videoDataPlugin": {
"enabled": true,
"excludeLocations":[
"paellaplayer.upv.es"
],
"excludeParentLocations":[
"localhost:8000"
]
},
"//****": "Video Overlay Button Plugins",
"es.upv.paella.liveStreamingIndicatorPlugin": { "enabled": true },
"es.upv.paella.showEditorPlugin":{"enabled":true,"alwaysVisible":true},
"es.upv.paella.arrowSlidesNavigatorPlugin": {"enabled": true, "showArrowsIn": "slave"},
"es.upv.paella.videoDataPlugin": {
"enabled": true,
"excludeLocations":[
"paellaplayer.upv.es"
],
"excludeParentLocations":[
"localhost:8000"
]
},

"//****": "TabBar Plugins",
"es.upv.paella.commentsPlugin": {"enabled": false},
"es.upv.paella.test.tabBarExamplePlugin": {"enabled": false},
"//****": "TabBar Plugins",
"es.upv.paella.commentsPlugin": {"enabled": false},
"es.upv.paella.test.tabBarExamplePlugin": {"enabled": false},

"//****": "Event Driven Plugins",
"es.upv.paella.blackBoardPlugin": {"enabled": true},
"es.upv.paella.breaksPlayerPlugin": {"enabled": true},
"es.upv.paella.overlayCaptionsPlugin": {"enabled": true},
"es.upv.paella.playButtonOnScreenPlugin": {"enabled":true},
"es.upv.paella.test.videoLoadPlugin": {"enabled":false},
"es.upv.paella.translecture.captionsPlugin": {"enabled":true},
"es.upv.paella.trimmingPlayerPlugin": {"enabled":true},
"es.upv.paella.zoomPlugin": {"enabled": false},
"es.upv.paella.windowTitlePlugin": {"enabled": true},
"es.upv.paella.track4kPlugin": { "enabled":true },

"//****": "Captions Parser Plugins",
"es.upv.paella.captions.DFXPParserPlugin": {"enabled":true},
"es.teltek.paella.captions.WebVTTParserPlugin": {"enabled":true},
"//****": "Event Driven Plugins",
"es.upv.paella.blackBoardPlugin": {"enabled": true},
"es.upv.paella.breaksPlayerPlugin": {"enabled": true},
"es.upv.paella.overlayCaptionsPlugin": {"enabled": true},
"es.upv.paella.playButtonOnScreenPlugin": {"enabled":true},
"es.upv.paella.test.videoLoadPlugin": {"enabled":false},
"es.upv.paella.translecture.captionsPlugin": {"enabled":true},
"es.upv.paella.trimmingPlayerPlugin": {"enabled":true},
"es.upv.paella.zoomPlugin": {"enabled": false},
"es.upv.paella.windowTitlePlugin": {"enabled": true},
"es.upv.paella.track4kPlugin": { "enabled":true },

"//****": "Search Service Plugins",
"es.upv.paella.search.captionsSearchPlugin": {"enabled":true},
"es.upv.paella.frameCaptionsSearchPlugin": {"enabled":true},
"//****": "Captions Parser Plugins",
"es.upv.paella.captions.DFXPParserPlugin": {"enabled":true},
"es.teltek.paella.captions.WebVTTParserPlugin": {"enabled":true},

"//****": "User Tracking Saver Plugins",
"es.upv.paella.usertracking.elasticsearchSaverPlugin": { "enabled": false, "url": "http://my.elastic.server"},
"es.upv.paella.usertracking.GoogleAnalyticsSaverPlugIn": { "enabled": false, "trackingID": "UA-XXXXXXXX-Y" },
"es.upv.paella.usertracking.piwikSaverPlugIn": { "enabled": false, "tracker":"//tracker.server.com", "siteId": "1" },
"es.teltek.paella.usertracking.xAPISaverPlugin": {"enabled": false, "endpoint":"http://localhost:8081/data/xAPI/", "auth":"auth_key"}

}
},
"//****": "Search Service Plugins",
"es.upv.paella.search.captionsSearchPlugin": {"enabled":true},
"es.upv.paella.frameCaptionsSearchPlugin": {"enabled":true},

"//****": "User Tracking Saver Plugins",
"es.upv.paella.usertracking.elasticsearchSaverPlugin": { "enabled": false, "url": "http://my.elastic.server"},
"es.upv.paella.usertracking.GoogleAnalyticsSaverPlugIn": { "enabled": false, "trackingID": "UA-XXXXXXXX-Y" },
"es.upv.paella.usertracking.piwikSaverPlugIn": { "enabled": false, "tracker":"http://localhost/piwik/", "siteId": "1" },
"org.opencast.usertracking.MatomoSaverPlugIn": {
"enabled": false,
"server": "http://localhost/piwik/",
"site_id": 1,
"heartbeat": 30,
"client_id": "Paella Player"
},
"es.teltek.paella.usertracking.xAPISaverPlugin": {"enabled": false, "endpoint":"http://localhost:8081/data/xAPI/", "auth":"auth_key"}

}
},
"standalone" : {
"repository": "../repository/"
},
"skin": {
"available": [
"dark",
"dark_small",
"light",
"light_small"
]
}
},
"skin": {
"available": [
"dark",
"dark_small",
"light",
"light_small"
]
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paellaplayer",
"version": "5.3.1",
"version": "5.3.2",
"description": "Paella Player",
"license": "ECL-2.0",
"repository": {
Expand Down
Loading

0 comments on commit 3a519b1

Please sign in to comment.