Commit Graph

214 Commits

Author SHA1 Message Date
Naomi 016d704045 Merge branch '2.5.x' into 2.6.x 2014-04-21 14:31:09 -04:00
Naomi ddecfb0958 CC-5769 : Reimplement the is scheduled/is playlist flags in the library
removing is scheduled/is playlist
2014-04-03 12:53:37 -04:00
Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x
Conflicts:
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-01 10:30:00 -04:00
Naomi 89a404f568 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
combining update media playing into history service, only creating a history entry if the item is being broadcast.
2014-02-27 17:42:27 -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 3be85340d0 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
adding some more database indexes.
2014-02-25 12:02:08 -05:00
Naomi fc8c964d43 Merge branch '2.5.x' into 2.6.x
Conflicts:
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Scheduler.php
	airtime_mvc/application/services/HistoryService.php
	airtime_mvc/build/build.properties
2014-02-25 11:36:55 -05:00
Naomi 4ddbb82e4a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing an import, adding some indexes to the database.
2014-02-25 11:11:04 -05:00
Naomi 256107d2b6 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
improving history logging.
2014-02-21 17:21:20 -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 1b146b77a8 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
trackoffset in playlist contents is now an interval as well.

window function calculates offsets by summing cliplength and subtracting trackoffsets.
2014-02-13 16:03:00 -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 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
Albert Santoni fe9beec778 CC-5651: Unit Test the Scheduler
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
2014-01-13 11:43:17 -05:00
Naomi ba47bd3db4 Merge branch 'memcached' into refactor_merge_251 2013-12-19 15:34:39 -05:00
Naomi Aro 885503c624 CC-5645 : Replace PHP APC 2013-12-17 15:52:32 -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 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 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 537dd6d3c1 CC-5450 : Refactor Media Management
implemented deleting a watched dir media monitor request.
adding media_id to cc_show_instances table for uploading a recorded file.
2013-10-30 17:31:18 -04:00
Naomi 1d59627db8 CC-5450 : Refactor Media Management
implemented create/moved/delete for media monitor actions.
2013-10-30 15:19:21 -04:00
Naomi 5b9a889d2d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
bit better names for database tables, removed uneeded column
2013-10-25 15:08:08 -04:00
Naomi 208f1ac99d CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2013-10-25 10:59:15 -04:00
Naomi 713e4b310b CC-5450 : Refactor Media Management (Classes/DB) in Airtime
upgrading to propel 1.7

creating namespaces in Propel, using these namespaced models within the existing code.
starting test new tables for a new media management system.
2013-10-24 17:44:53 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
Naomi 075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi 5aa983be36 adding an instance id to the playout history table. 2013-08-28 17:15:36 -04:00
Naomi 969889859b improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp. 2013-08-28 13:07:55 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi 7ca3048f36 can add a new list item using the template.
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
Naomi 06e21029d0 saving a template to the DB. 2013-07-29 17:35:07 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi 16581088d9 working on configuring an item template UI.
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi 328c1f3cac IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
denise dc664ad9ff CC-5156: Hungarian language is shown in strange font on login page 2013-05-17 11:05:38 -04:00
denise f4d313a67c Hungarian translation locale option 2013-05-16 12:50:12 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist.
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking'
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
Martin Konecny 6cc366b100 CC-5069:
Airtime 2.4 upgrade scripts

-initial commit
2013-04-26 13:43:40 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
denise 9b4a0ba9c1 CC-4961: Show linking
Removed stamp tables
2013-04-12 10:52:13 -04:00