Commit Graph

263 Commits

Author SHA1 Message Date
Naomi 3a0f9ddcd1 CC-1987 : Automatic upload of recorded shows to Soundcloud
Added fields to preference form for the station's soundcloud user/pass
need to generalize file upload as commented out in the new Soundcloud.php file.
2011-03-18 17:15:12 -04:00
Naomi 5ddd670979 CC-1630 : Automatic recording of shows
not going to use ECI python bindings, has deprecated code in the ubuntu package currently
also simpler just to call a subprocess
2011-03-18 15:33:23 -04:00
naomiaro 28b7d8e882 CC-1985 : Automatic rebroadcast of recorded content
can't move a rebroadcast show infront of it's original recorded show,
know how to print form element errors out in a custom view script,
removed show content option from a recorded show's context menu.
2011-03-18 00:20:38 -04:00
naomiaro e3e8f10021 CC-1985 : Automatic rebroadcast of recorded content
added url column to cc_shows table, logic to show/hide form components for rebroadcast
2011-03-17 18:23:05 -04:00
naomiaro 20f3c49dcb CC-1985 : Automatic rebroadcast of recorded content
rebroadcast shows are automatically resized if parent recorded shows are altered.
progress bar is removed from recorded/rebroadcast shows, waiting on special icons.
2011-03-16 11:33:08 -04:00
naomiaro 8f86b05a4b Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/ScheduleController.php
	public/css/styles.css
2011-03-15 17:02:22 -04:00
naomiaro bd81b0cd4f CC-1985 : Automatic rebroadcast of recorded content
working on disabling resizing of a rebroadcast show.
2011-03-15 16:39:52 -04:00
naomiaro 29816f32fa CC-1985 : Automatic rebroadcast of recorded content
can add absolute dates/times for non repeating show instances to rebroadcast.
2011-03-15 15:20:10 -04:00
naomiaro 6ef4169315 CC-1985: Automatic rebroadcast of recorded content
populates rebroadcast show instances now, added a new table cc_show_rebroadcast,
added columns record, rebroadcast, instance_id, file_id to cc_show_instances table.
added column record to cc_show_days.
2011-03-15 12:05:41 -04:00
martin a947306222 CC-2002
GUI changes done
2011-03-11 13:56:13 -05:00
martin 55745d1a4a CC-2025
Indicate songs that are over-booked
2011-03-10 19:28:57 -05:00
martin d2fdb0008a CC-1848
-shows in progress can now be cancelled.
2011-03-10 16:41:41 -05:00
martin 7c1739247d -doctrine 2.0 alpha upgrade scripts 2011-03-08 16:44:47 -05:00
martin 9cfb968011 -empty shows should now show up on the now-playing view 2011-03-07 14:49:16 -05:00
martin fc35a730b9 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-07 14:01:18 -05:00
martin 0b7ba74bc9 -do not send over-booked items to pypo 2011-03-07 14:01:08 -05:00
Naomi 1e94578f13 so no playlists show up on left side when a show is overbooked. 2011-03-07 12:59:46 -05:00
Naomi dc0ea0a532 edits to show class to support resizing/dragging with overbooking. 2011-03-07 12:43:05 -05:00
paul.baranowski 17e848c549 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-06 22:43:07 -05:00
paul.baranowski a9fd71454b Removed BasicStor.php, it is no longer needed. 2011-03-06 22:42:52 -05:00
martin 6c70e4994f -small fix to allow overlapping of scheduled items. 2011-03-06 16:57:42 -05:00
paul.baranowski e6c6365591 Got rid of global variable $g_metadata_xml_to_db_mapping, put the mapping
inside of the Metadata class.
2011-03-06 11:35:10 -05:00
paul.baranowski 3727195c54 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-06 11:05:23 -05:00
paul.baranowski 95a4694b5a Created a new Metadata class to hold static functions which parse audio
file metadata.  This got rid of the "camp_" prefixes on the function names.
2011-03-06 11:05:12 -05:00
martin c2903c4198 -updated now playing view to show only only currently playing item. 2011-03-06 00:16:31 -05:00
martin e16dd6c486 early implementation of CC-1962 2011-03-06 00:08:02 -05:00
martin 77f78ebbb6 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-05 12:29:06 -05:00
martin 93874af2b8 -improved code for shows grouping in now playing view 2011-03-05 12:28:48 -05:00
Naomi 4b4174fe50 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-05 11:54:05 -05:00
Naomi f68a8f67ea soundcloud python/php apis, recorder python script so far. 2011-03-05 11:53:29 -05:00
paul.baranowski 1c2ff6c150 Removed even more old code, getting closer to a clean code base!
Added (temporary file) for SQL upgrade script to remove unused database tables.
2011-03-05 11:51:56 -05:00
paul.baranowski 90b46d8eb3 Removing lots of old code that is no longer used. 2011-03-05 11:06:22 -05:00
martin cb119802df -further modifications to now-playing view with grouping by shows 2011-03-04 23:53:29 -05:00
martin 38856c4af7 -began adding grouping by shows for the datatable. 2011-03-04 18:26:22 -05:00
martin d22ab329d8 -CC-1944 2011-03-04 12:07:22 -05:00
martin 25237087a2 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-03 20:14:07 -05:00
martin 2346be671e -initial changes for CC-1944 2011-03-03 20:13:55 -05:00
Paul Baranowski 7b58f3563f Cleaned up conf.php to make it more obvious what a user should change and what they shouldnt.
Removed old code that isnt used anymore.

Changed the login screen to use config variables for AIRTIME_VERSION.
2011-03-03 18:08:51 -05:00
martin 9759efc6cf -restore point... 2011-03-03 14:35:27 -05:00
Naomi b3e111b0a0 tested deleting files, will unlink file from stor folder, will delete file from all playlists if not scheduled 2011-03-02 11:47:07 -05:00
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
naomiaro bb5a2af142 can delete a show instance 2011-02-05 20:39:35 -05:00
naomiaro 5aca6cd8bb incorrectly set starts when not needed. 2011-02-05 20:17:46 -05:00
naomiaro 85a936eb41 can only resize a show if scheduled content allows. 2011-02-05 20:11:45 -05:00
naomiaro 258157d92c reschedules a show's content when it is successfully moved on the schedule. 2011-02-05 20:04:24 -05:00
naomiaro 12cd80fe13 can schedule/remove playlists from a show instance. 2011-02-05 19:42:03 -05:00
naomiaro 51b6a79f6f everything moved to its new class, now just testing, context menu works. 2011-02-05 19:10:34 -05:00
naomiaro bfc1bccfdf beginning of making a separate ShowInstance vs Show class. 2011-02-05 18:20:51 -05:00
naomiaro bc6dd374f4 can't move a show into the past. 2011-02-05 17:19:54 -05:00
naomiaro c45437633b checks for moving/resizing an instance of a show. 2011-02-05 16:34:58 -05:00
naomiaro 78f83f5f6e Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-05 16:00:11 -05:00