d54eb37317
Merge branch 'saas' into saas-dev
2015-06-24 15:19:38 -04:00
7645f67515
SAAS-877 - Update live-info-v2 api
2015-06-24 12:18:52 -04:00
74b403897d
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-06-19 14:23:46 -04:00
19adb062cf
SAAS-879 and add FAQ to Help menu
...
* SAAS-879: When trying to save changes in the user setting pages
changes do not save and goes to a "an error hass occured page"
2015-06-19 14:22:58 -04:00
88bd3c9bc2
SAAS-872 - Load disk information statically
2015-06-18 10:03:05 -04:00
0f58e315e6
Merge branch 'saas-cc-6055' into saas
2015-06-16 16:13:40 -04:00
61272cd42c
Handle 404s with the correct error page, and don't log them
2015-06-16 14:58:27 -04:00
90bd0a1ab4
Attempt at fixing Sentry error logging
2015-06-16 14:35:29 -04:00
709b9bbeec
CC-6059: Default station logo broken in Audio Preview popup
2015-06-16 13:37:05 -04:00
4bebe1e0fb
Radio page fixes
2015-06-16 12:50:40 -04:00
ad5121f2ca
Radio Page improvements
2015-06-15 14:42:37 -04:00
b4c9a77e7c
CC-6055: Improved escaping
2015-06-12 13:48:54 -04:00
7c6f15984d
Small consistency changes for the embeddable widgets
2015-06-10 18:02:25 -04:00
357e17f3b4
Fix for station logo not displaying correctly
2015-06-10 15:57:09 -04:00
24db599afe
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-10 15:03:21 -04:00
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
ffcd15190f
Default station logo was not displaying
2015-06-10 14:46:27 -04:00
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
0796f58878
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 11:14:02 -04:00
042e441708
Radio Page Code Review Changes
...
Reset stylesheets in index controller.
Removed hardcoded days of week in WidgetHelper.
Display schedule widget with 6 days after the current day.
2015-06-10 11:13:03 -04:00
6126e8a51c
Merge branch 'saas' into saas-dev
2015-06-10 11:02:59 -04:00
ca8ca0abed
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 09:07:12 -04:00
02d49864fa
Squash some error notices in UserController
2015-06-08 15:17:48 -04:00
060280d5a5
Merge branch 'saas-dev' into saas-landing-page
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/IndexController.php
2015-06-08 14:55:24 -04:00
ada6b97873
CC-6050: User management bugfix
2015-06-05 12:34:51 -04:00
14f37909d1
More robust error handling in show-logo action
2015-06-05 11:55:06 -04:00
dd4cbe5b63
CC-6051 - Route / generates invalid navigation bar links
2015-06-05 11:52:51 -04:00
f6e23ab075
Add more error handling to show-logo api
2015-06-04 18:45:00 -04:00
8386145cb9
SAAS-836: Create a new schedule widget skin
2015-06-04 16:09:19 -04:00
6528a9b0a3
SAAS-843: Create Embeddable Schedule Widget View
...
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
2015-06-04 12:00:23 -04:00
d6ec9e99b5
Remove unused embed controller action
2015-06-03 10:12:19 -04:00
3de1d90241
Unhardcode premium style player
...
Had this is for testing purposes
2015-06-03 10:02:27 -04:00
1add10c657
SAAS-833: Radio page UI improvements/fixes
...
Fixed schedule widget scrolling
Inserted default station description
2015-06-03 08:29:03 -04:00
01ea6f27ae
Merge branch 'saas-dev' into saas-installer-albert
...
Conflicts:
python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
a8d2290d00
SAAS-834: Login with WHMCS account doesn't work on suspended stations
2015-05-29 16:43:27 -04:00
7a6184cf23
Merge branch 'saas' into saas-dev
2015-05-28 15:29:28 -04:00
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
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
018bb3a648
SAAS-823: Tunein preference check box issue
2015-05-28 11:54:23 -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
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
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
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -04:00
3052e1f23b
Changed Preferences and Stream Settings pages to use new-style csrf token generation
2015-05-21 10:17:05 -04:00
e5a8f14a9a
Commented out request to tunein when station is offline
2015-05-20 07:05:26 -04:00
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
2da4e264e5
SAAS-772: Send metadata to Tunein
...
Update metadata when station goes offline
2015-05-19 15:42:07 -04:00
e91b520b42
SAAS-786: Implement Landing Page Design
...
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
2015-05-15 16:19:18 -04:00
Albert Santoni
Duncan Sommerville
drigato