Commit Graph

3726 Commits

Author SHA1 Message Date
martin 9cfb968011 -empty shows should now show up on the now-playing view 2011-03-07 14:49:16 -05:00
martin f4f35cd813 -fix include mistake 2011-03-07 14:04:47 -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
martin c4a84f3920 -renamed file + removed ignoring tracks due to liquidsoap problem 2011-03-07 13:57:38 -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 76b1e3b7f7 upload function now included into record script. 2011-03-07 12:43:52 -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 8e8dfacfb4 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-06 16:57:52 -05:00
martin 6c70e4994f -small fix to allow overlapping of scheduled items. 2011-03-06 16:57:42 -05:00
Naomi cf5b24dc8c added one minute resolution.. why not? 2011-03-06 16:50:26 -05:00
Naomi 9509dc52e0 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-06 16:45:19 -05:00
Naomi b4207698c3 uploading a recorded file via multipart form http request. 2011-03-06 16:45:11 -05:00
martin 9aec669104 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-06 15:18:51 -05:00
martin 75167bb576 -syntax error fix for liquidsoap + other small changes 2011-03-06 15:18:40 -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 f4a86d96c6 -fix for missing GreenBox.php file 2011-03-05 21:58:36 -05:00
Naomi 6d792c0ca5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-05 13:24:37 -05:00
Naomi e2406e2501 ecasound 2.7.2 (2010) package. ubuntu's ecasound package is only at ecasound 2.2 way back from 2003. had to modify ecacontrol.py to use subprocess module instead of deprecated popen2 2011-03-05 13:24:27 -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 afaea87319 -fix pypo version string validation 2011-03-04 11:48:43 -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
martin c9c47c7d5f Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-03 00:36:34 -05:00
martin 0d4a006c19 -refactored pypo-cli into 3 seperate classes 2011-03-03 00:22:28 -05:00
martin 6e5c479baa -refactored pypo-cli 2011-03-02 17:26:39 -05:00
martin 64d15669ac -fading between sources in liquidsoap
-cleaned up pypo-cli
2011-03-02 16:43:46 -05:00
Paul Baranowski 2143a797fa CC-2003: Admin interface footer says GNU GPL v.2, license file says GNU GPL v.3.
Fixed.
2011-03-02 15:16:28 -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
Naomi 3f2d908f1a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-01 12:26:01 -05:00
Naomi 94567ed046 CC-1969 made all menus left click activated instead to prevent mac problems. metadata for a file can now be seen by hovering over the "type" icon 2011-03-01 12:25:20 -05:00
martin 2e14bcc9ff Merge branch 'airtime-1.6.1'
Conflicts:
	CREDITS
	application/views/scripts/login/index.phtml
2011-03-01 11:38:01 -05:00
martin f236804bb4 -updated version string numbers 2011-03-01 11:34:06 -05:00
martin c936d28d3a -updated Airtime version string to 1.7.0-alpha 2011-03-01 11:10:48 -05:00