Commit graph

3697 commits

Author SHA1 Message Date
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
martin
cb3db81f97 -updated CREDITS file 2011-03-01 10:44:38 -05:00
martin
b15dd3ba1d -updated Airtime version strings 2011-03-01 10:38:48 -05:00
martin
1c9062d939 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-28 23:52:01 -05:00
martin
781ceeaa7f -web streaming enabled in liquidsoap script.
-liquisoap scripts updated
2011-02-28 23:51:42 -05:00
paul.baranowski
63b62fb90a CC-1980 Demo track 'This is Your Life' by Ahoora is distorted
Removed the file.
2011-02-28 19:07:14 -05:00
martin
d47fc41082 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-28 13:27:26 -05:00
martin
2818cc95b7 -added liquibase support 2011-02-28 13:27:12 -05:00
mkonecny
ba330b94df -cleanup + recursive directors can be specified for $baseFilesDir 2011-02-28 00:54:10 -05:00
mkonecny
6864a246f3 -fixed so that baseFilesDir is set only once in conf.php 2011-02-28 00:39:55 -05:00
martin
6f73e6303b Merge branch 'airtime-1.6.1' 2011-02-24 15:17:37 -05:00
martin
bf25de9ce4 -fixed synchronization of song-start to ui-start after very long playback (greater than 48 hours) 2011-02-24 15:16:27 -05:00
mkonecny
f813380b8f Merge branch 'airtime-1.6.1' 2011-02-24 13:27:27 -05:00
martin
bc7d2ec8d5 Merge branch 'airtime-1.6.1' 2011-02-24 12:03:44 -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
naomiaro
db0f619eb0 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-23 18:29:14 -05:00
naomiaro
eae196f58b IE8 doesn't support runtime html5 in plupload, defaults to html4 runtime for IE. upgrading to newer plupload then solved IE specific problems setting a form's content type. 2011-02-23 18:28:51 -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
6b615b4e70 -small js fix for IE8 2011-02-23 12:24:38 -05:00
martin
6ef8d21e85 -changed audio device out to disabled by default. 2011-02-22 23:02:56 -05:00
martin
bc28514175 -min passwd character limit 2011-02-22 19:04:35 -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
Naomi
42598d03b4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-22 11:46:22 -05:00
Naomi
2d95a90049 CC-1952 cannot delete a file that is scheduled in the future. 2011-02-22 11:44:23 -05:00