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
|
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 |
|
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
|
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 |
|