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

4949 commits

Author SHA1 Message Date
Albert Santoni
4b4fd5432f Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-05-02 15:52:31 -04:00
Albert Santoni
2d6748457c Remove database credentials from application.ini 2014-05-02 15:50:37 -04:00
drigato
721e4e1a4a CC-5806: Airtime Analyzer: Please implement "remove all files" 2014-05-01 10:58:51 -04:00
drigato
cb20c30723 CC-5806: Airtime Analyzer: Please implement "remove all files" 
saas-specific changes for updating disk_usage
 2014-04-29 16:08:03 -04:00
drigato
b0a711d918 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 16:06:43 -04:00
drigato
a5eb5e9901 CC-5806: Airtime Analyzer: Please implement "remove all files" 2014-04-29 16:06:25 -04:00
drigato
88b6b28c62 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 11:09:55 -04:00
drigato
04da9b3d61 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 
Imported file path had album name twice - fixed
 2014-04-29 11:09:31 -04:00
drigato
f0fdf85524 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 10:35:58 -04:00
drigato
94375ee441 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 
Cleaner way of removing empty sub folders after ftp uploads
 2014-04-29 10:35:39 -04:00
drigato
6adb7c53ae Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 10:05:35 -04:00
drigato
6f1dd7987f CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 2014-04-29 10:05:17 -04:00
drigato
c3c5720dac Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 16:25:13 -04:00
drigato
79687499aa Logging statement. To remove later. 2014-04-28 16:24:59 -04:00
drigato
48742abd6b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 16:20:44 -04:00
drigato
f428a2d960 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 
Delete the empty folder after files have been copied into imported
 2014-04-28 16:20:26 -04:00
drigato
9a0abb29b3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 15:52:49 -04:00
drigato
c586e3e2b8 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 
Was using wrong position when using substr()
 2014-04-28 15:52:08 -04:00
drigato
0c0c65f69b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-04-28 14:46:03 -04:00
drigato
fae5b15a9f CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 
$_FILES does not store the original file path so we were losing the folder name.
Fixed by explicitly passing the full filepath in via the ftp-upload-hook.sh script
 2014-04-28 14:44:52 -04:00
drigato
b4a9882e9c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 10:27:07 -04:00
drigato
d081ff10b2 CC-5807: Disk Space will be updated when file is not actually deleted 2014-04-28 10:25:36 -04:00
drigato
1de58c64d6 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-28 09:44:14 -04:00
drigato
42806b1cbf CC-5802: Upgrade application.ini file 2014-04-28 09:43:21 -04:00
drigato
2fdb8d1deb Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 15:00:29 -04:00
drigato
8d9b9c1fb7 Moved deleting the maintenace temporary file flag to very end of upgrade task 2014-04-25 15:00:13 -04:00
drigato
f98b03f270 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 14:54:47 -04:00
drigato
66000a2847 CC-5802: Upgrade application.ini file 
Changed where we insert new application.ini file lines
 2014-04-25 14:53:58 -04:00
drigato
61df7c1a44 Moved some comments around 2014-04-25 14:20:04 -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
drigato
f432ea9f75 CC-5802: Upgrade application.ini file 
Execute raw sql upgrade file at the end in case errors occured during the upgrade before it gets executed
 2014-04-25 14:16:18 -04:00
drigato
aeec9172f9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 11:16:21 -04:00
drigato
1009719e1c Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-25 11:05:51 -04:00
drigato
6890dcc3bc CC-5802: Upgrade application.ini file 
Used a transaction for upgrades. If upgrading the application.ini file fails, the database upgrades will get rolled back.
 2014-04-25 11:05:33 -04:00
drigato
25e484cc2f Delete code that was copied in twice 2014-04-25 10:22:38 -04:00
Albert Santoni
22b9cc3be1 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 01:08:24 -04:00
Albert Santoni
d9adba117a One more time... 2014-04-25 01:08:08 -04:00
Albert Santoni
7a2f27fe41 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 01:03:05 -04:00
Albert Santoni
cdc88d25e1 Argh, fixed typo... it's late 2014-04-25 01:02:47 -04:00
Albert Santoni
3e2a165dd2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 00:48:54 -04:00
Albert Santoni
e7ea5e5301 Try fixing UpgradeController version check again... 2014-04-25 00:48:13 -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
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