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 |
|
drigato
|
53ffa29b6b
|
CC-5786: Quota Enforcement in the File Upload API
small fix
|
2014-04-14 12:21:59 -04:00 |
|
drigato
|
e8cf288d5d
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-14 12:14:02 -04:00 |
|
drigato
|
acf91bc627
|
CC-5786: Quota Enforcement in the File Upload API
Small refactor
|
2014-04-14 12:13:48 -04:00 |
|
drigato
|
9041801103
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-14 12:09:48 -04:00 |
|
drigato
|
63e2eda64b
|
CC-5786: Quota Enforcement in the File Upload API
Tweaked this so it will work on self-hosted instances
|
2014-04-14 12:09:15 -04:00 |
|
drigato
|
edcf8844e3
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-14 11:25:02 -04:00 |
|
drigato
|
4add0f0b7b
|
CC-5786: Quota Enforcement in the File Upload API
|
2014-04-14 11:24:39 -04:00 |
|
drigato
|
4afccfe225
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-10 15:55:49 -04:00 |
|
drigato
|
7fbd285dd0
|
Fix typo
|
2014-04-10 15:55:21 -04:00 |
|
drigato
|
51c80bc033
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-10 15:50:58 -04:00 |
|
drigato
|
819862c37b
|
CC-5781: Upgrade script for new storage quota implementation
cleaned up upgrade controller
|
2014-04-10 10:55:47 -04:00 |
|
drigato
|
b9b3e95caa
|
CC-5781: Upgrade script for new storage quota implementation
Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
|
2014-04-10 09:28:23 -04:00 |
|
drigato
|
bae0c564d0
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2014-04-10 07:12:52 -04:00 |