Commit Graph

180 Commits

Author SHA1 Message Date
martin e16dd6c486 early implementation of CC-1962 2011-03-06 00:08:02 -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
martin cb119802df -further modifications to now-playing view with grouping by shows 2011-03-04 23:53:29 -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
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
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 2d95a90049 CC-1952 cannot delete a file that is scheduled in the future. 2011-02-22 11:44:23 -05:00
paul.baranowski 2fbabd82eb CC-1930 Improve right-click menu on the schedule so the most common actions are first 2011-02-14 13:30:52 +01:00
paul.baranowski 6c273739b4 CC-1930 Improve user interface design and wording for show/playlist workflow 2011-02-14 13:05:22 +01:00
naomiaro a83a4b6bae show cancelling available (needed for repeating shows) 2011-02-12 17:21:37 -05:00
Naomi d9118fe2d0 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	public/css/styles.css
2011-02-11 18:59:27 -05:00
Naomi 89267748d4 CC-1916 playlist metadata page looks better. 2011-02-11 18:55:08 -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 12dbdf8f4c CC-1915 playlist name no longer required in form, defaults to "Untitled Playlist" 2011-02-11 15:59:16 -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
naomiaro 5468db39e8 admin can do anything a host of a show can 2011-02-11 00:10:56 -05:00
mkonecny cf004abb44 -small fixes
-about popup without styling added
2011-02-10 20:48:26 -05:00
Naomi 81d66ebbb6 day selection change 2011-02-10 18:40:30 -05:00
Naomi 36193d2948 airtime menu now uses ACL with the custom viewscript. 2011-02-10 18:03:41 -05:00
Naomi 27b462d638 new acl permissions, add show form is done by ajax request now. 2011-02-10 17:12:05 -05:00
Naomi 2b5927bf33 add show form sent via ajax request, opens sections with errors if not completed properly. 2011-02-10 15:00:55 -05:00
Naomi ac86fc50e8 add show button only appears for admin users 2011-02-10 11:25:28 -05:00
naomiaro aa7dfd8072 forgot to include contextmenu.css 2011-02-10 00:20:03 -05:00
naomiaro 675f1ae86a add show/schedule now on one page. 2011-02-10 00:17:07 -05:00
naomiaro d5efcac452 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 22:37:26 -05:00
naomiaro 59ef9ee6a0 starting advanced search 2011-02-09 22:37:18 -05:00
Naomi d210a36358 new add show html. 2011-02-09 18:10:46 -05:00
mkonecny eab3675c74 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 17:02:44 -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
Naomi 86d1aafed4 can now change name/description of a playlist. 2011-02-09 16:53:11 -05:00
Naomi 108bf65930 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/ScheduleController.php
2011-02-09 14:15:18 -05:00
Naomi be5ec4c45d working on editing shows 2011-02-09 14:12:07 -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 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
mkonecny 6c860dcff5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-07 12:37:12 -05:00