Commit graph

1959 commits

Author SHA1 Message Date
drigato
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
Albert Santoni
6126e8a51c Merge branch 'saas' into saas-dev 2015-06-10 11:02:59 -04:00
drigato
ca8ca0abed Merge branch 'saas-dev' into saas-landing-page 2015-06-10 09:07:12 -04:00
Duncan Sommerville
f031d13867 Merge branch 'saas-dev' into soundcloud 2015-06-09 14:03:03 -04:00
Albert Santoni
02d49864fa Squash some error notices in UserController 2015-06-08 15:17:48 -04:00
drigato
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
Albert Santoni
ada6b97873 CC-6050: User management bugfix 2015-06-05 12:34:51 -04:00
Duncan Sommerville
14f37909d1 More robust error handling in show-logo action 2015-06-05 11:55:06 -04:00
Albert Santoni
dd4cbe5b63 CC-6051 - Route / generates invalid navigation bar links 2015-06-05 11:52:51 -04:00
Duncan Sommerville
f6e23ab075 Add more error handling to show-logo api 2015-06-04 18:45:00 -04:00
drigato
8386145cb9 SAAS-836: Create a new schedule widget skin 2015-06-04 16:09:19 -04:00
drigato
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
Duncan Sommerville
b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
drigato
d6ec9e99b5 Remove unused embed controller action 2015-06-03 10:12:19 -04:00
drigato
3de1d90241 Unhardcode premium style player
Had this is for testing purposes
2015-06-03 10:02:27 -04:00
drigato
1add10c657 SAAS-833: Radio page UI improvements/fixes
Fixed schedule widget scrolling
Inserted default station description
2015-06-03 08:29:03 -04:00
Albert Santoni
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
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
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
drigato
018bb3a648 SAAS-823: Tunein preference check box issue 2015-05-28 11:54:23 -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
27868fbfe5 SAAS-813: Wire up schedule widget on Radio Page 2015-05-27 13:50:25 -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
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
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
e5a8f14a9a Commented out request to tunein when station is offline 2015-05-20 07:05:26 -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
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
drigato
479dbc5525 SAAS-786: Implement Landing Page Design
Implemented logo, station name and description
2015-05-15 09:01:20 -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
4941ae1a6d Separated weekly schedule widget css into separate file 2015-05-07 14:27:59 -04:00
drigato
9ad0628efa SAAS-732: Clean up weekly program widget 2015-05-05 15:07:12 -04:00
Duncan Sommerville
8b380086c3 Merge branch 'saas-dev' into saas-speedy 2015-05-04 13:09:51 -04:00
Duncan Sommerville
4e37788d92 Fix for SAAS-747 2015-04-28 11:42:18 -04:00
drigato
9b7acb24c6 SAAS-728: Make schedule widgets embeddable 2015-04-22 12:46:41 -04:00
drigato
7d1b112db9 Stopped redirecting to /login if no valid session 2015-04-21 11:26:48 -04:00
Albert Santoni
074ad31228 Squash warnings in ProvisioningController 2015-04-17 12:40:52 -04:00
Albert Santoni
1964cbb75e Merge branch 'saas' into saas-suspend 2015-04-17 12:18:56 -04:00
Albert Santoni
6dc8837aff Removed unused status page stuff for Pro and cleanup for code review 2015-04-17 11:17:35 -04:00
Albert Santoni
acbaac0bc5 Fixed month view not displaying a full 42 days 2015-04-16 16:30:12 -04:00
Albert Santoni
56716e9af6 Fixed preferences not saving in some cases 2015-04-16 15:11:46 -04:00
Albert Santoni
dc20b5c252 Bugfixes for my optimizations
* Fixed saving not working in the user settings page
* Fixed first day of week not loading correctly in week view
* Fixed timezone handling in functions off of EventPreloadAction
* Fixed show instance "percent filled" not being embedded in our JSON
  response correctly if you started on the month view.
2015-04-16 14:58:28 -04:00