Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6396 commits 3 branches 0 tags 405 MiB
Commit graph

1024 commits

Author SHA1 Message Date
James
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
Martin Konecny
0f9d3021cd Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 16:17:35 -05:00
Martin Konecny
6254467e02 CC-3305: 404 Error after meta data edit on Airtime Pro 
-Fixed
 2012-02-08 16:17:18 -05:00
James
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
Daniel
b1a281be4e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 14:59:11 -05:00
Daniel
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
Martin Konecny
09ef22520e CC-3310: Editing metadata of a song shows Artist instead of Creator. 
-fixed
 2012-02-08 14:15:15 -05:00
Naomi Aro
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
Naomi Aro
252777c3f9 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:14:33 +01:00
Naomi Aro
c23491b257 CC-3285 : show over booked error message 
checking if percentage is over 100.
 2012-02-08 15:13:17 +01:00
Naomi Aro
a2f38b94a2 CC-3174 : showbuilder 
changing show context menus
 2012-02-08 13:12:08 +01:00
Naomi Aro
581f86a1de CC-3174 : showbuilder 
show editing menu added.
 2012-02-08 12:53:46 +01:00
Naomi Aro
216ce80ceb CC-3174 : showbuilder 
have to replace context menus on calendar page.
 2012-02-08 11:16:23 +01:00
Naomi Aro
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
Naomi Aro
668e214371 CC-3174 : showbuilder 
unsetting playlist id in the session properly.
 2012-02-07 18:42:34 +01:00
Naomi Aro
529f3fa52f CC-3174 : showbuilder 
forgot to actually return fades.... heh
 2012-02-07 17:52:04 +01:00
Naomi Aro
aa7afce245 CC-3174 : showbuilder 
modifying times to work with scheduling times.
 2012-02-07 17:29:52 +01:00
Naomi Aro
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
Naomi Aro
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
Martin Konecny
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
Martin Konecny
51e181b445 CC-3297: Depend on zendframework and php-pear as external packages 
-removed pear files
 2012-02-06 15:16:57 -05:00
Martin Konecny
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
Martin Konecny
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
Naomi Aro
d9947b622a CC-3174 : showbuilder 
fixing times in CcPlaylistContents
 2012-02-06 18:46:53 +01:00
Naomi Aro
613006e69c CC-3174 : showbuilder 
merge
 2012-02-06 12:57:08 +01:00
Naomi Aro
e487b4a444 CC-3174 : showbuilder merges 
adjusting format of default fade to not confuse DateTime.
 2012-02-06 12:48:53 +01:00
Naomi Aro
9e08f857bf CC-3174 : showbuilder 
fixing merge with playlist tooltip
 2012-02-06 11:59:20 +01:00
Naomi Aro
776d1b65e8 CC-3174 : showbuilder 
fixing merge, testing that affected functionality still works.
 2012-02-06 11:23:10 +01:00
Naomi Aro
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
Naomi Aro
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
Naomi Aro
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
Naomi Aro
fbec92cb0d CC-3174 : showbuilder/library 
soundcloud icon stuff is back.
 2012-02-05 19:48:23 +01:00
Naomi Aro
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
Naomi Aro
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
Naomi Aro
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
Naomi Aro
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
Naomi Aro
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
Naomi Aro
bdc9707052 CC-2970 : playlist drop indicator 
looking into customizing the placeholder, connected library to playlist sortable.
 2012-02-04 02:07:32 +01:00
Daniel
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
Naomi Aro
19f069b602 CC-3174 : showbuilder 
can add items to a playlist with the refactoring.
 2012-02-04 00:12:06 +01:00
Naomi Aro
1deebedf11 CC-3174 : showbuilder 
throwing an exception if playlist doesn't exist.
 2012-02-03 18:28:35 +01:00
Naomi Aro
0afa904ffe CC-3174 : showbuilder 
refactoring playlists for the group add/delete
 2012-02-03 18:15:10 +01:00
Naomi Aro
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
Daniel Franklin
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
Daniel Franklin
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
Daniel Franklin
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
Daniel Franklin
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
Martin Konecny
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
Martin Konecny
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
Naomi Aro
60ac01dd41 CC-3174 : show builder 
scheduled item keeps same id after being moved.
 2012-02-02 18:38:56 +01:00