Commit Graph

1205 Commits

Author SHA1 Message Date
Naomi Aro 20a82abb23 CC-3174 : showbuilder
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
Naomi Aro 99d3699e71 CC-3174 : showbuilder
fades displayed in seconds.
2012-02-27 21:40:04 +01:00
Naomi Aro 43d67c921d CC-3174 : showbuilder
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Naomi Aro 6ecf2f94b0 CC-3356 : Library & Timeline : remove zero prefixes from numbers 2012-02-27 20:26:47 +01:00
Naomi Aro 564575d657 CC-3174 : showbuilder
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
Naomi Aro 28759a2d34 CC-3354 : timeline drag and drop
changing helper to say just the number of items being moved like gtalk.
2012-02-27 16:01:05 +01:00
Naomi Aro f01a872bea CC-3174 : showbuilder
remove extra ;
2012-02-27 14:59:48 +01:00
Naomi Aro 318a0345bb CC-3174 : showbuilder
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
Naomi Aro 9c248bb34d CC-3174 : showbuilder
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
Naomi Aro 4a02d12600 CC-3174 : showbuilder
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
Naomi Aro 8ae303de83 CC-3174 : showbuilder
need up to date version of datatables.
2012-02-27 12:42:04 +01:00
Naomi Aro 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +01:00
Naomi Aro 36cf8ded18 CC-3174 : showbuilder
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +01:00
Naomi Aro 99b3ec6b9c Merge branch 'CC-3174' into devel 2012-02-24 21:22:46 +01:00
Naomi Aro 66ff3c61c3 CC-3330 : library behaviour. 2012-02-24 21:21:53 +01:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
Naomi Aro 1c462aa770 Merge branch 'CC-3174' into devel 2012-02-24 19:58:36 +01:00
Naomi Aro 1864447d7e CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added 2012-02-24 19:58:06 +01:00
Naomi Aro 194de3c2bf Merge branch 'CC-3174' into devel 2012-02-24 18:22:59 +01:00
Naomi Aro 4286de7b42 CC-3174 : showbuilder
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
Naomi Aro 09ce2bc8c5 Merge branch 'CC-3174' into devel 2012-02-24 16:18:39 +01:00
Naomi Aro 3ff7d1ac18 CC-3174 : showbuilder
forgot to set cueout when scheduling just files.
2012-02-24 16:18:15 +01:00
Naomi Aro b9e99afc5d Merge branch 'CC-3174' into devel 2012-02-24 16:07:12 +01:00
Naomi Aro c6edfc3208 CC-3174 : showbuilder
removing columns that no longer should be in cc_schedule.

changing cc_files length column to be of type interval.

adding length formatter to showbuilder.
2012-02-24 16:05:01 +01:00
Naomi Aro 0446fcfb25 Merge branch 'CC-3174' into devel 2012-02-24 15:07:38 +01:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Naomi Aro bc8106c5fa Merge branch 'CC-3174' into devel 2012-02-24 00:56:46 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder
allow user to filter library by

files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro 418326c258 Merge branch 'CC-3174' into devel 2012-02-23 23:12:50 +01:00
Naomi Aro 5364894833 CC-3174 : showbuilder
don't want to select empty rows anymore.
2012-02-23 23:12:30 +01:00
Naomi Aro 8b02f3d902 Merge branch 'CC-3174' into devel 2012-02-23 22:54:41 +01:00
Naomi Aro e0134ed6d1 CC-3174 : showbuilder
made width not inline.
2012-02-23 22:54:13 +01:00
Naomi Aro 9c6bd4bf4d Merge branch 'CC-3174' into devel 2012-02-23 22:24:17 +01:00
Naomi Aro c665a3fa03 CC-3333 : showbuilder track colouring
tracks coloured if boundry/over.

needs better colour selection.
2012-02-23 22:23:21 +01:00
Paul Baranowski e99b23434e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-23 15:24:40 -05:00
Paul Baranowski 1682ce8879 Updated copyright date. 2012-02-23 15:24:20 -05:00
Martin Konecny 4631e199cc CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-23 15:20:25 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny bb300676cf CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-23 15:20:24 -05:00
Naomi Aro d93041edb9 CC-3174 : showbuilder
change default value to prevent apache error logs.
2012-02-23 18:06:08 +01:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
Naomi Aro aabcaafff0 CC-3174 : showbuilder
nowplaying uses current datatables.
2012-02-23 11:10:49 +01:00
Naomi Aro 4bc51cbad1 CC-3174 : showbuilder
forgotten unused var.
2012-02-23 11:01:52 +01:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
Martin Konecny c5c1dce4d6 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-22 17:29:49 -05:00
Naomi Aro a1e8903a64 CC-3174 : showbuilder
fixing some errors found in apache log.
2012-02-22 22:25:14 +01:00
Naomi Aro c89451f880 CC-3340 : Remove "Search" tab from library view 2012-02-22 21:56:55 +01:00
Naomi Aro bb49914294 CC-3174 : showbuilder
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +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 2ac4940fd5 CC-3339 : showbuilder column names 2012-02-22 15:57:21 +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 378d3d3ef4 CC-3174 : showbuilder
group drag and drop for playlist.
2012-02-20 20:44:35 +01:00
Naomi Aro a633d69c8d Merge branch 'CC-3174' into devel 2012-02-20 20:09:49 +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 17c3cdcfb2 CC-3174 : showbuilder
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
James 2ef6d230f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-17 15:39:50 -05:00
James bb1cdc4a8f SAAS-196: Stats: Check if easy_install installation method detection
is working properly

- fixed
2012-02-17 15:39:31 -05:00
Naomi Aro 44dccf15ce CC-3335 : Timeline - Drag and drop usability improvements
dragging and dropping multiple files is working.
2012-02-17 15:53:10 +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 9bed56a2c3 CC-3174 : showbuilder
incorrect variable name fixed for updating last scheduled timestamp.
2012-02-17 11:14:44 +01:00
Naomi Aro b2d0565ec4 CC-3174 : showbuilder
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +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
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05: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
Naomi Aro eba84ee878 CC-3174 : showbuilder
disabling editing of past/current shows.
2012-02-14 14:44:46 +01:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
Naomi Aro 4f5b5d8562 CC-3174 : Show Content Builder
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
Martin Konecny 238abd6f87 CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined 2012-02-13 12:24:55 -05:00
Martin Konecny 3df396756f CC-3323: Don't send description text to Full Calendar since it is never used.
-Done
2012-02-13 12:10:23 -05:00
Martin Konecny fbd6df1986 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade. 2012-02-12 15:31:17 -05:00
Martin Konecny 8493180243 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
-use clearstatcache function
2012-02-12 11:43:34 -05:00
Martin Konecny 5059d13156 -handle case gracefully when pypo hasn't registered with Airtime server yet. 2012-02-12 01:34:53 -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
Daniel 9fc0ed198e CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
2012-02-09 12:45:39 -05:00
Naomi Aro e07ad45b1a incorrect path for the new qtip. 2012-02-09 18:07:32 +01:00
Daniel 73555714b8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-08 17:56:42 -05:00
Daniel 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
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