73555714b8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-08 17:56:42 -05:00
cdc72beb6b
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
2012-02-08 17:56:26 -05:00
33fcbddcb9
CC-3284: Don't make browser users clear their cache when Airtime is upgraded
...
- use airtime version string instead of filemtime function
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
2012-02-08 16:21:57 -05:00
0f9d3021cd
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 16:17:35 -05:00
6254467e02
CC-3305: 404 Error after meta data edit on Airtime Pro
...
-Fixed
2012-02-08 16:17:18 -05:00
ba3cc45d36
CC-3284: Don't make browser users clear their cache when Airtime is upgraded
...
- use airtime version string instead of filemtime function
2012-02-08 15:57:42 -05:00
b1a281be4e
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 14:59:11 -05:00
5d31e4c2a0
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
2012-02-08 14:57:48 -05:00
09ef22520e
CC-3310: Editing metadata of a song shows Artist instead of Creator.
...
-fixed
2012-02-08 14:15:15 -05:00
103b4abdeb
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 11:42:44 -05:00
6c0f035b0b
CC-3307: airtime-full-install fails on Ubuntu 11.10
2012-02-08 11:42:21 -05:00
624669a6bf
CC-3273 : flash player
...
mp3 latency problem in firefox needed an extra option set in JPlayer
2012-02-08 17:39:16 +01:00
d257ddf482
CC-3285 : Nowplaying
...
nowplaying didn't show correct start date if show crossed 0:00 boundry.
2012-02-08 16:00:37 +01:00
252777c3f9
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 15:14:33 +01:00
c23491b257
CC-3285 : show over booked error message
...
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
a2f38b94a2
CC-3174 : showbuilder
...
changing show context menus
2012-02-08 13:12:08 +01:00
581f86a1de
CC-3174 : showbuilder
...
show editing menu added.
2012-02-08 12:53:46 +01:00
216ce80ceb
CC-3174 : showbuilder
...
have to replace context menus on calendar page.
2012-02-08 11:16:23 +01:00
3728ffaddc
CC-3174 : showbuilder
...
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1
need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +01:00
668e214371
CC-3174 : showbuilder
...
unsetting playlist id in the session properly.
2012-02-07 18:42:34 +01:00
529f3fa52f
CC-3174 : showbuilder
...
forgot to actually return fades.... heh
2012-02-07 17:52:04 +01:00
aa7afce245
CC-3174 : showbuilder
...
modifying times to work with scheduling times.
2012-02-07 17:29:52 +01:00
251f3a3e5b
CC-3174 : showbuilder
...
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
f651024a6e
CC-3174 : showbuilder
...
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
2012-02-07 13:29:50 +01:00
5dcb033c84
CC-3297: Depend on zendframework and php-pear as external packages
...
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
2012-02-06 20:28:38 -05:00
51e181b445
CC-3297: Depend on zendframework and php-pear as external packages
...
-removed pear files
2012-02-06 15:16:57 -05:00
c229097470
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 15:10:03 -05:00
58b4576ae1
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
613006e69c
CC-3174 : showbuilder
...
merge
2012-02-06 12:57:08 +01:00
e487b4a444
CC-3174 : showbuilder merges
...
adjusting format of default fade to not confuse DateTime.
2012-02-06 12:48:53 +01:00
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +01:00
776d1b65e8
CC-3174 : showbuilder
...
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
8212624c4a
CC-3174 : showbuilder
...
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
16863ee95e
CC-3174 : showbuilder/library
...
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
fbec92cb0d
CC-3174 : showbuilder/library
...
soundcloud icon stuff is back.
2012-02-05 19:48:23 +01:00
072e13a943
CC-3174 : showbuilder
...
add/delete buttons functions
still not displaying enable/disable when needed.
2012-02-05 19:11:48 +01:00
226a3ffbea
CC-3174 : showbuilder/lib refact
...
add button now functional for playlist,
still need to enable/disable when appropriate.
2012-02-05 18:46:52 +01:00
6c2475bf1f
CC-3174 : showbuilder
...
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
da5e1ac302
CC-3174 : showbuilder/library
...
adding new context menu, link to view on soundcloud doesn't seem to work.
2012-02-05 13:56:07 +01:00
e8f2506474
CC-3174 : showbuilder
...
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +01:00
38f3d6bfb0
CC-3174: showbuilder/library refactoring
...
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
46fdf56b70
CC-3174 : showbuilder
...
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
bdc9707052
CC-2970 : playlist drop indicator
...
looking into customizing the placeholder, connected library to playlist sortable.
2012-02-04 02:07:32 +01:00
d6bf95500c
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
2012-02-03 18:19:13 -05:00
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
1deebedf11
CC-3174 : showbuilder
...
throwing an exception if playlist doesn't exist.
2012-02-03 18:28:35 +01:00
0afa904ffe
CC-3174 : showbuilder
...
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
3b172f9c0c
CC-3174 : showbuilder
...
reset button is working.
2012-02-03 00:56:14 +01:00
11e7d813b6
CC-3174 : show builder
...
small modifications removing uneeded things.
2012-02-02 23:58:36 +01:00
7f9b497816
CC-3174 : showbuilder
...
removing unecessary things from the events.
2012-02-02 23:31:32 +01:00
6da4397a96
CC-3174 : show builder
...
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
7317b1d5af
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
2012-02-02 15:59:35 -05:00
09ccac3384
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
2012-02-02 15:30:05 -05:00
61fb8a4fb9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05:00
03329ad2cf
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
0fee577c67
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:13:04 -05:00
11e0f3ead8
CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled"
2012-02-02 14:11:03 -05:00
60ac01dd41
CC-3174 : show builder
...
scheduled item keeps same id after being moved.
2012-02-02 18:38:56 +01:00
e001cd24c1
CC-3174 : show builder
...
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
0199f572bd
CC-3174 : showbuilder
...
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
8b93b98e24
CC-3174 : show builder
...
removing widths where unneeded.
2012-02-02 01:33:53 +01:00
942cfaac25
CC-3174 : show builder
...
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
3aab811a3e
CC-3174 : showbuilder
...
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
f5b2a23eb1
CC-3174 : showbuilder
...
group add/delete is working
2012-02-01 18:47:08 +01:00
df73726961
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:10:31 -05:00
026bdebacc
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:09:59 -05:00
81d24b7825
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:49:53 -05:00
80d99f013a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:48:29 -05:00
3643c9caaf
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 11:44:20 -05:00
4ffe79a286
CC-3290: A file should be removed from playlists if it is removed
...
through the interface
- fixed
2012-02-01 10:59:04 -05:00
5d02581d38
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-02-01 10:59:04 -05:00
d495eac326
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-02-01 10:59:04 -05:00
8e40c95e9a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 10:57:38 -05:00
b2ed751e9e
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-31 21:24:23 -05:00
7ee17ba07e
CC-3291: Airtime is missing Australia and Arctic timezones
...
-fixed
2012-01-31 21:24:01 -05:00
3d502b748f
CC-3174 : showbuilder
...
removing items recalulates everything correctly.
2012-01-31 21:39:34 +01:00
de7bbbb479
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-01-31 15:17:53 -05:00
026f49ab31
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-01-31 14:54:03 -05:00
fbda0e733b
CC-3174 : showbuilder
...
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
b644a94363
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-30 16:29:50 -05:00
80970efa9c
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:29:35 -05:00
c5f3e40397
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:28:27 -05:00
e05e2ea49c
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2012-01-27 15:37:53 -05:00
9f2d0fc8d5
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
2012-01-27 15:30:44 -05:00
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
f5761fd03c
CC-3174 : show builder
...
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
b0c3bace1c
CC-3174 : show builder
...
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
5026da56cb
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:14:27 -05:00
192c30bacc
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-25 14:12:42 -05:00
2027db3609
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:12:19 -05:00
1080bf692f
CC-3277 : Overbooking a show to include 24+ hours of audio
...
truncating time values greater that the max allowed for time without timezone
2012-01-24 18:08:39 +01:00
ecaebbeb67
CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.
2012-01-23 19:07:07 +01:00
863de54fc8
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 10:29:19 -05:00
93dfb253c1
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-18 10:28:41 -05:00
cc20db5d30
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 16:22:22 +01:00
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
07bd5dacae
Improved tooltip for Stream Settings: Icecast Vorbis Metadata
2012-01-17 16:03:41 -05:00
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
Daniel
James
Martin Konecny
Naomi Aro
james
Yuchen Wang
Paul Baranowski