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

14980 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Duncan Sommerville
3b588dcce8 Removed unnecessary call to set locale data on the Login page 2014-11-05 17:27:08 -05:00
Duncan Sommerville
534b56351e Added styles to completely hide csrf elements on the page; changed tabs to spaces 2014-11-05 17:26:05 -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
Duncan Sommerville
273afaa126 Added Japanese language text files to js i18n datatables 2014-11-05 16:47:09 -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
79548c9e83 Changed tabs to spaces and moved apache2 version call to after installation 2014-11-05 14:36:19 -05:00
Duncan Sommerville
bd68ae4f98 Changed tabs to spaces and moved apache2 version call to after installation 2014-11-05 14:35:19 -05:00
Duncan Sommerville
02be09b5ff Fixed issue with improper array initialization 2014-11-05 10:15:16 -05:00
Duncan Sommerville
e843d96e3f Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-11-05 10:08:09 -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
localizer
6c27606aa7 updated translation resources 2014-11-05 10:56:11 +00:00
Duncan Sommerville
5ea27067e2 Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-11-04 18:39:00 -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
localizer
a67397d0cf updated translation resources 2014-11-04 16:44:18 +00:00
Duncan Sommerville
298d8630f3 Initial commit of InstallWizardController 2014-11-04 11:07:56 -05:00
Duncan Sommerville
e8950c8815 Changed tabs to spaces 2014-11-04 11:07:24 -05:00
Duncan Sommerville
3024daba0e Changed tabs to spaces 2014-11-04 11:06:17 -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
7e1d14fcf2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-11-03 10:31:49 -05:00
drigato
52b0db5ccd Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-11-03 10:29:53 -05:00
Albert Santoni
8616cee9a3 Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade 
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
 2014-10-31 15:49:45 -04:00
Duncan Sommerville
057993eeeb Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-10-30 17:43:31 -04:00
Duncan Sommerville
ef9ab1acf0 Merge branch '2.5.x' into saas 2014-10-30 17:42:55 -04:00
Duncan Sommerville
7bc07a91f2 Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-10-30 17:41:42 -04:00
Duncan Sommerville
8f5af6556d CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel 2014-10-30 17:41:00 -04: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
drigato
01ad2ab832 Commented cloud storage classes 2014-10-29 17:42:42 -04:00