Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/python_apps
History
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 		2013-01-15 13:44:44 -05:00
..
api_clients upgrade version number to 2.3.0 2013-01-15 12:31:41 -05:00
icecast2 remove \r line endings 2012-10-30 13:23:09 -04:00
media-monitor Merge branch '2.2.x' 2012-10-26 00:31:12 -04:00
media-monitor2 remove whitespace 2013-01-03 15:05:31 -05:00
monit CC-3520: Change default password of monit 2012-04-01 00:20:47 -04:00
pypo Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
python-virtualenv Removed gevent from pybundle 2012-11-02 15:03:27 -04:00
std_err_override CC-3691: Pypo needs to write stderr + stdout to the log file 2012-04-20 19:12:36 -04:00
create-pypo-user.py CC-3572: pypo user should have shell set to /bin/false 2012-03-31 22:11:12 -04:00
remove-pypo-user.py -create-pypo-user scripts missing an "import sys" 2011-06-16 17:30:16 -04:00