Commit graph

288 commits

Author SHA1 Message Date
drigato
10db978a2b Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-11 16:30:50 -05:00
drigato
5cf5ff4fa1 code cleanup 2014-11-11 16:29:54 -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
drigato
e24b4f43fd Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
drigato
6adb33e89b Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -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
2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -04:00
Duncan Sommerville
940d74ce39 Files auto-updated by Propel 2014-09-16 18:26:18 -04:00
drigato
ace883c975 Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
Conflicts:
	airtime_mvc/application/configs/application.ini
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -04:00
drigato
0ccc7e7dc9 SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -04:00
Albert Santoni
0203be0f10 Revert zend routing changes to fix uploads 2014-08-01 15:30:37 -04:00
Albert Santoni
1c676dee6d Fix user settings again for Super Admins, also Zend routing tweak
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
Albert Santoni
aa8a26271c Fix zend routing on Trusty (weird error due to REST module) 2014-08-01 11:51:20 -04:00
drigato
41ff0cce67 CC-5896: Store cloud files in separate table, inherited from cc_files
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
2014-07-23 15:22:42 -04:00
drigato
72841de714 CC-5895: Upgrade Propel to 1.7
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
2014-07-23 15:03:51 -04:00
drigato
039a51121b CC-5885: Factor out cloud storage code into separate class 2014-07-11 16:16:30 -04:00
drigato
c2411b6f41 CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:56:41 -04: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
drigato
25e4036d2f typo 2014-06-20 17:29:56 -04:00
drigato
5d0ea2d015 Add billing section to main menu 2014-06-20 17:25:05 -04:00
drigato
497841225b Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now 2014-06-20 16:54:41 -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
Albert Santoni
7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -04:00
drigato
81ceafbfbd whmcs client form 2014-06-12 17:54:20 -04:00
Albert Santoni
2d6748457c Remove database credentials from application.ini 2014-05-02 15:50:37 -04:00
Albert Santoni
e7482e52f7 Double equals typo *ducks* 2014-04-22 15:56:29 -04:00
Albert Santoni
dc27465b21 Fix config parsing for dev_env
Conflicts:
	airtime_mvc/application/configs/conf.php
2014-04-22 15:29:21 -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
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
drigato
aba2fb44d1 CC-5701: Airtime File API
-put and delete actions working
2014-03-03 11:21:25 -05:00
drigato
64c1dd2c1e CC-5701: Airtime File API
Beginnings of fil rest api
index, get, post actions working without authentication
2014-02-27 17:11:17 -05:00
Albert Santoni
fe9beec778 CC-5651: Unit Test the Scheduler
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
2014-01-13 11:43:17 -05:00
Naomi
4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -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
969889859b improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp. 2013-08-28 13:07:55 -04:00
Naomi
8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi
16581088d9 working on configuring an item template UI.
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
Naomi
69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi
328c1f3cac IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
Naomi
a569d2f3f5 CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder 2013-05-22 15:33:49 -04:00
denise
23c29455d9 Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values 2013-02-05 13:18:25 -05:00
Martin Konecny
973a415164 -fix installation error 2013-01-15 15:37:26 -05:00
James
8c19384d32 - CRLF fix 2013-01-14 16:21:02 -05:00
James
5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-14 16:16:14 -05:00
James
a55bc9973c - temp commit 2013-01-14 14:43:02 -05:00
James
dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-10 18:09:00 -05:00
James
b8f80866cf CC-3018: Automatically strip out silence from audio tracks
- done
2013-01-03 14:02:06 -05:00