Commit Graph

4716 Commits

Author SHA1 Message Date
drigato a569387c5a Removed extra white space 2015-05-27 10:19:15 -04:00
drigato a74a161936 SAAS-812: Remove live chat from radio page 2015-05-27 10:18:50 -04:00
drigato 2d577dbcb0 Small fix to embed player metadata 2015-05-27 10:09:13 -04:00
drigato 793e959cae SAAS-811: Insert extra radio page buttons onto player bar 2015-05-27 10:08:51 -04:00
drigato a8bf8e5ec9 SAAS-786: Implement Landing Page Design
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
drigato e91b520b42 SAAS-786: Implement Landing Page Design
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
2015-05-15 16:19:18 -04:00
drigato 479dbc5525 SAAS-786: Implement Landing Page Design
Implemented logo, station name and description
2015-05-15 09:01:20 -04:00
drigato 10ca987a51 SAAS-762: Implement schedule widget design 2015-05-12 11:56:35 -04:00
drigato 24ebc8c8e4 Merge branch 'saas' into saas-landing-page 2015-05-11 15:54:02 -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
drigato 4941ae1a6d Separated weekly schedule widget css into separate file 2015-05-07 14:27:59 -04:00
drigato 9ad0628efa SAAS-732: Clean up weekly program widget 2015-05-05 15:07:12 -04:00
drigato f375115825 Merge branch 'saas' into saas-landing-page 2015-05-04 09:40:26 -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
Albert Santoni c0bd28f6d5 Prevent negative timeouts in player 2015-04-29 11:59:17 -04:00
Albert Santoni 9019377d0e Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-04-29 11:48:15 -04:00
Albert Santoni b3a19ae49e Bugfix for embedded player sending too many requests on load, quieter logging for boto 2015-04-29 11:46:44 -04:00
Duncan Sommerville 94fc2131ff SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade 2015-04-27 16:19:15 -04:00
Duncan Sommerville 574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
Duncan Sommerville 4b307d6b47 Fix for vertical scrollbar issue 2015-04-27 13:52:55 -04:00
drigato 9b7acb24c6 SAAS-728: Make schedule widgets embeddable 2015-04-22 12:46:41 -04:00
drigato 7d1b112db9 Stopped redirecting to /login if no valid session 2015-04-21 11:26:48 -04:00
drigato de8edf982a SAAS-723: Add compatibility chart to player page 2015-04-20 10:52:49 -04:00
drigato 9cee7bcc86 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-04-20 10:05:55 -04:00
drigato 926d1704bf SAAS-723: Add compatibility chart to player page 2015-04-20 09:59:17 -04:00
Albert Santoni 074ad31228 Squash warnings in ProvisioningController 2015-04-17 12:40:52 -04:00
Albert Santoni 1964cbb75e Merge branch 'saas' into saas-suspend 2015-04-17 12:18:56 -04:00
Albert Santoni bd7c0be514 Whoops, invert the suspension logic 2015-04-17 12:18:49 -04:00
Albert Santoni 3ca16db524 Comments 2015-04-17 12:09:05 -04:00
Albert Santoni b61df4d681 Merge branch '2.5.x' into saas 2015-04-16 12:11:49 -04:00
Albert Santoni aa0d0f959a Remove unnecessary LOCK TABLE that can cause deadlocks in rare circumstances 2015-04-16 12:10:56 -04:00
Albert Santoni f0bcc1e42b Merge branch '2.5.x' into saas 2015-04-15 16:44:26 -04:00
Albert Santoni 4267c4e86d CC-6024: Cannot drag and drop tracks between shows in the Now Playing screen 2015-04-15 16:44:04 -04:00
drigato 7c7bacfcaf Remove console.log 2015-04-15 14:20:31 -04:00
drigato d5dfa9af81 player testing console.log 2015-04-15 13:53:24 -04:00
drigato 838f7e84bf Merge branch 'saas-player-testing' into saas 2015-04-15 13:22:32 -04:00
drigato 880cca4733 SAAS-715: Indicate errors on the player
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
drigato d5a29398c6 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-04-15 10:50:57 -04:00