Albert Santoni
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
Albert Santoni
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
Albert Santoni
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -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
196e08fc90
Fix bug where users can't connect to Master source due to hardcoded path in liquidsoap
2015-05-21 12:49:26 -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
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
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
localizer
7676ec5643
updated translation resources
2015-05-07 08:04:23 +00: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
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
