Commit Graph

23 Commits

Author SHA1 Message Date
Albert Santoni 30d742af92 Added msising publish-dialog.phtml and fixed .gitignore file 2015-10-15 18:03:03 -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 31ea92d983 Added VERSION to the .gitignore 2015-02-24 16:36:17 -05:00
Duncan Sommerville 861bb42f3f Updated .gitignore 2015-01-28 15:09:30 -05:00
Duncan Sommerville 53b93d01ef Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:44:49 -05: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 4dfd49d12c Initial work on monitless installation 2014-12-16 12:24:41 -05:00
drigato 776b891894 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	.gitignore
2014-11-07 13:05:29 -05:00
drigato fa88e72d82 Removed composer.lock from gitignore 2014-11-07 13:02:09 -05:00
drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
Duncan Sommerville 0196aa21f5 Fixed testcases to account for show image path in and show instance description 2014-10-09 09:39:50 -04:00
Duncan Sommerville cb80423fdd Work on adding image upload to add-show form 2014-09-12 18:05:24 -04:00
drigato 7490c81a8f CC-5895: Upgrade Propel to 1.7
Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
2014-07-23 15:56:23 -04:00
Martin Konecny 9eebdd7d50 remove useless entries in .gitignore 2012-08-08 11:52:17 -04:00
Martin Konecny 9a4efd3faf CC-3493: Create submodule git repository for Liquidsoap binaries
-done
2012-03-29 11:31:50 -04:00
martin 86b365cc7e get rid of liquidsoap binary showing as modified 2011-09-22 16:10:22 -04:00
martin 9cfec2c8ef -reorganized/cleaned up python_apps/pypo directory. 2011-06-14 14:37:09 -04:00
martin bf925901c1 CC-2016: Rearrange python scripts for reusability
-Fixed pypo-notify.py not being to find new location of api_clients module
2011-03-24 00:52:35 -04:00
martin 9dae306526 .gitignore file now only ignores "files/" folder in the root airtime directory 2011-03-21 13:51:36 -04:00
mkonecny c4893e9d36 -updated list-view UI 2011-02-09 15:23:32 -05:00
martin 3ad346b724 -added hidden files to .gitignore 2011-01-06 21:56:33 -05:00
martin 82e84c2a6e -added .gitignore 2011-01-06 21:55:40 -05:00