Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,534 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1320 Commits

Author SHA1 Message Date
Naomi Aro 997782c73c CC-3354 : playlist drag and drop 
improving apperance of playlist drag and drop.
 2012-02-28 13:13:40 +01:00
Martin Konecny 4514967ccd CC-3359: Now Playing -> Day view has a bug with supporting UTC time 
-fixed
 2012-02-27 21:37:23 -05:00
Daniel fc2b18923e CC-3337: Optimize Schedule/get-current-playlist/format/json 
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
 2012-02-27 18:09:30 -05:00
Naomi Aro 5972aba46e CC-3174 : showbuilder 
changing playlist placeholder to be a li item thanks
to a hack on stack overflow.
 2012-02-27 23:58:08 +01:00
Daniel 9736fd7deb CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version 
- I've updated the comment to read the difference between 1.9.5 and version 3.0.0 is calculated as 105
- I've also updated the checking logic to make the first outdated anything below 20 and the second outdated between 20 and 29.
 2012-02-27 17:28:06 -05:00
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
James 695535ae64 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 13:12:50 -05: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
Daniel 1677bc6816 CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version 
Updated the logic in Version Notify so that if the currently installed version of airtime is greater then the official version a notification does not appear saying Airtime needs to be updated.
 2012-02-22 16:06:06 -05: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
Daniel 8bbccb6f44 CC-3338: Optimize week display 
The response time of the calendar varies depending on whether the week/day views filter or the month filter is used because of the additional percentage scheduled calculation per show instance. This added calculation results in more and heavier hits to the database, I've included the time_filled column in the original show query and have used that to calculate percentage and saved the db call.
 2012-02-22 14:32:59 -05: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
Daniel 80e33ee533 CC-3337: Optimize Schedule/get-current-playlist/format/json 
- I've updated the logic to query the cc_schedule table directly for the previous, next, current shows which makes look up time much faster. If that doesn't work then I revert back to the previous logic, incase nothing is scheduled within an hour of the current time.
 2012-02-22 11:36:48 -05: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
Daniel 664584ec6b CC-3331 : Optimize "Now Playing" to load in less than 1/2 second 
- updated the CreateDatatableRows do perform a check and set on the last items end time. If the end time of the last item exceeds the show time's end I set the items end time to the show's end time.
 2012-02-17 17:58:19 -05:00
Daniel c7f4b17e81 CC-3331: Optimize "Now Playing" to load in less than 1/2 second 
- cleaned up sql statement Schedule's getScheduleItemsInRange
 2012-02-17 17:08:47 -05:00
Daniel 5dd94ce12c Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-17 16:49:44 -05:00
Daniel 5cb99e9532 CC-3331: Optimize "Now Playing" to load in less than 1/2 second 
- Reorganized the now playing to find all the scheduled items within two time frames instead of in a loop per show id.
- I've cut the time in half
 2012-02-17 16:47:12 -05:00
James 0db3a45fcf SAAS-196: Stats: Check if easy_install installation method detection 
is working properly

- fixed
 2012-02-17 15:40:37 -05: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
Daniel 6d71ec8c9c CC-3331 : Optimize "Now Playing" to load in less than 1/2 second 
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
 2012-02-17 11:13:34 -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
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
Martin Konecny 103b4abdeb Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 11:42:44 -05:00
Martin Konecny 6c0f035b0b CC-3307: airtime-full-install fails on Ubuntu 11.10 2012-02-08 11:42:21 -05:00
Naomi Aro 624669a6bf CC-3273 : flash player 
mp3 latency problem in firefox needed an extra option set in JPlayer
 2012-02-08 17:39:16 +01: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 072e13a943 CC-3174 : showbuilder 
add/delete buttons functions
still not displaying enable/disable when needed.
 2012-02-05 19:11:48 +01:00
Naomi Aro 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
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 3b172f9c0c CC-3174 : showbuilder 
reset button is working.
 2012-02-03 00:56:14 +01:00
Naomi Aro 11e7d813b6 CC-3174 : show builder 
small modifications removing uneeded things.
 2012-02-02 23:58:36 +01:00
Naomi Aro 7f9b497816 CC-3174 : showbuilder 
removing unecessary things from the events.
 2012-02-02 23:31:32 +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
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 8b93b98e24 CC-3174 : show builder 
removing widths where unneeded.
 2012-02-02 01:33:53 +01:00
Naomi Aro 942cfaac25 CC-3174 : show builder 
moving columns around in library to look better.
 2012-02-02 01:29:50 +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
James 026bdebacc CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:09:59 -05:00
James 81d24b7825 SAAS-174: Ability to add Google Analytics to the demo instance 
- adding google-analytics.js
 2012-02-01 11:49:53 -05:00
James 80d99f013a SAAS-174: Ability to add Google Analytics to the demo instance 
- adding google-analytics.js
 2012-02-01 11:48:29 -05:00
James 3643c9caaf SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-02-01 11:44:20 -05:00
James 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
Daniel Franklin 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
Daniel Franklin 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
James 8e40c95e9a SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-02-01 10:57:38 -05:00
Martin Konecny b2ed751e9e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-01-31 21:24:23 -05:00
Martin Konecny 7ee17ba07e CC-3291: Airtime is missing Australia and Arctic timezones 
-fixed
 2012-01-31 21:24:01 -05:00
Naomi Aro 3d502b748f CC-3174 : showbuilder 
removing items recalulates everything correctly.
 2012-01-31 21:39:34 +01:00
Daniel Franklin 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
Daniel Franklin 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
Naomi Aro 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
James b644a94363 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-30 16:29:50 -05:00
James 80970efa9c SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-01-30 16:29:35 -05:00
James c5f3e40397 SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-01-30 16:28:27 -05:00
james 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
james 9f2d0fc8d5 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
 2012-01-27 15:30:44 -05:00
Naomi Aro 3f3117cf0e CC-3174 : Show builder 
creating a scheduling system to work with the new timeline in mind using propel.
 2012-01-27 21:06:04 +01:00
Naomi Aro f5761fd03c CC-3174 : show builder 
status icon on left side of table
static check mark in the footer currently
 2012-01-26 19:10:37 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder 
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
 2012-01-26 15:21:04 +01:00
James 5026da56cb SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:14:27 -05:00
James 192c30bacc Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-01-25 14:12:42 -05:00
James 2027db3609 SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:12:19 -05:00