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
c6addf37ba
Merge branch 'CC-3174' into devel
2012-02-08 00:00:48 +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
b08e7787d3
CC-3299: Media monitor should not change the owner of watched files
...
- bug fix
- better logging
2012-02-07 13:37:42 -05:00
22a53dd250
CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
...
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues
Conflicts:
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-02-07 13:37:27 -05:00
951f90adc0
CC-3299: Media monitor should not change the owner of watched files
...
- bug fix
- better logging
2012-02-07 13:35:55 -05:00
e5a8d65576
CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
...
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues
2012-02-07 13:35:46 -05: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
da2ab1caa9
Merge branch 'cc-3297-php-db-and-zendframework-external' into 2.0.x
2012-02-06 20:29:12 -05: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
94aaf5b70e
CC-3299: Media monitor changes the owner of watched files?
...
- bug fixed
2012-02-06 12:33:24 -05:00
3689d229d1
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-06 12:32:40 -05:00
4b7272a173
CC-3299: Media monitor changes the owner of watched files?
...
- bug fixed
2012-02-06 12:32:21 -05:00
62d1d56fd2
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-06 12:28:49 -05:00
e8afd086bd
-fix annoying issue where media-monitor refuses to start if tmp directory
...
/var/tmp/airtime does not exist. Just create it.
2012-02-06 12:28:39 -05:00
4043f011b5
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-06 12:28:31 -05:00
084214b6c8
CC-3299: Media monitor changes the owner of watched files?
...
- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
2012-02-06 12:28:16 -05:00
a79dd4fe04
CC-3299: Media monitor changes the owner of watched files?
...
- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
2012-02-06 12:26:20 -05: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
Naomi Aro
james
Martin Konecny
James
Daniel