5a7ebc8a8b
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-14 14:18:05 -04:00
bf146e7f85
-commented some functions
...
-removed usage of "current_timestamp" in postgresql queries in favour
of php time.
2011-04-14 14:17:56 -04:00
5b79a9f876
CC-2176 : Allow up to 10 rebroadcasts, add in the plus button with hidden elements
...
tested with adding shows, need to test editing shows.
2011-04-14 11:31:44 -04:00
9e23d8b902
CC-1805: Ability to edit a show
...
Fixed bug for single-show instances.
2011-04-13 11:23:58 -04:00
b034958fc5
CC-1805: Ability to edit a show
...
-fixed problem with changing a repeating rebroadcast show to a non-repeating rebroadcast show
2011-04-12 23:28:37 -04:00
e01f493c14
CC-1805: Ability to edit a show
...
-Almost bug free....
2011-04-12 17:29:35 -04:00
ea11e0114a
CC-1805: Ability to edit a show
...
-All cases for "When" tab should be covered for editing shows.
2011-04-12 11:54:24 -04:00
64124175c5
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
application/models/Shows.php
2011-04-12 00:16:35 -04:00
b4f1a6b3b0
-CC-1805 Ability to edit a show
...
Initial check-in...still incomplete.
2011-04-12 00:14:26 -04:00
56fc2863bd
CC-2146 : Speed up calendar when there are a large number of shows
...
adding aggregate column to store amount of time scheduled in show.
percent is only calculated for full calendar events if requested from a week or day view.
2011-04-06 17:53:09 -04:00
e5ab96a665
CC-2159 : Upgrade Airtime to jQuery 1.5
...
upgraded project to newest jQuery, fullcalender.
2011-04-04 18:40:59 -04:00
ceeb0dca83
CC-2152: Week view schedule widget not displaying items chronologically
...
-Done
2011-04-04 12:47:14 -04:00
7823d89092
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-04 12:30:37 -04:00
36ca9fe755
CC-2152: Week view schedule widget not displaying items chronologically
...
-Fixed
2011-04-04 12:30:29 -04:00
7f775105e2
adding end date check in get shows just incase nobody checks calendar for a while.
...
preferences had to be updated because there will be no user id if the daemon process updates the date pouplated until pref.
2011-04-04 00:02:35 -04:00
1cdbce55a7
CC-2125 : Soundcloud: ability to retry to upload
...
if a recorded show in the past does not have a soundcloud file id, context menu action appears to upload to soundcloud if it is enabled in preferences.
if a recorded file is on soundcloud the soundcloud icon replaces the record icon.
2011-04-03 22:32:11 -04:00
b97e79773b
CC-2110 : Soundcloud file metadata
...
added show genre column, this is used instead of soundcloud default genre if set.
2011-04-02 17:09:37 -04:00
c67ab97dbc
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-02 13:30:15 -04:00
8cc161ce71
CC-2123: Rebroadcast: Show status of upload in the calendar and show content
...
-Changes for full calendar implemented
2011-04-02 13:30:04 -04:00
2e74ba7c06
Fixed the calendar load test script. Changed the code to use the DateTime
...
object and also fixed a bug when creating the ShowInstance object --
it was using the wrong ID in the constructor.
Added some documentation to the Shows::getShows() method.
2011-04-01 18:25:00 -04:00
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
martin
Naomi
naomiaro
Paul Baranowski