Commit Graph

14085 Commits

Author SHA1 Message Date
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 3d8cd8e927 Added daemon dependency back in for airtime_analyzer 2015-05-19 13:45:08 -04:00
Albert Santoni e1c50ecc7b Squash urllib3 warnings to see if it helps with SAAS-714 2015-05-19 13:09:43 -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
Albert Santoni 3b8368c4ec Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-05-19 12:02:28 -04:00
Albert Santoni add211d13c Cleanup to help with SAAS-714 2015-05-19 12:02:19 -04:00
localizer dc11e88b0e updated translation resources 2015-05-19 07:39:13 +00: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
Duncan Sommerville 415a0d21f9 Add on_metadata wrapper to liquidsoap master/show sources 2015-05-15 15:46:45 -04:00
Duncan Sommerville 82c801cb79 Add on_metadata wrapper to liquidsoap master/show sources 2015-05-15 15:15:49 -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 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 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
localizer 7676ec5643 updated translation resources 2015-05-07 08:04:23 +00:00
drigato 9ad0628efa SAAS-732: Clean up weekly program widget 2015-05-05 15:07:12 -04:00
Duncan Sommerville 2f20729e05 Small update to wording in install help 2015-05-05 12:41:02 -04:00
Duncan Sommerville 8b380086c3 Merge branch 'saas-dev' into saas-speedy 2015-05-04 13:09:51 -04:00
drigato f375115825 Merge branch 'saas' into saas-landing-page 2015-05-04 09:40:26 -04:00
Duncan Sommerville 8aea86b451 SAAS-744 - Updated double click and Add button functionality on Now Playing and Add/Remove content screens 2015-04-30 16:23:52 -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 d1dfa9d3be Fixed add/remove content dialog being too low 2015-04-30 10:50:23 -04:00
Albert Santoni be614415de SAAS-757: metadata edit window goes under the header menu 2015-04-30 10:29:43 -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