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
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
3b9bc723ab
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- missing a line from cfg in upgrade folder
2012-02-01 14:52:17 -05: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
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
6812f69962
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:59:03 -05:00
1df1388602
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- bug fix
2012-02-01 10:59:03 -05:00
25ab4d39b2
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:59:03 -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
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
Naomi Aro
Daniel
James
james