Commit graph

249 commits

Author SHA1 Message Date
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