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
9cfdb04c89 Logging statements 2014-05-08 10:57:35 -04:00
drigato
8ea8226299 Removed some logging statements 2014-05-08 10:55:47 -04:00
drigato
f5e7c7e796 Logging statements 2014-05-08 10:51:55 -04:00
drigato
4c0d3a9d04 More logging statements for debugging 2014-05-08 10:50:49 -04:00
drigato
82ef08ad1e Logging statements 2014-05-08 10:45:22 -04:00
drigato
c291439483 Adding back analyzer deadlock workaround. 
Removing command to delete empty sub folders inside organize.
 2014-05-07 15:01:31 -04:00
drigato
83d9ec413d Commenting out where we delete empty sub folders inside organize folder 2014-05-07 13:58:39 -04:00
drigato
be69d956aa Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
 2014-05-06 14:52:50 -04:00
drigato
bc080a26f7 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
 2014-05-06 14:50:13 -04:00
drigato
eafbd7d5e9 CC-5838: Editing a repeating show yields in error if an instance is in the past 
Was not checking if show is repeating properly
 2014-05-06 13:01:20 -04:00
Albert Santoni
e963157a22 Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:49 -04:00
Albert Santoni
f89c66922b Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:42 -04:00
drigato
5762bb9df5 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-05 12:26:01 -04:00
drigato
16fb9d75d3 Changed GetDiskUsage so it will always return 0 if the value has not been set yet 2014-05-05 12:25:42 -04:00
drigato
a8c428bfb0 Fix disk quota message 2014-05-05 11:52:13 -04:00
drigato
e11afd4e71 Fix for new saas instances getting created with a 'disk quota reached' message 2014-05-05 11:41:43 -04:00
drigato
39db3d4aee Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-05-05 11:21:02 -04:00
drigato
094382c766 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-05-05 11:19:27 -04:00
drigato
e4e5590b9f CC-5802: Upgrade application.ini file 
Remove this upgrade step from the upgrade controller
 2014-05-05 11:19:14 -04:00
Albert Santoni
250d5d083e Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-02 16:06:15 -04:00
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