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
|
bc5c5a3fb5
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-05-05 18:27:14 -04:00 |
|
Albert Santoni
|
ed494ac587
|
Some defensive code against multiprocess related deadlocks
* Reinitialize logging in child processes so we don't inherit locks.
Might be causing a deadlock we're seeing on Pro right now.
|
2014-05-05 18:25:47 -04:00 |
|
Albert Santoni
|
7073c31531
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-05-05 14:56:59 -04:00 |
|
Albert Santoni
|
d063700254
|
CC-5834: Airtime Analyzer: Bitrate is missing
* Fixed
|
2014-05-05 14:56:32 -04:00 |
|
Albert Santoni
|
13b6591dc1
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-05-05 14:39:55 -04:00 |
|
Albert Santoni
|
22343ed99c
|
Fixed bitrate import in airtime_analyzer
|
2014-05-05 14:39:36 -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
|
d09021b5b7
|
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
|
2014-05-05 11:19:49 -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
|
5dab498041
|
Removed this silly airtime-update-db-settings script
* No longer needed, was a horrible hack in the first place.
|
2014-05-02 17:16:03 -04:00 |
|
Albert Santoni
|
1c33da948e
|
Removed per-instance application.ini customizations
|
2014-05-02 16:14:06 -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
|
c81a20e977
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-05-01 10:59:29 -04:00 |
|
drigato
|
9cd200d42f
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2014-05-01 10:59:03 -04:00 |
|
drigato
|
721e4e1a4a
|
CC-5806: Airtime Analyzer: Please implement "remove all files"
|
2014-05-01 10:58:51 -04:00 |
|
Albert Santoni
|
5160063f70
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-30 18:46:50 -04:00 |
|
Albert Santoni
|
c11e39f933
|
Fixed python-magic dependency
|
2014-04-30 18:46:37 -04:00 |
|
Albert Santoni
|
0183e2282f
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-30 18:44:17 -04:00 |
|
Albert Santoni
|
abcdf5ea6a
|
CC-5824: Airtime Analyzer: Flac file was uploaded but AA says it's
failed
* Fixed
|
2014-04-30 18:42:13 -04:00 |
|
Albert Santoni
|
ace03edd2e
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2014-04-30 18:32:42 -04:00 |
|
Albert Santoni
|
26a39ed2db
|
CC-5823: Airtime Analyzer: Wav file uploading fails with zero length and
empty mime
* Fixed
|
2014-04-30 18:32:17 -04:00 |
|
Albert Santoni
|
c2f6032c8b
|
Fixed the upstart config
|
2014-04-30 17:56:02 -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
|
f9f9e2458e
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2014-04-28 14:45:05 -04:00 |