Commit Graph

529 Commits

Author SHA1 Message Date
martin 5a7ebc8a8b Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 14:18:05 -04:00
martin 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
Naomi fc8f9f18fc CC-2176 : Allow up to 10 rebroadcasts, add in the plus button with hidden elements
tested with editing shows.
2011-04-14 12:32:25 -04:00
Naomi 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
martin 33b24b581c CC-2175: Overbooking: Cut off shows when they are done
-fixed
2011-04-14 00:20:19 -04:00
martin f6abd30551 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 17:00:04 -04:00
martin 5b0121712b CC-2181: No cancel button on Update show
-Pressing "Close" will now clear the form
-Editing show will now hide "+ Show" button
2011-04-13 16:59:53 -04:00
Naomi 492c76cb2f CC-2176 : Allow up to 10 rebroadcasts, add in the plus button with hidden elements
creating elements inside for loop to be less redundant.
2011-04-13 15:11:06 -04:00
martin 5f512d47ff Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 11:24:33 -04:00
martin 9e23d8b902 CC-1805: Ability to edit a show
Fixed bug for single-show instances.
2011-04-13 11:23:58 -04:00
Naomi e029d2e552 CC-2159 : Upgrade Airtime to jQuery 1.5
jQuery 1.5.2, new fullcalendar bugfix release.
2011-04-13 11:21:53 -04:00
martin 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
martin e01f493c14 CC-1805: Ability to edit a show
-Almost bug free....
2011-04-12 17:29:35 -04:00
martin 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
martin 64124175c5 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	application/models/Shows.php
2011-04-12 00:16:35 -04:00
martin b4f1a6b3b0 -CC-1805 Ability to edit a show
Initial check-in...still incomplete.
2011-04-12 00:14:26 -04:00
Naomi 6bbc034d9b adding genre field, 6 months of 1 hour shows. 2011-04-06 17:54:22 -04:00
Naomi 94011e2734 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-06 17:53:43 -04:00
Naomi 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
martin 12a0e34024 -update version string to 1.8.0-alpha 2011-04-05 16:12:42 -04:00
Naomi e5ab96a665 CC-2159 : Upgrade Airtime to jQuery 1.5
upgraded project to newest jQuery, fullcalender.
2011-04-04 18:40:59 -04:00
martin 76a8deb455 -typo fix 2011-04-04 15:15:54 -04:00
martin 77db324a1a -removed beta tag from Airtime version string. 2011-04-04 14:15:49 -04:00
martin f067e54a37 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-04 13:55:49 -04:00
martin e65b0eed7c -CC-2139: Make submit and cancel button for "edit metadata" view the same size.
-Fixed thanks to Naomi :)
2011-04-04 13:55:39 -04:00
Paul Baranowski 97b1ba2799 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-04 13:51:03 -04:00
Paul Baranowski b98c0f3c85 Tweaks to UI labels for consistency and clarity. 2011-04-04 13:50:51 -04:00
martin ceeb0dca83 CC-2152: Week view schedule widget not displaying items chronologically
-Done
2011-04-04 12:47:14 -04:00
martin 7823d89092 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-04 12:30:37 -04:00
martin 36ca9fe755 CC-2152: Week view schedule widget not displaying items chronologically
-Fixed
2011-04-04 12:30:29 -04:00
naomiaro 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
naomiaro 665aae0a18 removed automatically, since it applies to manually through interface as well. 2011-04-03 22:37:19 -04:00
naomiaro 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
naomiaro 119e21ec82 CC-2145 : Redesign & layout fixes for the Preferences screen
printing out errors if the element has a problem
2011-04-03 18:32:47 -04:00
naomiaro 9bd1aa14a9 CC-2145 : Redesign & layout fixes for the Preferences screen
added javascript to page, got rid of separate index/update actions and moved everything to just index since update was not needed as a separate action.
2011-04-03 18:04:14 -04:00
naomiaro a28d8ce305 CC-2145 : Redesign & layout fixes for the Preferences screen
view templates are all done, form works. just need javascript.
2011-04-03 17:34:44 -04:00
naomiaro 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
naomiaro 7be60fbf84 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-02 16:34:09 -04:00
naomiaro 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
martin 655aa43532 CC-2031: Put extra 'Add this show' button at bottom of Add show box
-Done
2011-04-02 13:51:19 -04:00
martin e573d95fcb CC-2139: Make submit and cancel button for "edit metadata" view the same size
-Done
2011-04-02 13:48:20 -04:00
martin c67ab97dbc Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-02 13:30:15 -04:00
martin 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
naomiaro a6927442ec Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-01 19:44:13 -04:00
naomiaro b59e7aef32 CC-2116 : Add Extra Form Validation For Rebroadcasts
adding check for time fields since zend passes 09:0f
setting min date on rebroadcast date picker to be start date of show.
2011-04-01 19:43:57 -04:00
Paul Baranowski 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
naomiaro 8f8bd68849 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-01 18:18:59 -04:00
naomiaro 132c78453a CC-2116 : Add Extra Form Validation For Rebroadcasts
can only schedule rebroadcast shows an hour after original broadcast or later.

zend date validator passes '09:0f' which it shouldn't...
2011-04-01 18:18:32 -04:00
martin 1af2407984 -change Airtime version string to 1.7.0-beta 2011-04-01 16:39:14 -04:00
martin 14ee43a218 -small typo fix 2011-04-01 15:53:03 -04:00