Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13539 commits 3 branches 0 tags 405 MiB
Commit graph

4669 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
drigato
b304e2fa34 Bug fix 2014-11-11 13:56:17 -05:00
Duncan Sommerville
769e0e1d82 Fixed 'clear' button not working when files failed to import 2014-11-10 16:07:51 -05:00
drigato
4893d087e2 Bug fix 2014-11-10 12:53:07 -05:00
drigato
8733788807 Added NOT NULL to cloud_file foreign key field 2014-11-10 10:55:15 -05:00
drigato
6b058ade0b Upgrade script fix 2014-11-10 10:50:15 -05:00
drigato
13f6b693d6 Fixed upgrade.sql script 2014-11-10 10:37:01 -05:00
Duncan Sommerville
af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
drigato
4b10e024da Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-07 12:35:23 -05:00
Duncan Sommerville
f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
drigato
1dc72d5ebe Changed Amazon S3 download URL format so it works with S3_EU_WEST region. 
Updated amazon config file path in the downloader class
 2014-11-07 11:51:11 -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
efd05c4b77 Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes 2014-11-06 18:40:06 -05:00
Duncan Sommerville
795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00
Duncan Sommerville
62a915f109 Added global define for application name 2014-11-06 11:57:05 -05:00
Duncan Sommerville
4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville
e5e7942b42 Added getUserLocale function to pull locale data into the Login form 2014-11-05 17:24:54 -05:00
Duncan Sommerville
eecd3fa188 Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field 2014-11-05 17:24:08 -05:00
Duncan Sommerville
b94d34f719 Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose 2014-11-05 17:22:13 -05:00
Duncan Sommerville
564e8d9311 Replaced hardcoded locale defaults with the station default locale 2014-11-05 17:21:19 -05:00
Duncan Sommerville
90626a2fcb Formatting; Changed tabs to spaces 2014-11-05 17:04:18 -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
Duncan Sommerville
02be09b5ff Fixed issue with improper array initialization 2014-11-05 10:15:16 -05:00
Duncan Sommerville
00e85de3c8 Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change 2014-11-05 10:06:59 -05:00
Duncan Sommerville
0f3c1914e1 CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing 2014-11-04 18:38:31 -05:00
Duncan Sommerville
eef7116142 Updated i18n to use multiple domains 2014-11-04 17:03:52 -05:00
Duncan Sommerville
5275669211 Updated i18n to use multiple domains 2014-11-04 17:03:52 -05:00
drigato
2f16385b53 Fixed upgrades 2014-11-04 13:33:20 -05:00
drigato
f147fb34bb Cloud storage upgrade script 2014-11-03 16:56:25 -05:00
drigato
6cda01fba9 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-03 13:15:21 -05:00
drigato
27b8f0ac13 Removed delete-success view script because action no longer exists. 2014-11-03 13:15:04 -05:00
drigato
87d5d3cb02 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-11-03 13:11:22 -05:00
drigato
5f98151009 Removed unused route from rest Media Controller 2014-11-03 12:57:41 -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
b871b32175 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-30 12:17:34 -04:00
drigato
54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
drigato
e23649173d Added comments to CcFiles and CloudFile classes. 2014-10-30 12:12:47 -04:00
Albert Santoni
359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-10-29 18:01:31 -04:00
Albert Santoni
ceb51100ec Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-29 17:58:56 -04:00
Albert Santoni
c590869311 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-10-29 17:57:25 -04:00
Albert Santoni
fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Albert Santoni
dd5176c209 Merge pull request #76 from RobertElder/saas-relder-cors-localhost 
Don't throw exceptions for localhost in CORSHelper.
 2014-10-29 17:35:25 -04:00
Duncan Sommerville
2f96885d65 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-10-28 13:30:16 -04:00
Duncan Sommerville
53c4301024 Wrapped json_encode call in PHP version check 2014-10-28 13:29:35 -04:00
drigato
10f3c0a290 Merge branch '2.5.x' into saas 2014-10-28 10:29:42 -04:00
drigato
1d3180cc80 CC-5932: Update is_scheduled query is too slow 
Forgot to remove some debugging statements
 2014-10-28 10:29:25 -04:00
drigato
64a68c972d Merge branch '2.5.x' into saas 2014-10-28 10:26:14 -04:00
drigato
eae1b4e17c CC-5932: Update is_scheduled query is too slow 2014-10-28 10:25:40 -04:00