Commit Graph

1769 Commits

Author SHA1 Message Date
Naomi e0ebfaaa65 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on creating better rules.
adding order by and relative dates.
2014-03-12 17:47:57 -04:00
Naomi 0f10c014e6 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on the generate function for playlists.
2014-03-11 18:40:47 -04:00
Naomi 05533bddb8 Merge branch '2.5.x' into 2.6.x
Conflicts:
	airtime_mvc/public/js/airtime/playouthistory/historytable.js
2014-03-11 15:04:48 -04:00
Naomi 7078180da0 CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
removing flawed functions.
2014-03-11 13:26:05 -04:00
Naomi f8935a312f CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
fixing listener stat search
2014-03-11 13:24:22 -04:00
Naomi cd55ed5ee4 CC-5727 : History search range using incorrect timezone offset
fixing show fetching times.
2014-03-10 18:48:40 -04:00
Naomi 8d2926aeed CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
Naomi d14041ac0a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on repopulating criteria in rules form.
2014-03-06 18:02:02 -05:00
Naomi 7c7748c753 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up range field to match.
2014-03-05 18:33:42 -05:00
Naomi 04d17c3818 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on playlist AND/OR
2014-03-05 18:18:24 -05:00
Naomi c944b8c6a7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on adding smart block criteria back in playlist rules.
2014-03-05 17:37:08 -05:00
Naomi bbdc9dcb6d CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-03 17:11:09 -05:00
Naomi b46863345a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
replace content or not
2014-02-26 18:31:33 -05:00
Naomi e295663f9e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on playlists
2014-02-26 18:06:50 -05:00
Naomi 739e2c3f7d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
more fixes for history editing
2014-02-26 15:49:33 -05:00
Naomi 6f0e7b3976 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up record editing.
2014-02-26 15:32:35 -05:00
Naomi 7e2633f658 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up editing history items.
2014-02-25 18:08:39 -05:00
Naomi 7877000186 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
creating single table inheritance with propel on the playlist table.
creating separate classes for either static or dynamic playlists.
2014-02-25 16:42:44 -05:00
Naomi aac73a3cc7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
make sure extra columns don't show up in show builder.
2014-02-25 12:41:22 -05:00
Naomi f64f737cf7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
removing all old tables now, starting clean up.

playlist rules stored in a text field in a json formatted string.
no need for a seperate criteria table now.
2014-02-20 12:40:59 -05:00
Naomi fd05048a48 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
can open a playlist for editing
2014-02-14 16:15:42 -05:00
Naomi 4fabaa34a7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
checking there is an open playlist for the add button.
2014-02-14 15:33:26 -05:00
Naomi 04c10df071 Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x 2014-02-14 13:43:17 -05:00
Naomi eb0682a5d4 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on multi add in library.
now playing page should be fully working.
2014-02-14 13:42:58 -05:00
Albert Santoni bb3523d92e Merge branch '2.5.x-jquery-cleanup' of https://github.com/danielhjames/Airtime into 2.6.x 2014-02-14 11:55:33 -05:00
Naomi d4fe56d309 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
implementing delete, changing how an audiofile is deleted.
hidden is useless and maybe dangerous, actually removing an entry from the db when a user
removes it from the interface. it will be deleted from all playlists which will update their lengths and content positions.
2014-02-12 19:06:55 -05:00
Naomi 4b5202e47f CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on getting deleting items to be the same as in 2.5.1
2014-02-12 14:59:11 -05:00
Daniel James 3a503c2488 Move showinfo.js to libs and link via URLs, remove old jQuery versions 2014-02-12 15:24:43 +00:00
Daniel James 743b42fb4e Remove duplicate copy of CSS file that we don't use 2014-02-12 13:20:29 +00:00
Daniel James b530299159 We don't seem to use jQuery 1.10 at the moment 2014-02-12 12:47:38 +00:00
Naomi 33f609fc8a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
starting implementation of "delete" for media library.
2014-02-11 18:31:00 -05:00
Naomi 53a378abc1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working select all/none dropdown.
fixing up datatables plugins. migrating to submit on enter for search.
2014-02-11 15:54:18 -05:00
Naomi Aro 00e851ddfc CC-5450 : Refactor Media Management (Classes/DB) in Airtime
don't want to prevent default.
2014-02-11 01:37:30 -05:00
Naomi Aro 1473c1d13d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
adding advanced search to all media tables.
2014-02-11 01:29:18 -05:00
Naomi 3ee0d9ccb7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing some search issues
2014-02-10 18:54:33 -05:00
Naomi aebea96aec CC-5450 : Refactor Media Management (Classes/DB) in Airtime
advanced search is working for dates, numbers and strings
2014-02-10 18:26:43 -05:00
Daniel James cd0e8d3464 Removed old version of jquery-ui 2014-02-10 17:41:33 +00:00
Daniel James 22d303be17 Remove old jQuery library 2014-02-10 17:31:52 +00:00
Naomi f25918336d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
column filter now sends data in proper field.
starting to fix up datepicker defaults in common.js, avoid repeating options.
2014-02-10 12:06:26 -05:00
Naomi 71f9ce1942 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
starting working on proper visibility of advanced search fields.
2014-02-06 12:41:50 -05:00
Naomi 54de9d47c3 Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x 2014-02-06 11:25:40 -05:00
Naomi a21683bf90 CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-02-06 11:25:33 -05:00
Naomi Aro 1227eb5d32 Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x
Conflicts:
	airtime_mvc/public/js/airtime/library/lib_separate_table.js
2014-02-05 21:40:27 -05:00
Naomi Aro 046d7fd07e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
investigation Chrome some more.
2014-02-05 21:36:56 -05:00
Naomi 7a2238fbad CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on setting up advanced search
2014-02-05 18:18:21 -05:00
Naomi Aro 0ce0371e6d Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x
Conflicts:
	airtime_mvc/application/models/airtime/AudioFile.php
2014-02-04 20:21:44 -05:00
Naomi 309a30910e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
starting to setup advanced search
2014-02-04 18:54:05 -05:00
Naomi 640dac63a2 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
saving/restoring the column settings for each table in the library.
2014-02-04 17:46:53 -05:00
Naomi 636dba3db1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
saving column displays for all datatables in the library.
2014-02-04 17:15:05 -05:00
Naomi 7fee696014 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up editing metadata for audio files.
2014-02-04 15:44:20 -05:00
Naomi Aro c04e33cbfd Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x 2014-02-03 21:57:26 -05:00
Naomi 2feac41af7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
creating context menus for the media in their own services.
2014-02-03 18:33:11 -05:00
Naomi Aro 8e2215c58d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on jplayer
2014-02-01 21:41:34 -05:00
Naomi 86b5f68c67 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
trying to fix chrome lag issue with inline jPlayer.
2014-01-31 17:32:45 -05:00
Naomi fbe0b0a75d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
creating service function for column datatables settings script.
context menu on right click, dblclick event now used for adding to shows/playlist.
2014-01-29 18:03:44 -05:00
Daniel James eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
Naomi 6e7f9d3232 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
testing sending audio file and webstream schedules.
Seems to be bugs with pypo around message passing and possibly noticing a track that
should be currently playing.
2014-01-24 17:52:39 -05:00
Naomi 56be00a399 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
missed changing a variable when moving files.
commenting out standingredraw of lib, this can be improved later.
2014-01-22 16:10:43 -05:00
Naomi dd0092171c CC-5450 : Refactor Media Management (Classes/DB) in Airtime
redoing show builder to use propel well. making only 1 database request with propel and hydrating related rows.
2014-01-22 15:47:35 -05:00
Naomi f744f52a8c CC-5450 : Refactor Media Management (Classes/DB) in Airtime
making shift select work.
2014-01-16 18:23:12 -05:00
Naomi 819b4f1326 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up the JS button class, can select things properly per tab.
2014-01-16 18:15:34 -05:00
Naomi 3bcea22e93 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working towards swapping out how scheduling information is gotten using the new classes.
2014-01-15 16:41:53 -05:00
Naomi 0a7c259e72 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up presentation of playlist items.
2013-12-20 17:01:57 -05:00
Naomi fd56ffb2df CC-5450 : Refactor Media Management (Classes/DB) in Airtime
making sure now playing page can load.
2013-12-19 15:55:59 -05:00
Naomi ba47bd3db4 Merge branch 'memcached' into refactor_merge_251 2013-12-19 15:34:39 -05:00
Albert Santoni 653f0e02a4 CC-5648: Events are shifted down in the month view
* Fixed it.
2013-12-17 15:25:43 -05:00
Naomi 424de61a11 CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.
upgrading to jPlayer 2.5.0
2013-12-16 17:14:00 -05:00
Albert Santoni 0afaeadb15 CC-5641: Can Create Zero or Negative Length Shows
* Fixed two underlying causes of zero or negative length shows
  that could be created over DST time changes:
    - Fixed incorrect end time arithmetic which did not preserve the
      show duration.
    - Fixed a desynchronization issue due to FullCalendar handling
      events over DST differently from Airtime.
2013-12-14 22:38:33 -05:00
Albert Santoni f16d8ca2ea Fixed a bunch of annoying/major graphical issues with the calendar
* Fixed a bug where the calendar would keep shrinking smaller and
  smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
  which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
  to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
  part).
2013-12-14 00:05:13 -05:00
drigato d841f11de3 CC-5638: Shows become unlinked when moving the end time back
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
Naomi a1a9ec34cc CC-5594 : Remove all date_default_timezone_get()
moving var serverTimezoneOffset to bootstrap,
also creating a var for userTimezoneOffset.
Utilities.js uses the userTimezoneOffset to calculate time in forms.
2013-12-06 18:17:30 -05:00
Naomi 39063aaadb CC-5594 : Remove all date_default_timezone_get()
using the user selected timezone in the form to calculate duration.
2013-12-05 15:12:01 -05:00
drigato a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Create a new cc_show_day rule instead of a new cc_show
2013-12-04 09:00:43 -05:00
Naomi c4872ccd0f CC-5450 : Refactor Media Management
using a propel aggregate column causes circular reference problems.
2013-11-28 18:02:26 -05:00
Naomi 116a0aedbc CC-5450 : Refactor Media Management
adding back aggregate column behaviour for playlist lengths based on media_content entries.
dynamic blocks will have a different way to calculate duration.
2013-11-28 15:28:37 -05:00
Naomi 152f44e093 CC-5450 : Refactor Media Management
playlist buttons are all implemented.
2013-11-27 18:14:05 -05:00
Naomi 9118f942cc CC-5450 : Refactor Media Management
some basic saving going on.
2013-11-27 16:49:37 -05:00
Naomi 017e7e274b CC-5450 : Refactor Media Management
dialog for adding webstreams mostly done, just need to redraw webstream datatable and disable the UI while the request is processing.
2013-11-27 15:16:45 -05:00
Naomi 0bda9e5d30 CC-5450 : Refactor Media Management
replacing proper length formatter for playout history
creating a dialog for adding/editing web streams.
dialog currently seems to have some weird creation problem.
2013-11-27 14:04:51 -05:00
Naomi b26dbd0af5 CC-5450 : Refactor Media Management
refactoring playlists
-presentation class for media types
-playlist cues, fades, moving, deleting only saved now when save button is pressed.
-updating context menu js
2013-11-26 17:16:34 -05:00
Naomi 59f4a6c988 CC-5450 : Refactor Media Management
only search string columns for now.
2013-11-12 16:22:17 -05:00
Naomi 38cf2fa38e CC-5450 : Refactor Media Management
retrieving results for playlist table.
2013-11-12 15:26:09 -05:00
Naomi 6ae372d591 CC-5450 : Refactor Media Management
working on creating a function to return a proper JSON nested array structure.
2013-11-08 13:03:29 -05:00
Naomi 3950445acb CC-5450 : Refactor Media Management
starting changeover of UI to tabs with separate datatables for media types
(playlists, webstreams, audiofiles)
generating datatables columns/source feeds using propel peer class constants.
2013-11-06 17:30:44 -05:00
Naomi f55e8327d2 CC-5450 : Refactor Media Management
redone webstreams, will come back to do finishing touches for error handling after a bit more generic work on media.
2013-11-04 13:40:52 -05:00
Naomi 19a7e7eb5d CC-5450 : Refactor Media Management
refactored webstreams, new/save is working
adding validators/filters for the url
separating out parsing of different webstream formats.
2013-11-01 18:02:10 -04:00
Naomi ecf363ccfe CC-5430 : sorting settings not saved on library datatable
default sorting set in incorrect place, overriding saved settings.
2013-10-16 18:14:07 -04:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
denise bc30e13b44 Changed calendar js to only start fetching events after all files have been loaded 2013-10-15 12:53:43 -04:00
Naomi 73e5fa8a90 CC-5410 : Now playing icon should not lag to show up on calendar 2013-10-11 18:15:12 -04:00
Naomi c765438b95 CRLF 2013-10-11 15:13:49 -04:00
Naomi 7f5e2bdefa CC-5404 : colorpickers littering DOM 2013-10-11 15:12:58 -04:00
Naomi 22d5df866c CC-5404 : colorpickers littering DOM 2013-10-11 13:13:30 -04:00
Naomi 5defb12430 CC-5398 : "Add Show" does not update calender "orange" progress bar immediately showing content is added until refresh page or different view. 2013-10-11 11:53:53 -04:00
Naomi 916d85ca57 CRLF 2013-10-10 17:41:05 -04:00
Naomi 2ef95db747 CC-5371 : Fail to extend/shrink show by drag
window rezie event was triggered when resizing the show, caused problem.
Using the windowResize callback provided by fullcalendar now.
2013-10-10 17:38:49 -04:00
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -04:00
Daniel James 036df34f06 These files should not be chmod executable 2013-10-10 10:37:42 +01:00