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

391 commits

Author SHA1 Message Date
Naomi Aro
a1e8903a64 CC-3174 : showbuilder 
fixing some errors found in apache log.
 2012-02-22 22:25:14 +01:00
Naomi Aro
d4c7b832c9 CC-3174 : showbuilder 
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
 2012-02-22 18:38:33 +01:00
Naomi Aro
0ba3049528 CC-3174 : showbuilder 
removing old scheduling method code to avoid confusion.
 2012-02-22 13:19:49 +01:00
Naomi Aro
2aae318a5a CC-3174 : showbuilder 
remembering state for the timeline datatable.
 2012-02-22 12:42:24 +01:00
Naomi Aro
5703508beb CC-3174 : showbuilder 
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
 2012-02-22 11:43:37 +01:00
Naomi Aro
5f89975c64 CC-3174 : showbuilder 
datatables state restore needs real booleans not strings.
 2012-02-22 00:02:35 +01:00
Naomi Aro
9b5a0fc565 CC-3174 : showbuilder 
working on trying to save/load state serialized into the db for datatables.
 2012-02-21 17:31:54 +01:00
Naomi Aro
c0f16fac3c CC-3174 : showbuilder 
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
 2012-02-20 18:24:04 +01:00
Naomi Aro
09ae26a531 CC-3174 : showbuilder 
fixing bug moving item to beginning of show
 2012-02-17 12:19:42 +01:00
Naomi Aro
ac11d8bcf6 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
 2012-02-17 11:50:49 +01:00
Naomi Aro
e1d5d6de73 CC-3174 : showbuilder 
checking modification time before deleting items.
Throws a ScheduleOutdatedException
 2012-02-16 16:29:11 +01:00
Naomi Aro
f14ebce239 CC-3174 : showbuilder 
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
 2012-02-15 18:27:59 +01:00
Naomi Aro
b1fbeeb448 CC-3174 : showbuilder 
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
 2012-02-15 00:39:27 +01:00
Daniel
14a9225b97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-14 18:12:51 -05:00
Daniel
14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
 2012-02-14 18:12:29 -05:00
Martin Konecny
54cbc86a0a Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
 2012-02-14 14:47:07 -05:00
Martin Konecny
eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback 
-fixed
 2012-02-10 18:43:40 -05:00
Martin Konecny
babfa1830c CC-3317: PHP Undefined variable error in SystemstatusController 
-fixed
 2012-02-10 13:12:18 -05:00
Naomi Aro
941da1fe44 CC-3174 : showbuilder 
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
 2012-02-09 23:41:12 +01:00
Naomi Aro
fdd962f5ce CC-3174 : showbuilder 
replacing context menus on calendar screen.
 2012-02-09 21:19:21 +01:00
Daniel
a4a41f301f Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-09 15:05:36 -05:00
Daniel
b603726a39 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
 2012-02-09 15:04:52 -05:00
Naomi Aro
4691799326 Merge branch 'devel' into CC-3174 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-09 19:41:31 +01:00
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
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
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
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
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
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
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
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
Naomi Aro
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
Naomi Aro
0199f572bd CC-3174 : showbuilder 
dragging into timeline is working
need to replace jjmenus
 2012-02-02 15:51:15 +01:00
Naomi Aro
3aab811a3e CC-3174 : showbuilder 
fixing some css/js for display.
 2012-02-01 23:33:20 +01:00
Naomi Aro
f5b2a23eb1 CC-3174 : showbuilder 
group add/delete is working
 2012-02-01 18:47:08 +01:00
James
df73726961 CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:10:31 -05:00