4b27fcc0c9
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-16 13:07:23 -04:00
20f3c49dcb
CC-1985 : Automatic rebroadcast of recorded content
...
rebroadcast shows are automatically resized if parent recorded shows are altered.
progress bar is removed from recorded/rebroadcast shows, waiting on special icons.
2011-03-16 11:33:08 -04:00
f104872175
CC-1985 : Automatic rebroadcast of recorded content
...
modified full calendar code to allow disabling resize of specific events (rebrodcast shows)
2011-03-15 17:26:59 -04:00
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
cbc1270b9f
CC-1938 - DB Migration Tool
...
-small comment added to code
2011-03-13 21:10:54 -04:00
ba81e947ec
-add code comments / some code cleanup
2011-03-13 19:24:45 -04:00
209b9c53bd
CC-1938 - DB Migration Tool
...
-added generate doctrine migrations script (for developers)
2011-03-12 15:06:09 -05:00
b807fbbbf4
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-11 14:14:38 -05:00
cbb534dfda
CC-2057
...
-database tables to drop are generated dynamically
2011-03-11 13:59:20 -05: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
00f5c6de41
CC-1938
...
-improved update message for doctrine
2011-03-09 22:25:55 -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
7fc38bcf65
Added license info for ecasound to 3rd party software documentation.
2011-03-09 19:06:15 -05:00
0d0b8e380b
Minor tweaks to some frontend text.
2011-03-09 18:21:29 -05:00
6a39e4f5f5
Removed the Debian directory.
...
Renamed directory "dev" to "dev_tools".
Replaced the ecasound-2.7.2 with a new download of ecasound. The reason is
that the previous ecasound directory had all the Makefiles checked in with
hardcoded paths from Naomi's computer. This prevented anyone else from
being able to build. I copied over the modified version of ecacontrol.py.
2011-03-09 18:20:34 -05:00
bfbca3f724
-airtime upgrade script
2011-03-09 13:23:05 -05:00
a881358378
-cleaned up install scripts
2011-03-09 00:44:51 -05:00
740a157627
-cleaned up install scripts / renamed camp* functions to airtime*
2011-03-08 17:54:53 -05:00
2a8e8715d2
-migrations uses object mapping to update database
2011-03-08 17:02:26 -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
eb2caf0adc
moving ecasound
2011-03-08 15:44:57 -05:00
6c1e1b6b59
removed comment at top which affected IE.
2011-03-08 14:57:55 -05:00
3253d521d1
-hardcoded paths for doctrine migrations removed.
2011-03-08 00:52:36 -05:00
0f8f522910
-doctrine migration basic file check-in. Hard-coded paths for now...
2011-03-08 00:49:03 -05:00
a51c02b281
-removed liquibase stuff. Preparing for doctrine...
2011-03-07 17:20:33 -05:00
9cfb968011
-empty shows should now show up on the now-playing view
2011-03-07 14:49:16 -05:00
f4f35cd813
-fix include mistake
2011-03-07 14:04:47 -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
c4a84f3920
-renamed file + removed ignoring tracks due to liquidsoap problem
2011-03-07 13:57:38 -05:00
1e94578f13
so no playlists show up on left side when a show is overbooked.
2011-03-07 12:59:46 -05:00
76b1e3b7f7
upload function now included into record script.
2011-03-07 12:43:52 -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
cf5b24dc8c
added one minute resolution.. why not?
2011-03-06 16:50:26 -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
9aec669104
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-06 15:18:51 -05:00
75167bb576
-syntax error fix for liquidsoap + other small changes
2011-03-06 15:18:40 -05:00
Paul Baranowski
naomiaro
mkonecny
martin
Naomi