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

12627 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
5873f7b60a Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-25 14:16:29 -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
Albert Santoni
a43f487817 Fixed airtime-upgrade.php... 2014-04-25 12:19:18 -04:00
localizer
2be889f2af updated translation resources 2014-04-25 15:58:16 +00: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
Albert Santoni
ce9b9c7314 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-24 17:06:00 -04:00
Albert Santoni
e503c952d2 CC-5816: Publisher column 
* Kanye West support. Surely
 2014-04-24 17:05:38 -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
Albert Santoni
571e903871 Overwrite locale files with those from 2.5.x 2014-04-24 13:13:23 -04:00
Albert Santoni
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
Albert Santoni
caa82f2091 Regenerate messed up translations 2014-04-24 12:53:31 -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
Albert Santoni
bc72a6626e CC-5709: Airtime Analyzer 
* Fixed some unit tests that broken when I dropped python-magic in
  favour of mutagen for MIME type detection
 2014-04-23 18:20:50 -04:00
Albert Santoni
0a906ba6ec Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-23 17:42:52 -04:00
Albert Santoni
9fdfc0a957 CC-5709: Airtime Analyzer 
* Catch exceptions related to unpickling the HTTP request queue
 2014-04-23 17:42:09 -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
Albert Santoni
f2ce77fecb Remove python-magic 2014-04-23 14:20:48 -04:00
Albert Santoni
f98dabcc02 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-23 14:18:08 -04:00
Albert Santoni
4f3298b986 Installer fix 2014-04-23 14:17:58 -04:00
Naomi
e0d550c194 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-23 12:54:02 -04:00
Naomi
3e34f1cf96 fixing up some datatables queries, propel usage. 2014-04-23 12:53:43 -04:00
Albert Santoni
b920ed2598 Fixed a bunch of installer stuff for Naomi 2014-04-23 12:21:39 -04:00
Albert Santoni
41e2b5d840 Fix the failed uploads view 2014-04-23 11:52:10 -04:00
drigato
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
drigato
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
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
d01f5a4ffe Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-22 15:04:17 -04:00
Albert Santoni
d77f107df5 CC-5808: Fixed breakage at shutdown 2014-04-22 15:03:46 -04:00