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
33b24b581c
CC-2175: Overbooking: Cut off shows when they are done
...
-fixed
2011-04-14 00:20:19 -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
6bbc034d9b
adding genre field, 6 months of 1 hour shows.
2011-04-06 17:54:22 -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
7be60fbf84
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-04-02 16:34:09 -04:00
5a105ff4c8
CC-2110 : Soundcloud file metadata
...
added all defaults or ways to input a default for soundcloud metadata.
2011-04-02 16:33:45 -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
1c8a9a88ae
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-31 17:31:06 -04:00
b4d3786e41
CC-2105: SoundCloud password should be protected in Configure->Preferences UI
...
-A blank password field won't overwrite the saved database value anymore
2011-03-31 17:30:50 -04:00
19e75a3756
CC-2141 : Upgrade support for Airtime 1.7
2011-03-31 17:21:06 -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
cdfe0ce197
Tweaks to the calendar load test.
2011-03-30 17:32:23 -04:00
94dc54638a
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-30 17:27:24 -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
d2fb99eff9
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-30 15:42:36 -04:00
f184cc596a
CC-2110 : Soundcloud file metadata
2011-03-30 15:42:01 -04:00
32c28046ef
CC-1990: Widget to display schedule and "Now Playing" on any website
...
-admin can now enable/disable access to scheduling information to remote widgets via the preferences page.
2011-03-30 15:34:35 -04:00
a9d288385b
CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
...
static retries/wait time right now.
2011-03-29 19:36:36 -04:00
161505a6df
CC-2044: remove hardcoded settings from application/configs/conf.php
...
-refactored some code to begin work on this...
2011-03-29 16:10:00 -04:00
b73e58551f
CC-2128: storageUrlPort in application/configs/conf.php not being used
...
-fixed
2011-03-29 14:44:51 -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
d745201afe
CC-2098: Only push playlists that havent ended yet
...
-re-added ability to specify to/from time ranges
2011-03-28 18:23:57 -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
70dd2a4838
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-28 16:30:00 -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
c0e8152077
CC-2110 : Soundcloud file metadata
...
added text area to preferences to allow for additional soundcloud tags.
2011-03-28 15:39:01 -04:00
df8b9af8f6
CC-2110 : Soundcloud file metadata
...
uploading show description, show name in filename, tags ready to be uploaded for creator need to figure out what to upload.
2011-03-28 12:10:51 -04:00
d067cf0222
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-24 23:47:08 -04:00
martin
Naomi
naomiaro
Paul Baranowski