Commit Graph

13 Commits

Author SHA1 Message Date
james 061dec14aa CC-2289:Differentiate between time and duration
- modified createNewFormSections function so it populate form
with defalt value
2011-06-13 14:20:57 -04:00
martin 1540e593e4 Merge branch '1.8.2' into devel
Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start
2011-06-03 17:29:55 -04:00
martin eee885f746 cc-2344: wrong song displayed
-removed unnecessary code.
2011-06-03 17:06:47 -04:00
martin e69f9497ed cc-2344: wrong song displayed
-fixed #2
2011-06-03 17:03:11 -04:00
martin c9c9ecf2cd cc-2344: wrong song displayed
-fixed
2011-06-03 16:36:13 -04:00
martin e969baee1c cc-2359: record check box is disabled after update show
-fixed
2011-06-03 14:01:58 -04:00
martin b747ce6fb0 cc-2344: wrong song displayed
-fixed
2011-06-02 12:45:57 -04:00
martin bc640d38f2 cc-2167-top-panel-doesn't-list-recording-shows 2011-05-10 19:06:35 -04:00
mkonecny 9638f6dd3e cc-2167: now playing view with recording shows a gap
-implemented
2011-05-05 16:45:13 -04:00
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
2011-04-25 17:24:53 -04:00
Paul Baranowski 07633ea249 CC-2225 airtime-clean-storage doesnt work
CC-2224 airtime-import checks if you can write to the stor directory even if you are linking

Had to rewrite the airtime-clean-storage script.
2011-04-25 16:48:34 -04:00
martin e48f044e56 -CC-2192: Schedule sent to pypo is not sorted by start time. 2011-04-15 12:26:59 -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