Commit Graph

69 Commits

Author SHA1 Message Date
Duncan Sommerville 5cb396e512 SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null) 2015-07-06 18:03:44 -04:00
Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
Duncan Sommerville 5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville 7e0b6ac7ba Add transifex link constant 2015-06-26 13:28:05 -04:00
Duncan Sommerville d91b05a0ae SoundCloud - Add release_year metadata field and set default sharing and license types 2015-06-25 10:53:35 -04:00
Duncan Sommerville 8fcaf7fc74 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
Duncan Sommerville 7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Duncan Sommerville 8d2e476ff1 SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -04:00
Duncan Sommerville 3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -04:00
Duncan Sommerville 8163608666 Merge branch 'saas-dev' into soundcloud 2015-06-10 16:25:30 -04:00
Duncan Sommerville 459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
drigato d1ac78be68 Fix for station logo....again... 2015-06-10 16:01:16 -04:00
Albert Santoni c18e728583 Merge branch 'saas-installer-albert' into saas-dev 2015-06-10 15:03:11 -04:00
drigato 8e8f8aa55b Radio Page Code Review Changes
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
2015-06-10 12:23:19 -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
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 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 fc36ff5797 Updated user manual constant to new manual url 2015-04-30 14:51:35 -04:00
Albert Santoni 088ada1d2c Reformatted Bootstrap, added Station Suspended notice 2015-04-10 17:14:56 -04:00
Albert Santoni f69e5afbff SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file 2015-02-02 14:42:20 -05:00
drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Albert Santoni ee9163fa8e 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
2015-01-15 12:42:36 -05:00
Daniel James cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Duncan Sommerville 5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville 8fc7178d82 Added several global constants for reoccurring strings in Airtime to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville 62a915f109 Added global define for application name 2014-11-06 11:57:05 -05:00
Albert Santoni d92e5197e1 Design and overhaul of Account Plans screen
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
Albert Santoni faa12c8065 Super Admin edit page points to billing now
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
Naomi 429cdeeffb filtering by a host's show so they can edit their own playout history. 2013-08-28 19:37:46 -04:00
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks
- done
2013-01-03 14:02:06 -05:00
Rudi Grinberg dc361c1136 Aligned constants 2012-10-26 13:10:08 -04:00
Rudi Grinberg dea764b8fd cc-3936: added warning for metadata attributes that are not defined in constants.php 2012-08-27 14:03:22 -04:00
denise 722e470f6f CC-84: Smart Playlists
- changed playlist controller to also handle Blocks
- created new view for smart blocks
2012-07-25 11:00:46 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable
-fixed
2012-07-11 19:31:24 -04:00
Martin Konecny ce698d4123 CC-430: Audio normalization (Replaygain Support)
-Added support on server side
2012-07-05 22:37:40 -04:00
Martin Konecny 1245d1e860 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
-fixed in a better way
2012-05-15 15:17:19 -04:00
Martin Konecny 025ef0ed27 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
-fixed
2012-05-15 12:35:02 -04:00
denise ff6e2a2e5a CC-3747: Metadata popup should also show the filepath of the track
-fixed
2012-05-02 16:52:49 -04:00
Paul Baranowski 1682ce8879 Updated copyright date. 2012-02-23 15:24:20 -05:00
Daniel b603726a39 CC-3289: Widgets should have a version string so users can make sure widgets are up to date
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
2012-02-09 15:04:52 -05:00
James d4063a8234 CC-2873: Soundcloud plugin doesn't log any error when there is an
error with soundcloud uploading through api controller

- changed constant name to 'SOUNDCLOUD_NOT_UPLOADED_YET'
2011-10-03 17:38:57 -04:00
James 1c652b6416 CC-2873: Soundcloud plugin doesn't log any error when there is an error
with soundcloud uploading through api controller

- Changed constant names
- added -1 constant
2011-09-29 10:30:40 -04:00
james e1fe877ac6 CC-2873: Use PHP constants
- done
2011-09-25 17:29:57 -04:00
martin cd95170b06 CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead
-done
2011-09-23 16:26:19 -04:00