dcad4383cc
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-31 19:10:27 -04:00
76cfe7714b
-Fix timestamp calculation problem for the UI
2011-03-31 19:10:18 -04:00
1503d01b00
fix variable issue, possible null date.
2011-03-31 18:54:26 -04:00
e902d3b3d4
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-30 18:15:48 -04:00
85a984e669
CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
...
configs for retry, id of soundcloud file is added to database.
2011-03-30 18:15:33 -04:00
e5cbfa6ecd
Added Ofir's Calendar load test.
...
In order to make it work, I made the following changes:
Merged Playlist::Insert() into the create() function, now there
is only one way to create a playlist.
Renamed Show::addShow() to Show::create() to make the API like
the other classes. It returns the created show ID now.
Renamed Show::populateShowUntilLastGeneratedDate() to Show::populateShowUntil(),
allowed it to accept a second parameter for an end date.
Renamed Show::populateShowsUntil() to Show::populateAllShowsInRange().
Added documentation to a number of functions.
2011-03-30 17:27:14 -04:00
5100613049
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-29 12:47:43 -04:00
8c522352d7
CC-2110 : Soundcloud file metadata
...
adding a users function which will prob be used for metadata... when I see what's needed.
2011-03-29 12:47:34 -04:00
d6c8e8ca3d
CC-2092: When listening to a rebroadcast show, UI is telling me show is empty
...
-Fixed
2011-03-28 18:07:16 -04:00
2aa0cd22c6
CC-1990: Widget to display schedule and "Now Playing" on any website
...
-update to API controller to support new widget
2011-03-28 16:29:50 -04:00
9447f4fb82
CC-2063 : record/rebroadcast icons for calendar display
...
icons are put on calendar.
2011-03-23 23:36:45 -04:00
e92be3c186
CC-1990: Widget to display schedule and "Now Playing" on any website
...
-First working version, needs to be called using:
<script>
$(document).ready(function() {
$("#headerLiveHolder").airtimeLiveInfo();
$("#onAirToday").airtimeShowSchedule();
});
</script>
2011-03-22 18:04:27 -04:00
8016737968
Merge branch 'master' of dev.sourcefabric.org:campcaster
...
Conflicts:
application/models/Shows.php
2011-03-22 12:16:42 -04:00
fae71ed051
CC-1985 : Automatic rebroadcast of recorded content
...
scheduling the recorded file in any rebroadcast shows.
2011-03-22 12:08:09 -04:00
b650abcbb8
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
application/models/Shows.php
2011-03-22 10:00:37 -04:00
d38e2adb58
CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
...
This is the code for the server side to push the schedule to RabbitMQ.
Right now it is disabled and should cause no changes in behavior.
Also added comments to functions and formatted code correctly.
2011-03-22 09:55:33 -04:00
864cda6c34
CC-1630 : Automatic recording of shows
...
multi threading now used in recorded for back to back shows.
recorded file id is put into show instances table.
2011-03-22 00:46:31 -04:00
5ddd670979
CC-1630 : Automatic recording of shows
...
not going to use ECI python bindings, has deprecated code in the ubuntu package currently
also simpler just to call a subprocess
2011-03-18 15:33:23 -04:00
28b7d8e882
CC-1985 : Automatic rebroadcast of recorded content
...
can't move a rebroadcast show infront of it's original recorded show,
know how to print form element errors out in a custom view script,
removed show content option from a recorded show's context menu.
2011-03-18 00:20:38 -04:00
e3e8f10021
CC-1985 : Automatic rebroadcast of recorded content
...
added url column to cc_shows table, logic to show/hide form components for rebroadcast
2011-03-17 18:23:05 -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
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
a947306222
CC-2002
...
GUI changes done
2011-03-11 13:56:13 -05:00
7c1739247d
-doctrine 2.0 alpha upgrade scripts
2011-03-08 16:44:47 -05:00
9cfb968011
-empty shows should now show up on the now-playing view
2011-03-07 14:49:16 -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
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
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
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
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
a83a4b6bae
show cancelling available (needed for repeating shows)
2011-02-12 17:21:37 -05:00
e38d825896
check if is an array for hosts.
2011-02-11 11:52:11 -05:00
85ab11dc56
CC-1897 defaults to day of the week of start date.
2011-02-10 19:36:39 -05:00
d210a36358
new add show html.
2011-02-09 18:10:46 -05:00
3d3515812a
added monthly show option, bit more javascript to show/hide info when not needed in add show tabs.
2011-02-08 18:22:51 -05:00
424c6f0193
CC-1887 shows are now resized properly with delta day. schedule dialog includes end day since shows can be longer than 1 day now, playlist search must look for an interval given the time increase.
2011-02-08 15:06:31 -05:00
0152514ef3
removed cc_show_schedule table.
2011-02-06 22:07:17 -05:00
fae1401568
-further fixes for naomis new layout
2011-02-06 20:12:56 -05:00
a5e4056555
missing check for shows in the middle.
2011-02-06 17:37:23 -05:00
ebb43857f6
modified cc_schedule table, added foreign key to show instance id for easy clean up when show needs to be cleared/deleted. replaced primary key with a standard auto incrementing key for efficiency since the other key had no use.
2011-02-06 01:10:07 -05:00
14c71a3f39
getting tired....
2011-02-05 23:50:43 -05:00
martin
Naomi
Paul Baranowski
naomiaro