Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py

2012-03-12 17:52:17 -04:00

..

airtime

CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table

2012-03-02 12:22:08 +01:00

formatters

CC-3174 : showbuilder

2012-03-06 13:19:20 +01:00

tests

CC-3297: Depend on zendframework and php-pear as external packages

2012-02-06 14:18:03 -05:00

Alib.php

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

Auth.php

CC-3110 : Password reset

2011-12-27 14:33:22 -08:00

Dashboard.php

-better naming of show instance functions

2011-11-11 22:24:37 -05:00

Datatables.php

CC-733 : broadcast logs

2012-03-12 11:47:25 +01:00

DateHelper.php

SAAS-94: Phone home metrics: Gather info about streaming setup

2011-12-19 15:45:44 -05:00

Email.php

CC-3110 : Password reset

2011-12-27 14:33:22 -08:00

genres.xml

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

LoginAttempts.php

CC-2789: Prevent brue-force password guessing attacks

2011-09-13 14:16:16 -04:00

MusicDir.php

CC-2977: Never delete files from the database

2012-01-12 17:55:05 -05:00

Nowplaying.php

Merge branch '2.0.x' into devel

2012-03-12 17:52:17 -04:00

Playlist.php

CC-3351 : Track length should only show to tenths of a second in the library

2012-02-24 15:07:04 +01:00

PlayoutHistory.php

CC-733 : playout history

2012-03-09 11:13:32 +01:00

Preference.php

SAAS-196: Stats: Check if easy_install installation method detection

2012-02-17 15:40:37 -05:00

Prefs.php

CC-2833: Use ClassLoaders for PHP Files

2011-09-22 12:24:17 -04:00

RabbitMq.php

CC-3336: Refactor schedule API used by pypo

2012-02-28 22:33:19 -05:00

Schedule.php

Merge branch '2.0.x' into devel

2012-03-12 17:52:17 -04:00

ScheduleGroup.php

CC-2833: Use ClassLoaders for PHP Files

2011-09-26 15:19:23 -04:00

Scheduler.php

CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table

2012-03-01 14:59:06 +01:00

ServiceRegister.php

CC-2750: Ability to query health status for pypo,

2011-10-04 15:49:02 -04:00

Show.php

Merge branch '2.0.x' into devel

2012-03-12 17:52:17 -04:00

ShowBuilder.php

CC-3174 : showbuilder

2012-03-12 13:25:03 +01:00

ShowInstance.php

Merge branch '2.0.x' into devel

2012-03-12 17:52:17 -04:00

Soundcloud.php

CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu

2011-10-22 11:34:04 -04:00

StoredFile.php

CC-3174 : showbuilder

2012-03-12 15:32:24 +01:00

StreamSetting.php

CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback

2012-02-10 18:43:40 -05:00

Subjects.php

CC-2848: Misc bugs from demo service

2011-11-10 15:35:27 -05:00

Systemstatus.php

CC-3346: Recorder: Merge recorder with pypo

2012-02-24 14:11:35 -05:00

User.php

CC-3174 : showbuilder

2012-03-12 15:32:24 +01:00

XmlParser.php

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