Commit graph

355 commits

Author SHA1 Message Date
jo
3e18d42c8b Rename airtime_mvc/ to legacy/ 2021-10-11 13:43:25 +02:00
Lucas Bickel
4c72403b9b fix(soundcloud): remove broken integration 2021-01-06 12:40:30 +00:00
Kyle Robbertze
7e19a28caf Expand out currentShowID conditional
Fixes: #875
2019-11-06 13:27:13 +02:00
Robbt
f7998848e8 moved brack per style request 2019-04-22 16:46:18 -04:00
Robbt
1e1ffb95ad Merge branch 'xabispacebiker-patch-1' of https://github.com/xabispacebiker/libretime into xabispacebiker-xabispacebiker-patch-1 2019-04-22 16:43:49 -04:00
Robbt
48a2a49b30 this fixes a count warning in null condition new with 7.2 2019-02-18 18:53:51 -05:00
Xabi Spacebiker
04886aad0a
Update Schedule.php
This small fix solved issue https://github.com/LibreTime/libretime/issues/741
2019-02-18 11:44:12 +01:00
Xabi Spacebiker
90e91b1a55 Update Schedule.php
Removing double slash from $uri, not the solution of permission issue but it won't hurt. 
getStationUrl will always return a slash at the end, so we do not need to add it again in line 1033
2017-09-28 11:21:35 +02:00
Robb Ebright
276a69aa1b Porting commits from downloaded zip file of saas-dev branch 2017-02-13 18:22:22 +01:00
Albert Santoni
4cfdda46b4 SAAS-1266: Webstream metadata doesn't show in API or dashboard header 2015-12-03 16:57:18 -05:00
Albert Santoni
6f185d094b SAAS-1095: Unknown schedule type: array 2015-09-29 11:49:53 -04:00
Albert Santoni
249d3b1d2d SAAS-1011: Files stored locally with incorrect file extensions won't play out 2015-08-11 09:33:29 -04:00
drigato
23fe12651f SAAS-838: Undefined variable previousMediaName 2015-08-05 09:48:31 -04:00
drigato
07f02260db Fix undefined index: nextMediaName 2015-07-17 09:57:24 -04:00
Duncan Sommerville
04290e28dc Fix error getting current schedule information if connected to master source 2015-06-29 14:25:00 -04:00
Duncan Sommerville
5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville
616cf143d5 SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Duncan Sommerville
ef957fe0aa SAAS-877 - Fix errors 2015-06-24 13:07:13 -04:00
Duncan Sommerville
fd8194e7d8 Fix error getting media 2015-06-24 12:40:51 -04:00
Duncan Sommerville
ffc3ef1bc9 SAAS-877 - Update live-info-v2 api 2015-06-24 12:31:32 -04:00
Duncan Sommerville
7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
drigato
b5e72d673f Next track in dashboard was wrong sometimes
Was not filtering by playout_status
2015-06-02 09:48:43 -04:00
drigato
182b12e0e3 SAAS-794: Schedule/get-current-playlist can take too long to respond
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
2015-05-28 09:47:58 -04:00
drigato
c85457ec0b SAAS-794: Schedule/get-current-playlist can take too long to respond
Fix for undefined variable
2015-05-22 10:53:29 -04:00
drigato
099537a1b7 SAAS-794: Schedule/get-current-playlist can take too long to respond
Renamed function
Removed old function
2015-05-22 09:47:55 -04:00
drigato
8b02002f5e Merge branch 'saas-dev' into saas-temp-testing 2015-05-22 08:56:43 -04:00
drigato
c9a6260cc0 SAAS-794: Schedule/get-current-playlist can take too long to respond
Removed commented code
2015-05-22 08:53:29 -04:00
drigato
5330859f00 SAAS-794: Schedule/get-current-playlist can take too long to respond
small fix
2015-05-22 08:51:32 -04:00
drigato
b80c102e99 SAAS-794: Schedule/get-current-playlist can take too long to respond
Fixes for webstreams
2015-05-22 08:09:59 -04:00
drigato
537fd2f148 SAAS-794 Schedule/get-current-playlist can take too long to respond
Replaced GetPrevCurrentNext function with new one that is much simpler
and less taxing on the database and web server.
2015-05-20 16:10:31 -04:00
drigato
4451c49c06 SAAS-772: Send metadata to Tunein
This is pretty much working except with master source metadata
2015-05-19 14:39:05 -04:00
Albert Santoni
c72cdbc19d More preventative coding for the player and fixed the live-info-v2 API 2015-04-29 12:17:44 -04:00
Albert Santoni
2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
drigato
e17b330186 Remove just previously added logging statements 2015-01-12 16:26:27 -05:00
drigato
c7c683966d Logging 2015-01-12 16:21:53 -05:00
drigato
7bdf34fcd1 Logging 2015-01-12 15:58:50 -05:00
drigato
89925e52ed Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
drigato
ec189fc27a SAAS-509: PYPO can't download files via the REST API 2014-12-08 15:33:02 -05:00
drigato
435c49da98 Changed PYPO's download URL scheme from https to http 2014-12-08 13:57:28 -05:00
drigato
80af25fdf4 Undoing last commit 2014-12-03 18:07:24 -05:00
drigato
963207e26f Trying the PYPO download URL without ssl 2014-12-03 18:01:08 -05:00
drigato
024150f023 SAAS-503: PYPO -> Use the REST API to download files
Fixed disabling  SSL verication
2014-12-03 14:50:58 -05:00
drigato
a1062e951f SAAS-503: PYPO -> Use the REST API to download files
Change download URL to use https
2014-12-03 14:03:21 -05:00
drigato
cf9eabbc74 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato
16dc286420 SAAS-503: PYPO -> Use the REST API to download files 2014-12-03 13:22:52 -05:00
drigato
e1f1807f5a SAAS-503: PYPO -> Use the REST API to download files
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
drigato
97b74a0997 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
drigato
c132cac43d Code cleanup 2014-11-12 14:42:34 -05:00
drigato
0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
drigato
b871b32175 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-30 12:17:34 -04:00