martin
|
43a9b63fb5
|
CC-1848
-began progress, not complete yet. Show can be deleted from database while it is playing, need to notify pypo as well
|
2011-03-09 22:25:02 -05:00 |
|
martin
|
73f4f140df
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-03-08 16:45:02 -05:00 |
|
martin
|
7c1739247d
|
-doctrine 2.0 alpha upgrade scripts
|
2011-03-08 16:44:47 -05:00 |
naomiaro
|
6c1e1b6b59
|
removed comment at top which affected IE.
|
2011-03-08 14:57:55 -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
|
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
|
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 |
|
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 |
|
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 |
|
martin
|
c936d28d3a
|
-updated Airtime version string to 1.7.0-alpha
|
2011-03-01 11:10:48 -05:00 |
|
martin
|
b15dd3ba1d
|
-updated Airtime version strings
|
2011-03-01 10:38:48 -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 |
|
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
|
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 |