9a0abb29b3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 15:52:49 -04:00
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
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
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
325310f681
CC-5818: Fix Live Chat on Airtime Pro (2.5.3)
2014-04-28 11:23:59 -04:00
b4a9882e9c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 10:27:07 -04:00
d081ff10b2
CC-5807: Disk Space will be updated when file is not actually deleted
2014-04-28 10:25:36 -04:00
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
42806b1cbf
CC-5802: Upgrade application.ini file
2014-04-28 09:43:21 -04:00
2fdb8d1deb
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 15:00:29 -04:00
8d9b9c1fb7
Moved deleting the maintenace temporary file flag to very end of upgrade task
2014-04-25 15:00:13 -04:00
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
66000a2847
CC-5802: Upgrade application.ini file
...
Changed where we insert new application.ini file lines
2014-04-25 14:53:58 -04:00
61df7c1a44
Moved some comments around
2014-04-25 14:20:04 -04:00
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
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
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
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
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
25e484cc2f
Delete code that was copied in twice
2014-04-25 10:22:38 -04:00
22b9cc3be1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:08:24 -04:00
d9adba117a
One more time...
2014-04-25 01:08:08 -04:00
7a2f27fe41
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:03:05 -04:00
cdc88d25e1
Argh, fixed typo... it's late
2014-04-25 01:02:47 -04:00
3e2a165dd2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 00:48:54 -04:00
e7ea5e5301
Try fixing UpgradeController version check again...
2014-04-25 00:48:13 -04:00
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
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
42f3bb17e1
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:23:57 -04:00
f536a7b1b4
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:19:55 -04:00
571e903871
Overwrite locale files with those from 2.5.x
2014-04-24 13:13:23 -04:00
4b916f74b2
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-04-24 12:53:48 -04:00
caa82f2091
Regenerate messed up translations
2014-04-24 12:53:31 -04:00
fcd8ea8ba5
CC-5802: Upgrade application.ini file
2014-04-24 10:22:52 -04:00
069ebd3991
CC-5802: Upgrade application.ini file
2014-04-24 10:12:24 -04:00
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
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
2f8461b2a6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-23 14:58:36 -04:00
3e34f1cf96
fixing up some datatables queries, propel usage.
2014-04-23 12:53:43 -04:00
41e2b5d840
Fix the failed uploads view
2014-04-23 11:52:10 -04:00
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
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
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
e7482e52f7
Double equals typo *ducks*
2014-04-22 15:56:29 -04:00
dc27465b21
Fix config parsing for dev_env
...
Conflicts:
airtime_mvc/application/configs/conf.php
2014-04-22 15:29:21 -04:00
97ce5bdbc5
Fix config parsing for dev_env
2014-04-22 15:27:43 -04:00
43483dc112
Added dev env to RabbitMQ stuff for Analyzer (fixed)
2014-04-22 12:28:20 -04:00
a79f53758f
Fixed the RabbitMQ thingy
2014-04-22 11:40:35 -04:00
f106bf8fad
Separate RabbitMQ settings by development environment
2014-04-22 11:13:15 -04:00
411af6838b
Remove logging statement
2014-04-17 17:02:14 -04:00
drigato
Albert Santoni
Naomi