Duncan Sommerville
|
51a3f19f43
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-05-27 14:02:00 -04:00 |
Duncan Sommerville
|
1fa45bfc48
|
SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items
|
2015-05-27 14:01:49 -04:00 |
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 |
Albert Santoni
|
fc02de4920
|
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
This reverts commit 415a0d21f9 .
|
2015-05-22 19:09:04 -04:00 |
Albert Santoni
|
d3f89c9507
|
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
This reverts commit 82c801cb79 .
|
2015-05-22 19:08:48 -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
|
d26b913a11
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-05-22 10:18:19 -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 |
Denise Rigato
|
213aea2388
|
Merge pull request #113 from sourcefabric/saas-temp-testing
Fix for performance problem with very large library tables
|
2015-05-22 08:59:13 -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 |
Albert Santoni
|
16fe0aa177
|
Merge branch 'saas' into saas-dev
|
2015-05-21 15:05:20 -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 |
Albert Santoni
|
c7aa6b3e5e
|
airtime_analyzer: use requests >= 2.7.0
|
2015-05-20 10:36:55 -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
|
c9483da4c5
|
Merge branch 'saas-tunein' into saas-dev
|
2015-05-20 07:05:54 -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 |
Denise Rigato
|
0b045a8b4e
|
Merge pull request #112 from sourcefabric/saas-tunein
Saas tunein
|
2015-05-19 15:53:57 -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
|
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 |
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
|
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 |