Commit Graph

32 Commits

Author SHA1 Message Date
Albert Santoni 35e98e468d Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
2014-07-02 13:43:09 -04:00
Albert Santoni 72ef576f03 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-23 15:28:50 -04:00
Albert Santoni 24d842c4a6 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
Albert Santoni a2bef67d33 Fix user session storage in multi-tenancy mode 2014-06-23 15:22:44 -04:00
drigato f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni 7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -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
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
drigato f536a7b1b4 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -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 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
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
2014-03-27 16:38:03 -04:00
drigato 64c1dd2c1e CC-5701: Airtime File API
Beginnings of fil rest api
index, get, post actions working without authentication
2014-02-27 17:11:17 -05:00
Martin Konecny 9d6f2ebdf4 remove unecessary code 2013-01-25 12:32:37 -05:00
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
-fixed
2013-01-25 11:21:34 -05:00
Martin Konecny 178abcfada CC-4785: Zend errors on page not found
-partially fixed
2013-01-08 15:14:33 -05:00
Martin Konecny 87fb9998dd increase mem warning limit to 30MB 2012-09-12 15:44:26 -04:00
Martin Konecny d20c450226 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
-some major refactoring before fixing this problem
2012-09-07 17:38:24 -04:00
Martin Konecny 089e896552 fix camelCase of function 2012-09-07 14:34:58 -04:00
Martin Konecny cef3ffb07b CC-4265: Keep track of how much memory each request is taking and log if over a threshold
-fixed
2012-08-22 14:01:44 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
Martin Konecny d9cde230cd CC-4090: Make code style PSR compliant
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
Naomi Aro 905775552d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-27 14:34:27 -08:00
Martin Konecny a55b47efff -Allow etc and stor directories to be configurable 2011-12-22 17:21:18 -05:00
Naomi Aro 52b0e3c5f9 CC-3110 : Password reset
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
martin dfe43c98bb CC-2833: Use ClassLoaders for PHP Files
-autoload RabbitMq class
2011-09-26 15:19:23 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files
-Done for class Schedule and ScheduleGroup
2011-09-23 16:50:00 -04:00
martin 2c2bb86698 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
2011-09-13 14:56:24 -04:00
martin b538f1cc82 CC-1942: Add ability to set timezone in preferences
-change timezone in python
2011-08-15 10:06:42 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00