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

3806 commits

Author SHA1 Message Date
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
Albert Santoni
54db74f622 Allow upgrades from Airtime 2.5.1 because the version wasn't bumped 
internally to 2.5.2
 2014-04-25 00:40:51 -04:00
drigato
42f3bb17e1 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:23:57 -04:00
drigato
f536a7b1b4 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -04:00
drigato
fcd8ea8ba5 CC-5802: Upgrade application.ini file 2014-04-24 10:22:52 -04:00
drigato
069ebd3991 CC-5802: Upgrade application.ini file 2014-04-24 10:12:24 -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
Naomi
3e34f1cf96 fixing up some datatables queries, propel usage. 2014-04-23 12:53:43 -04:00
Albert Santoni
41e2b5d840 Fix the failed uploads view 2014-04-23 11:52:10 -04:00
drigato
50ab4cc9bc Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas 2014-04-22 16:11:59 -04:00
drigato
1a71a848e1 CC-5802: Upgrade application.ini file 
Attempting to write new lines to application.ini file via the upgrade controller
 2014-04-22 16:11:46 -04:00
Albert Santoni
0a4a0d387a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/configs/conf.php
 2014-04-22 15:57:08 -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
Albert Santoni
97ce5bdbc5 Fix config parsing for dev_env 2014-04-22 15:27:43 -04:00
Albert Santoni
43483dc112 Added dev env to RabbitMQ stuff for Analyzer (fixed) 2014-04-22 12:28:20 -04:00
Albert Santoni
a79f53758f Fixed the RabbitMQ thingy 2014-04-22 11:40:35 -04:00
Albert Santoni
f106bf8fad Separate RabbitMQ settings by development environment 2014-04-22 11:13:15 -04:00
drigato
411af6838b Remove logging statement 2014-04-17 17:02:14 -04:00
drigato
64ebd9e720 Logging statement 2014-04-17 16:15:04 -04:00
drigato
8979e4e5a9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-17 16:09:03 -04:00
drigato
df9482f2ff CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path 
Media monitor was still being used to delete the file from stor
 2014-04-17 16:08:02 -04:00
drigato
d00e390511 Removed last change 2014-04-17 13:58:56 -04:00
drigato
0a6b72ad99 Removing something for testing purposes 2014-04-17 13:56:02 -04:00
drigato
c8121f9bc8 CC-5781: Upgrade script for new storage quota implementation 
Was using du wrong. Wasn't returning value in bytes
 2014-04-17 13:53:24 -04:00
drigato
3ebf9e56dd Upgrade script testing 2014-04-16 17:30:44 -04:00
drigato
b348286448 Upgrade script testing 2014-04-16 17:28:55 -04:00
drigato
456ac40fe6 Upgrade action testing 2014-04-16 17:27:15 -04:00
drigato
cd6c4f7ede Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 17:24:56 -04:00
drigato
a3be55fd60 CC-5781: Upgrade script for new storage quota implementation 
Changed airtime conf file path so it works for saas or self-hosted users
 2014-04-16 17:24:02 -04:00
drigato
edeb4b052a Remove logging statements 2014-04-16 16:53:17 -04:00
drigato
f33317ebee Logging for testing 2014-04-16 16:44:31 -04:00
drigato
7c39ab294d Logging for testing 2014-04-16 16:37:38 -04:00
drigato
837decb5c3 Logging for testing 2014-04-16 16:36:19 -04:00
drigato
284a1b8895 Upgrade logging test 2014-04-16 16:29:36 -04:00
drigato
db62ffff90 Log statment for testing upgrades 2014-04-16 16:01:48 -04:00
drigato
634b429391 Logging statment for testing upgrades - will be removed 2014-04-16 15:56:45 -04:00
drigato
d05eae629a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 12:16:08 -04:00
drigato
f5a2e59b6d Removed disk space check from StoredFile. This is now done in the Media controller 2014-04-16 12:15:34 -04:00
drigato
5045d3ab7c Remove logging statements 2014-04-16 12:11:46 -04:00
drigato
10cf16f53a Logging statments 2014-04-16 12:04:18 -04:00
drigato
51af3ba36e Undo-ing imported filepath change 2014-04-16 11:56:14 -04:00
drigato
368be9002e Changing imported path for ftp script 2014-04-16 11:54:20 -04:00
drigato
a4b1db91b1 Logging for ftp 2014-04-16 11:41:29 -04:00
drigato
9cea1f079b Logging for ftp script 2014-04-16 11:31:42 -04:00
drigato
0c2092b33f Logging for ftp script 2014-04-16 11:04:46 -04:00
drigato
cf13952b45 Logging messages for debugging the ftp script 2014-04-16 11:01:02 -04:00
drigato
87f365038f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:22:15 -04:00