Commit graph

13684 commits

Author SHA1 Message Date
Duncan Sommerville
f031d13867 Merge branch 'saas-dev' into soundcloud 2015-06-09 14:03:03 -04:00
Duncan Sommerville
49165e91d9 SAAS-854 - celery-based SoundCloud backend uploader 2015-06-09 14:02:29 -04:00
Albert Santoni
23dd6d4021 CC-6054: live-info-v2 returns future shows without ordering by start time 2015-06-08 16:38:17 -04:00
Albert Santoni
02d49864fa Squash some error notices in UserController 2015-06-08 15:17:48 -04:00
Albert Santoni
146146e35f CC-6052: Fix problem with stream passwords 2015-06-08 14:18:19 -04:00
Duncan Sommerville
14f37909d1 More robust error handling in show-logo action 2015-06-05 11:55:06 -04:00
Duncan Sommerville
f6e23ab075 Add more error handling to show-logo api 2015-06-04 18:45:00 -04:00
Duncan Sommerville
80bfb7fd93 SAAS-848 - Add soundcloud_callback file 2015-06-04 12:01:04 -04:00
Duncan Sommerville
63b726e6b2 SAAS-848 - Modify SoundCloud code to use external redirect 2015-06-04 11:38:46 -04:00
Duncan Sommerville
b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
Albert Santoni
700fddbada SAAS-818: If the network connection is interrupted, pypo sometimes can't recover 2015-06-02 14:51:20 -04:00
Albert Santoni
a8d2290d00 SAAS-834: Login with WHMCS account doesn't work on suspended stations 2015-05-29 16:43:27 -04:00
Albert Santoni
7a6184cf23 Merge branch 'saas' into saas-dev 2015-05-28 15:29:28 -04:00
Albert Santoni
187ef926ff Allow public APIs to be accessed with the API key regardless of the public API setting. 2015-05-28 15:28:51 -04:00
drigato
450300ddd8 Small TuneIn validation fix
Was not setting error message when station id is invalid
2015-05-28 12:00:20 -04:00
drigato
018bb3a648 SAAS-823: Tunein preference check box issue 2015-05-28 11:54:23 -04:00
drigato
182b12e0e3 SAAS-794: Schedule/get-current-playlist can take too long to respond
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
2015-05-28 09:47:58 -04:00
Duncan Sommerville
b50aa15587 Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations 2015-05-27 15:16:13 -04:00
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