8f86b05a4b
Merge branch 'master' of dev.sourcefabric.org:campcaster
...
Conflicts:
application/controllers/ScheduleController.php
public/css/styles.css
2011-03-15 17:02:22 -04:00
bd81b0cd4f
CC-1985 : Automatic rebroadcast of recorded content
...
working on disabling resizing of a rebroadcast show.
2011-03-15 16:39:52 -04:00
29816f32fa
CC-1985 : Automatic rebroadcast of recorded content
...
can add absolute dates/times for non repeating show instances to rebroadcast.
2011-03-15 15:20:10 -04:00
6ef4169315
CC-1985: Automatic rebroadcast of recorded content
...
populates rebroadcast show instances now, added a new table cc_show_rebroadcast,
added columns record, rebroadcast, instance_id, file_id to cc_show_instances table.
added column record to cc_show_days.
2011-03-15 12:05:41 -04:00
ba81e947ec
-add code comments / some code cleanup
2011-03-13 19:24:45 -04:00
a947306222
CC-2002
...
GUI changes done
2011-03-11 13:56:13 -05:00
55745d1a4a
CC-2025
...
Indicate songs that are over-booked
2011-03-10 19:28:57 -05:00
2f8aeeb2c0
CC-2053
...
-disabled persistent db connections for now...
2011-03-10 16:46:36 -05:00
b3a7b31e7e
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-10 16:42:07 -05:00
d2fdb0008a
CC-1848
...
-shows in progress can now be cancelled.
2011-03-10 16:41:41 -05:00
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
0d0b8e380b
Minor tweaks to some frontend text.
2011-03-09 18:21:29 -05:00
73f4f140df
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-08 16:45:02 -05:00
7c1739247d
-doctrine 2.0 alpha upgrade scripts
2011-03-08 16:44:47 -05:00
6c1e1b6b59
removed comment at top which affected IE.
2011-03-08 14:57:55 -05:00
9cfb968011
-empty shows should now show up on the now-playing view
2011-03-07 14:49:16 -05:00
fc35a730b9
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-07 14:01:18 -05:00
0b7ba74bc9
-do not send over-booked items to pypo
2011-03-07 14:01:08 -05:00
1e94578f13
so no playlists show up on left side when a show is overbooked.
2011-03-07 12:59:46 -05:00
dc0ea0a532
edits to show class to support resizing/dragging with overbooking.
2011-03-07 12:43:05 -05:00
17e848c549
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-06 22:43:07 -05:00
a9fd71454b
Removed BasicStor.php, it is no longer needed.
2011-03-06 22:42:52 -05:00
8e8dfacfb4
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-06 16:57:52 -05:00
6c70e4994f
-small fix to allow overlapping of scheduled items.
2011-03-06 16:57:42 -05:00
9509dc52e0
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-06 16:45:19 -05:00
b4207698c3
uploading a recorded file via multipart form http request.
2011-03-06 16:45:11 -05:00
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
3727195c54
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-06 11:05:23 -05:00
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
c2903c4198
-updated now playing view to show only only currently playing item.
2011-03-06 00:16:31 -05:00
e16dd6c486
early implementation of CC-1962
2011-03-06 00:08:02 -05:00
77f78ebbb6
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-05 12:29:06 -05:00
93874af2b8
-improved code for shows grouping in now playing view
2011-03-05 12:28:48 -05:00
4b4174fe50
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-05 11:54:05 -05:00
f68a8f67ea
soundcloud python/php apis, recorder python script so far.
2011-03-05 11:53:29 -05:00
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
90b46d8eb3
Removing lots of old code that is no longer used.
2011-03-05 11:06:22 -05:00
cb119802df
-further modifications to now-playing view with grouping by shows
2011-03-04 23:53:29 -05:00
38856c4af7
-began adding grouping by shows for the datatable.
2011-03-04 18:26:22 -05:00
d22ab329d8
-CC-1944
2011-03-04 12:07:22 -05:00
25237087a2
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-03 20:14:07 -05:00
2346be671e
-initial changes for CC-1944
2011-03-03 20:13:55 -05:00
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
9759efc6cf
-restore point...
2011-03-03 14:35:27 -05:00
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
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
c936d28d3a
-updated Airtime version string to 1.7.0-alpha
2011-03-01 11:10:48 -05:00
b15dd3ba1d
-updated Airtime version strings
2011-03-01 10:38:48 -05:00
ba330b94df
-cleanup + recursive directors can be specified for $baseFilesDir
2011-02-28 00:54:10 -05:00
6864a246f3
-fixed so that baseFilesDir is set only once in conf.php
2011-02-28 00:39:55 -05:00
f813380b8f
Merge branch 'airtime-1.6.1'
2011-02-24 13:27:27 -05:00
bc7d2ec8d5
Merge branch 'airtime-1.6.1'
2011-02-24 12:03:44 -05:00
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
860c70b21e
fix for file metadata form.
2011-02-24 11:06:19 -05:00
db0f619eb0
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-02-23 18:29:14 -05:00
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
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
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
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
8ad5d23ee6
-api_key autogeneration and usage implemented
2011-02-22 16:16:37 -05:00
7e8f61549e
Merged Naomi's change for CC-1955
2011-02-22 18:26:51 +01:00
15153727c1
CC-1971
...
Remove "?>" from the end of pure-PHP files to prevent "HEADERS ALREADY SENT"
2011-02-22 18:22:31 +01:00
92545b53a6
CC-1955
2011-02-22 11:59:55 -05:00
2d95a90049
CC-1952 cannot delete a file that is scheduled in the future.
2011-02-22 11:44:23 -05:00
93cf608741
advanced search tab does not appear.
2011-02-14 11:52:50 -05:00
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
b6d117d456
Fixed merge conflicts
2011-02-14 13:16:57 +01:00
6c273739b4
CC-1930 Improve user interface design and wording for show/playlist workflow
2011-02-14 13:05:22 +01:00
dcc3d57647
-removed <a> tags in favour of <span> tags
2011-02-13 17:51:28 -05:00
8626499554
-updated help page.
2011-02-13 17:42:15 -05:00
8c3bd5dc6e
-re-ordered menu for more logical workflow
2011-02-13 16:42:10 -05:00
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
1d30c208f8
-fixed regression in day-view
2011-02-13 14:04:38 -05:00
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
b9e1078e10
-small fixes to now playing
2011-02-13 11:49:28 -05:00
7093ebd23f
modified to avoid sql error when searching.
2011-02-12 23:07:28 -05:00
bd2d560c1b
ordering by login
2011-02-12 23:02:44 -05:00
ddddcc9375
can make show as many hours long in duration as wanted.
2011-02-12 18:40:17 -05:00
54398b8c32
playlists with no content will be filtered in the schedule show dialog.
2011-02-12 17:26:02 -05:00
a83a4b6bae
show cancelling available (needed for repeating shows)
2011-02-12 17:21:37 -05:00
9a7dda49fe
CC-1917 file meta data screen
2011-02-12 14:44:55 -05:00
2f796f3d9c
default fade shows in preferences "00:00:00.000000"
2011-02-12 14:04:09 -05:00
d9118fe2d0
Merge branch 'master' of dev.sourcefabric.org:campcaster
...
Conflicts:
public/css/styles.css
2011-02-11 18:59:27 -05:00
89267748d4
CC-1916 playlist metadata page looks better.
2011-02-11 18:55:08 -05:00
6cf4310c24
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-02-11 18:13:38 -05:00
43f7f8e103
-added help page
...
-added additional user info
2011-02-11 18:13:26 -05:00
f8d3a38b2e
default fade setting for songs.
2011-02-11 17:46:55 -05:00
12dbdf8f4c
CC-1915 playlist name no longer required in form, defaults to "Untitled Playlist"
2011-02-11 15:59:16 -05:00
b43db577dd
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-02-11 11:56:29 -05:00
14ee1f553e
-fixed up about tool-tip
...
-ui tweaks to manage users screen
2011-02-11 11:56:14 -05:00
e38d825896
check if is an array for hosts.
2011-02-11 11:52:11 -05:00
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
9634a0735a
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-02-11 11:12:33 -05:00
3b9f87f6f1
what tab isn't default open for space reason.
2011-02-11 11:12:08 -05:00
5468db39e8
admin can do anything a host of a show can
2011-02-11 00:10:56 -05:00
e28a1421c5
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-02-10 20:48:36 -05:00
cf004abb44
-small fixes
...
-about popup without styling added
2011-02-10 20:48:26 -05:00
44c830066b
CC-1880 show content is styled
2011-02-10 20:27:25 -05:00
8dbb79d9e2
CC-1902 default duration is 1:00
2011-02-10 19:53:41 -05:00
85ab11dc56
CC-1897 defaults to day of the week of start date.
2011-02-10 19:36:39 -05:00
naomiaro
mkonecny
martin
Paul Baranowski
Naomi
martin