Commit Graph

173 Commits

Author SHA1 Message Date
naomiaro 810aa3845b Merge branch 'airtime-1.6.1' of dev.sourcefabric.org:campcaster into airtime-1.6.1 2011-02-24 11:06:49 -05:00
naomiaro 860c70b21e fix for file metadata form. 2011-02-24 11:06:19 -05:00
martin dab39f391e -interface is now notified when a song starts playing. ON-AIR graphic only turns red after this notification. 2011-02-23 17:03:27 -05:00
martin 23e533aa67 -CC-1736: install/airtime-user.php script needs to be updated for the new Zend Framework 2011-02-22 19:01:33 -05:00
martin a20e279840 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	application/configs/conf.php
	install/airtime-install.php
2011-02-22 16:32:04 -05:00
martin 8ad5d23ee6 -api_key autogeneration and usage implemented 2011-02-22 16:16:37 -05:00
paul.baranowski 7e8f61549e Merged Naomi's change for CC-1955 2011-02-22 18:26:51 +01:00
paul.baranowski 15153727c1 CC-1971
Remove "?>" from the end of pure-PHP files to prevent "HEADERS ALREADY SENT"
2011-02-22 18:22:31 +01:00
Naomi 92545b53a6 CC-1955 2011-02-22 11:59:55 -05:00
martin 416c6ceb10 -fixed bug where a song would appear as current song and next song simultaneously.
-show background color switching on the list-view should now be instant.
2011-02-13 15:35:41 -05:00
martin 1d30c208f8 -fixed regression in day-view 2011-02-13 14:04:38 -05:00
martin a5fd68c252 -fixed UI freeze on some very special occasions
-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
2011-02-13 13:29:16 -05:00
naomiaro 7093ebd23f modified to avoid sql error when searching. 2011-02-12 23:07:28 -05:00
naomiaro bd2d560c1b ordering by login 2011-02-12 23:02:44 -05:00
naomiaro ddddcc9375 can make show as many hours long in duration as wanted. 2011-02-12 18:40:17 -05:00
naomiaro 54398b8c32 playlists with no content will be filtered in the schedule show dialog. 2011-02-12 17:26:02 -05:00
naomiaro a83a4b6bae show cancelling available (needed for repeating shows) 2011-02-12 17:21:37 -05:00
martin 6cf4310c24 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-11 18:13:38 -05:00
martin 43f7f8e103 -added help page
-added additional user info
2011-02-11 18:13:26 -05:00
Naomi f8d3a38b2e default fade setting for songs. 2011-02-11 17:46:55 -05:00
Naomi e38d825896 check if is an array for hosts. 2011-02-11 11:52:11 -05:00
Naomi da175e0702 admin users are hosts by default, host selection is no longer required, any admin user can schedule/maniuplate all shows. 2011-02-11 11:43:03 -05:00
Naomi 85ab11dc56 CC-1897 defaults to day of the week of start date. 2011-02-10 19:36:39 -05:00
Naomi d210a36358 new add show html. 2011-02-09 18:10:46 -05:00
mkonecny a447839745 -UI changes.
-Blank row now displays start and end time
-Changed default playlist name
2011-02-09 17:02:32 -05:00
mkonecny 28f3a77246 -day view now highlights current show 2011-02-09 15:45:45 -05:00
mkonecny c0d5cc4809 -list view updated 2011-02-09 14:09:42 -05:00
mkonecny 50054befd6 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	.zfproject.xml
	application/configs/airtime-conf.php
	build/build.properties
	public/css/styles.css
2011-02-09 13:07:36 -05:00
mkonecny 3b4fa1cc1a -added new users management screen 2011-02-09 13:03:46 -05:00
Naomi 3d3515812a added monthly show option, bit more javascript to show/hide info when not needed in add show tabs. 2011-02-08 18:22:51 -05:00
Naomi bdad3b34e0 CC-1862 playlist builder playlist fadein/out 2011-02-08 16:10:48 -05:00
Naomi 424c6f0193 CC-1887 shows are now resized properly with delta day. schedule dialog includes end day since shows can be longer than 1 day now, playlist search must look for an interval given the time increase. 2011-02-08 15:06:31 -05:00
mkonecny 16bdfb7611 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	public/css/styles.css
2011-02-07 19:06:06 -05:00
mkonecny bc5b9efb4b -changes to list view. Framework so that we may change selected day
-changes to add-user. Started implementing Vladimirs design.
2011-02-07 19:03:14 -05:00
naomiaro 8f8c4716cc first version of playlist builder with cues/fades. need to do some work to display errors, look to see if I can position the cursor better on the contenteditable spans within the lis because jQuery sortable is interfering with normal operation. don't have a fade in/out for theplaylist overall yet. 2011-02-07 18:44:42 -05:00
martin b6d2b0f942 -fixed potential bug for incorrect return value type. 2011-02-07 00:26:16 -05:00
naomiaro 0152514ef3 removed cc_show_schedule table. 2011-02-06 22:07:17 -05:00
martin fae1401568 -further fixes for naomis new layout 2011-02-06 20:12:56 -05:00
martin 8396e12df1 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-06 19:28:49 -05:00
martin 993b302f6b initial patch to fix problems with new tables schema. 2011-02-06 19:28:39 -05:00
naomiaro f04d03aef1 SCHEDULE TABLE ID CHANGE 2011-02-06 18:38:55 -05:00
naomiaro a5e4056555 missing check for shows in the middle. 2011-02-06 17:37:23 -05:00
naomiaro 75eea94641 changed back to old schedule id to test if playback works now. 2011-02-06 15:31:36 -05:00
naomiaro ebb43857f6 modified cc_schedule table, added foreign key to show instance id for easy clean up when show needs to be cleared/deleted. replaced primary key with a standard auto incrementing key for efficiency since the other key had no use. 2011-02-06 01:10:07 -05:00
naomiaro 14c71a3f39 getting tired.... 2011-02-05 23:50:43 -05:00
naomiaro 76b2f6e80b order by didn't work for full calendar 2011-02-05 23:49:27 -05:00
naomiaro aef4654a3f CC-1770 clear the days chosen if the show doesn't repeat. 2011-02-05 23:42:57 -05:00
naomiaro 13847e738b adding bi-weekly show option. new structure allows for different repeat types to be specified.
new playlist builder css/images.
2011-02-05 23:21:52 -05:00
naomiaro cb3f4dd31e error messages for show moving/resizing displayed in an alert. 2011-02-05 22:02:45 -05:00
naomiaro 55eddb133b fixed schedule content check 2011-02-05 21:54:15 -05:00