8f8b0b7f4d
Merge branch 'saas-dev' into saas-landing-page
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/views/scripts/embed/player.phtml
2015-05-28 13:25:18 -04:00
450300ddd8
Small TuneIn validation fix
...
Was not setting error message when station id is invalid
2015-05-28 12:00:20 -04:00
018bb3a648
SAAS-823: Tunein preference check box issue
2015-05-28 11:54:23 -04:00
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
e011d61b81
updated translation resources
2015-05-28 09:35:12 +00:00
b50aa15587
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-27 15:16:13 -04:00
51a3f19f43
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-27 14:02:00 -04:00
1fa45bfc48
SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items
2015-05-27 14:01:49 -04:00
27868fbfe5
SAAS-813: Wire up schedule widget on Radio Page
2015-05-27 13:50:25 -04:00
a569387c5a
Removed extra white space
2015-05-27 10:19:15 -04:00
a74a161936
SAAS-812: Remove live chat from radio page
2015-05-27 10:18:50 -04:00
2d577dbcb0
Small fix to embed player metadata
2015-05-27 10:09:13 -04:00
793e959cae
SAAS-811: Insert extra radio page buttons onto player bar
2015-05-27 10:08:51 -04:00
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
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
fc02de4920
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 415a0d21f9
2015-05-22 19:09:04 -04:00
d3f89c9507
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 82c801cb79
2015-05-22 19:08:48 -04:00
9ffbdfbfa3
Merge branch '2.5.x-installer' into saas-installer-albert
2015-05-22 18:43:28 -04:00
b81069ace3
Added missing requests dependency to pypo's requirements
2015-05-22 18:43:05 -04:00
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
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
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
c67549d9c6
Merge branch 'saas-temp-testing' into saas-dev
2015-05-22 10:54:04 -04:00
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
94b949adaa
SAAS-772: Send metadata to Tunein
...
Removed unused code
2015-05-22 10:35:36 -04:00
d26b913a11
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-22 10:18:19 -04:00
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
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
8b02002f5e
Merge branch 'saas-dev' into saas-temp-testing
2015-05-22 08:56:43 -04:00
c9a6260cc0
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Removed commented code
2015-05-22 08:53:29 -04:00
5330859f00
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
small fix
2015-05-22 08:51:32 -04:00
b80c102e99
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fixes for webstreams
2015-05-22 08:09:59 -04:00
266bf75765
updated translation resources
2015-05-22 09:27:12 +00:00
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -04:00
2b8e40a12c
Merge branch 'saas' into saas-speedy
2015-05-21 15:09:57 -04:00
16fe0aa177
Merge branch 'saas' into saas-dev
2015-05-21 15:05:20 -04:00
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
617fdb971f
updated translation resources
2015-05-21 14:18:07 +00:00
3052e1f23b
Changed Preferences and Stream Settings pages to use new-style csrf token generation
2015-05-21 10:17:05 -04:00
6c015950de
updated translation resources
2015-05-21 11:00:11 +00:00
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
c7aa6b3e5e
airtime_analyzer: use requests >= 2.7.0
2015-05-20 10:36:55 -04:00
506b9cb248
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-20 07:06:22 -04:00
c9483da4c5
Merge branch 'saas-tunein' into saas-dev
2015-05-20 07:05:54 -04:00
e5a8f14a9a
Commented out request to tunein when station is offline
2015-05-20 07:05:26 -04:00
c1c1a6c7f9
updated translation resources
2015-05-20 10:52:16 +00:00
b8dd7f0df3
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-05-19 16:21:16 -04:00
ae3fef383e
Removed station_domain from messages to airtime_analyzer, unused.
2015-05-19 16:20:51 -04:00
a8bf8e5ec9
SAAS-786: Implement Landing Page Design
...
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
0b045a8b4e
Merge pull request #112 from sourcefabric/saas-tunein
...
Saas tunein
2015-05-19 15:53:57 -04:00
drigato
localizer
Duncan Sommerville
Albert Santoni
Denise Rigato