4752 Commits

Author	SHA1	Message	Date
drigato	532bd1ea85	SAAS-772: Send metadata to Tunein ... Made Improvement so Airtime always makes a request to TuneIn every 4 minutes so TuneIn does not turn metadata off	2015-05-25 15:37:45 -04:00
drigato	c67549d9c6	Merge branch 'saas-temp-testing' into saas-dev	2015-05-22 10:54:04 -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	94b949adaa	SAAS-772: Send metadata to Tunein ... Removed unused code	2015-05-22 10:35:36 -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
Albert Santoni	e86e1cb4ac	Merge branch 'saas-dev' into saas-speedy	2015-05-21 15:10:01 -04:00
Albert Santoni	2b8e40a12c	Merge branch 'saas' into saas-speedy	2015-05-21 15:09:57 -04:00
Duncan Sommerville	3052e1f23b	Changed Preferences and Stream Settings pages to use new-style csrf token generation	2015-05-21 10:17:05 -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	506b9cb248	Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev	2015-05-20 07:06:22 -04:00
drigato	e5a8f14a9a	Commented out request to tunein when station is offline	2015-05-20 07:05:26 -04:00
Albert Santoni	b8dd7f0df3	Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev	2015-05-19 16:21:16 -04:00
Albert Santoni	ae3fef383e	Removed station_domain from messages to airtime_analyzer, unused.	2015-05-19 16:20:51 -04:00
drigato	5b6a88f7fd	Fix bad merge that added soundcloud settings back into preferences page	2015-05-19 15:51:04 -04:00
drigato	a2a9e54553	Merge branch 'saas-dev' into saas-tunein ... Conflicts: airtime_mvc/application/views/scripts/form/preferences.phtml	2015-05-19 15:50:16 -04:00
drigato	2da4e264e5	SAAS-772: Send metadata to Tunein ... Update metadata when station goes offline	2015-05-19 15:42:07 -04:00
drigato	c3457ae03f	tunein testing	2015-05-19 15:19:09 -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	1c88d6dccd	Merge branch 'saas' into saas-dev	2015-05-19 12:18:54 -04:00
Albert Santoni	20649f73bd	Added missing translation for disk quota error message	2015-05-19 12:18:01 -04:00
drigato	b023f191e3	SAAS-772: Send metadata to Tunein ... Added form validation by making a test request to the TuneIn API with the user-entered values	2015-05-14 13:13:33 -04:00
Duncan Sommerville	70735e7bae	Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations	2015-05-14 10:51:53 -04:00
Duncan Sommerville	612aa37738	Merge branch 'saas' into saas-dev	2015-05-13 19:32:53 -04:00
Duncan Sommerville	bff04820f2	Add quiet flag to StoredFile delete to avoid unnecessary sentry errors when clearing library	2015-05-13 17:58:11 -04:00
Duncan Sommerville	9d822b6e8b	Only use API authentication (not session) when validating termination requests	2015-05-13 17:58:02 -04:00
drigato	cf24c141fd	SAAS-772: Send metadata to Tunein ... This is pretty much working for scheduled metadata - just to need to test with a TuneIn account.	2015-05-13 16:05:37 -04:00
Duncan Sommerville	15bebc6267	Dangerous options subform on Preferences page and Delete all tracks button	2015-05-13 15:56:08 -04:00
drigato	77241bb6fc	Merge branch '2.5.x' into saas	2015-05-11 14:57:58 -04:00
drigato	2953576921	CC-5997: Tracks get scheduled outside of the show start and end time	2015-05-11 14:57:20 -04:00
Albert Santoni	aee5615cd3	Merge branch 'saas' of github.com:sourcefabric/Airtime into saas	2015-05-11 14:34:40 -04:00
Albert Santoni	689a431867	Deprecated RabbitMQ::SendMessageToHaproxyConfigDaemon()	2015-05-11 14:34:21 -04:00
drigato	21886a509d	Merge branch '2.5.x' into saas	2015-05-11 12:18:09 -04:00
drigato	56e5e959ec	Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x	2015-05-11 12:16:55 -04:00
drigato	28997344fc	CC-5997: Tracks get scheduled outside of the show start and end time	2015-05-11 12:16:32 -04:00
Albert Santoni	3d99c423a9	Merge branch '2.5.x' into saas	2015-05-11 11:08:52 -04:00
Albert Santoni	efad7be91a	CC-5120: Can't add PLS webstreams	2015-05-11 11:08:43 -04:00
Duncan Sommerville	8b380086c3	Merge branch 'saas-dev' into saas-speedy	2015-05-04 13:09:51 -04:00
Duncan Sommerville	fc36ff5797	Updated user manual constant to new manual url	2015-04-30 14:51:35 -04:00
Duncan Sommerville	272bb11fcf	Fixed player displaying nothing (instead of Offline) when no show is scheduled	2015-04-30 14:36:33 -04:00
Duncan Sommerville	e78bd82c8c	SAAS-749, SAAS-753 - Fix for odd linked and repeating show behaviour	2015-04-30 14:14:56 -04:00
Duncan Sommerville	59b90360a1	SAAS-755 - Updated User Manual link	2015-04-30 11:52:23 -04:00
Albert Santoni	0418cdbc04	Nerf a player console.log call	2015-04-29 17:26:51 -04:00
Albert Santoni	85cc373328	Embedded player: Display the show name during master/show source	2015-04-29 16:03:36 -04:00
Duncan Sommerville	e73a6df796	Fix for invalid date format issue in Firefox	2015-04-29 15:23:29 -04:00
Albert Santoni	1215eb1895	Prevent NaN from causing problems with player timeout	2015-04-29 12:58:32 -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