Commit Graph

664 Commits

Author SHA1 Message Date
drigato eef6237b42 Fix installer 2014-11-26 17:41:04 -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
drigato a10e287368 Fixed a fresh install bug that wasn't using composer installs.
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
drigato 2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -04:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
Duncan Sommerville 63d1bf08f7 Merged 2.5.x into saas 2014-09-17 13:30:37 -04:00
Duncan Sommerville 0c538ff1ae Added chown call to properly permission stor directory 2014-09-17 13:21:08 -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
drigato 9c2a086487 CC-5895: Upgrade Propel to 1.7
Update install scripts with new propel library path
2014-07-23 15:18:46 -04:00
Albert Santoni fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni 560d1a9b14 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
2014-06-09 11:36:51 -04:00
Albert Santoni 314553487b CC-5797: Install should give www-data permissions on stor
* chmod command was bugged due to extra 0 (read the docs)
2014-06-05 15:10:25 -04:00
drigato 39db3d4aee Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
2014-05-05 11:21:02 -04:00
Albert Santoni 5dab498041 Removed this silly airtime-update-db-settings script
* No longer needed, was a horrible hack in the first place.
2014-05-02 17:16:03 -04:00
drigato 57ad1beaa9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 14:18:56 -04:00
Albert Santoni a43f487817 Fixed airtime-upgrade.php... 2014-04-25 12:19:18 -04:00
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
Naomi 578f758274 CC-5810 : Installation can have race conditions with the cache
Preferences.php is used to set values since it will save the value to cache there as well.

defaultdata.sql is used where possible.
2014-04-23 15:41:15 -04:00
Albert Santoni 2f8461b2a6 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-23 14:58:36 -04:00
Albert Santoni 4f3298b986 Installer fix 2014-04-23 14:17:58 -04:00
Albert Santoni b920ed2598 Fixed a bunch of installer stuff for Naomi 2014-04-23 12:21:39 -04:00
drigato 51c80bc033 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:50:58 -04:00
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
drigato 65b7c7ee05 CC-5781: Upgrade script for new storage quota implementation
Upgrade script for saas only
2014-04-08 12:12:42 -04:00
drigato 3adaf8e370 CC-5781: Upgrade script for new storage quota implementation
Upgrade script for local installs
SAAS requires a different script
2014-04-08 10:32:27 -04:00
drigato 70e660e7da CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:26:56 -04:00
drigato c18c4da629 CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:18:33 -04:00
drigato aa531c882f CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:16:32 -04:00
drigato 54868c9f6e CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:07:42 -04:00
drigato b61fae77b3 CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:04:54 -04:00
drigato 6cd1ebb5ea CC-5781: Upgrade script for new storage quota implementation 2014-04-07 14:59:58 -04:00
drigato 10778fd88d CC-5781: Upgrade script for new storage quota implementation 2014-04-07 14:52:55 -04:00
drigato 57955420f3 CC-5781: Upgrade script for new storage quota implementation 2014-04-07 14:49:23 -04:00
drigato 197e12093d CC-5781: Upgrade script for new storage quota implementation
add propel to include path
2014-04-07 14:40:08 -04:00
drigato c1cc3740f3 CC-5781: Upgrade script for new storage quota implementation
Include propel library
2014-04-07 14:23:00 -04:00
drigato 6abe613a73 CC-5781: Upgrade script for new storage quota implementation 2014-04-07 14:11:31 -04:00
drigato 770a51dccd Changed airtime version in necessary places 2014-04-07 12:14:49 -04:00
drigato 9d488a01ce Included upgrade folder path for 2.5.3 so Airtime can upgrade from older versions 2014-04-07 11:58:58 -04:00
drigato a756b6a9e4 CC-5781: Upgrade script for new storage quota implementation
Created skeleton for upgrade script
2014-04-07 11:37:30 -04:00
Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x
Conflicts:
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-01 10:30:00 -04:00
Albert Santoni 8f7ecafcf6 CC-5709: Airtime Analyzer
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
Daniel James b5f0df008b Don't bump installation version yet 2014-02-17 12:35:09 +00:00
Daniel James eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
Albert Santoni 162a873f9d CC-5651: Unit Test the Scheduler
* Continued refactoring of the database creation.
* Database now persists after running tests but most of the tables are
  cleared.
* The unit tests run WAY faster now. :-)
2014-01-23 17:04:29 -05:00
Albert Santoni 25be2fc3ff Fixed hardcoded database name in AirtimeInstall.php 2014-01-23 13:10:13 -05:00
Albert Santoni 04140c38d1 Rollback to requiring PHP 5.3 to fix Ubuntu 12.04 support 2013-12-17 12:56:56 -05:00
drigato 0598c46387 Added upgrade script path for 2.5.1 to include/airtime-upgrade.php 2013-12-10 10:55:39 -05:00
drigato 2032eefdde Update version number in airtime-constants.php
Update version number in api_client.py
Create upgrade folder
2013-12-09 15:30:30 -05:00
drigato 3b539b7c04 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
Conflicts:
	install_minimal/include/airtime-install.php
2013-12-03 11:25:09 -05:00