Commit Graph

5057 Commits

Author SHA1 Message Date
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 714b9d4d0a CC-5762 : Playlist options validation
element order got switched.
2014-03-31 18:57:38 -04:00
Naomi e71e972e24 CC-5762 : Playlist options validation
using datetimepicker
2014-03-31 18:50:09 -04:00
Naomi ebfebb5d80 CC-5762 : Playlist options validation
error message in incorrect div.
2014-03-31 17:10:03 -04:00
Naomi e9705b7023 CC-5762 : Playlist options validation
making sure datepickers are put back on.
2014-03-31 17:07:06 -04:00
Naomi c0fb7a421f CC-5762 : Playlist options validation
saving rules separately again now. testing a bunch of ways to submit bad values.
2014-03-31 16:52:10 -04:00
Naomi aa53297a9c CC-5762 : Playlist options validation
starting validation for the playlist options section.
adding datepickers where needed, and adding class on advanced search fields so that datepicker icon is shown there.
2014-03-27 18:47:29 -04:00
Naomi b3b0c5bf46 CC-5760 : Search only on enter (or some button press)
library no searches only when search button is pressed or when enter is pressed on an input.
2014-03-26 13:23:19 -04:00
Naomi b15e1e638c CC-5450 : Refactor Media Management (Classes/DB) in Airtime
finishing up last relative date rules.
2014-03-25 14:11:10 -04:00
Naomi 5d236c5311 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
relative date rules.
still working on the range relative rule.
2014-03-24 18:25:56 -04:00
Naomi da7d09755a CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-21 17:30:17 -04:00
Naomi fff72f9f8e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on adding relative date rules.
added new way to add formatters for datatables output. should switch over to this entirely sometime..
2014-03-21 17:03:16 -04:00
Naomi f4bc1d3810 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
formatters back on now playing, over booked button check fix.
2014-03-21 12:05:59 -04:00
Naomi a0c7926903 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
setting disable/show lib statically now to make sure designers can see it.
2014-03-20 17:40:02 -04:00
Naomi 2817ab0fa4 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
rules merged into playlist file.
2014-03-20 17:24:53 -04:00
Naomi 6cc28a6694 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
put in non-function crossfade icon for designers to checkout.
2014-03-20 17:14:49 -04:00
Naomi 3badf8e1a5 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
turning showbuilder check back on.
2014-03-20 15:59:54 -04:00
Naomi 42d3314242 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
removing any resizing/css done in javascript from the now playing page.
started filtering datatables advanced search, should prob move this to zend form somehow.
2014-03-20 15:48:18 -04:00
Naomi b61671e59e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
adding output formatting back in.
2014-03-20 11:56:14 -04:00
Naomi d17b12d372 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working jPlayer, enabling remove controls, finishing playlist preview request.
2014-03-19 19:27:49 -04:00
Naomi 06466bb012 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
scheduling static and dynamic playlists
2014-03-19 18:10:12 -04:00
Albert Santoni 80f09959bb Fixed permissions of unit tests 2014-03-19 17:34:07 -04:00
Naomi d6f9f3ecc9 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on playlist rules - owner tracks and repeat tracks.
2014-03-19 16:43:48 -04:00
Naomi b01348ab46 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on limiting by length. trying to get it to just overshoot, currently it undershoots.
2014-03-18 19:29:39 -04:00
Naomi b89c07095b CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on generating playlists.
2014-03-18 15:50:53 -04:00
Naomi b1b79e734a CC-5723 : jPlayer HTML/CSS modifications 2014-03-18 15:50:31 -04:00
Naomi 919ed1be09 CC-5723 : jPlayer HTML/CSS modifications
adding mute/unmute icon change.
2014-03-18 11:58:15 -04:00
Naomi f6b0d7f7e1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
back to working on new rules and generation
2014-03-13 17:23:50 -04:00
Naomi 22bf7122fc CC-5723 : jPlayer HTML/CSS modifications 2014-03-13 15:42:51 -04:00
localizer 5dca00c593 updated translation resources 2014-03-13 16:49:36 +00:00
Naomi d11fcfd87e Merge branch '2.5.x' into 2.6.x 2014-03-13 12:44:59 -04:00
Naomi b209108604 CC-5732 : History -> Playout History: live chat banner blocks navigator buttons
avoid livechat problems
2014-03-13 12:37:56 -04:00
Naomi 76515b2d15 Merge branch '2.5.x' into 2.6.x 2014-03-12 18:04:54 -04:00
Naomi d3f9492577 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-12 18:00:24 -04:00
Albert Santoni c104048bc7 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-12 18:01:51 -04:00
Albert Santoni 5b9ceb8d2d Made the runtests.sh script work regardless of CWD 2014-03-12 18:01:27 -04:00
Naomi 97989953c8 CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
need to modify these to user timezone strings to match the new changes.
2014-03-12 18:00:01 -04:00
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
drigato f7602cadd8 Fixed broken test 2014-03-12 17:32:22 -04:00
localizer e0386f9752 updated translation resources 2014-03-12 09:34:44 +00:00
localizer 9a803b1da5 updated translation resources 2014-03-12 09:30:20 +00: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 87868aedac CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-11 16:13:40 -04:00
Naomi 4f6b001941 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
need to check if criteria exists for new playlists
2014-03-11 15:15:55 -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 c668d91e08 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 18:33:15 -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
drigato 725b5da154 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:42:12 -04:00
drigato 14c670aa20 CC-5728: Problem when removing repeat option and changing start date 2014-03-10 17:41:57 -04:00
Naomi 1854d76f03 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:39:36 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
drigato 8ad866c2a2 Fixed changing the start date on a non-repeating show 2014-03-10 17:32:54 -04:00
drigato 78d34a6d16 Fixed broken test 2014-03-10 17:31:24 -04:00
Naomi bb00936792 CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-10 12:38:42 -04:00
drigato 03bb0e1df9 CC-5725 Changing a show's repeat type removes first instance from repeating seriesCC-5726: Write database test cases for CC-5725 2014-03-07 15:59:57 -05:00
drigato 6b91d2daf8 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-07 14:52:32 -05:00
Naomi 9162ec99fd CC-5450 : Refactor Media Management (Classes/DB) in Airtime
making sure to store boolean values.
2014-03-06 18:28:05 -05: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
drigato 35fd639c1c CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 11:18:13 -05:00
drigato 51b5cc2052 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 10:54:40 -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
drigato bcda9ea5e6 Broke unit test for adding content to single show 2014-03-05 14:50:35 -05:00
drigato 426b75b635 CC-5724: Changing start date of a repeating show will update content incorrectly 2014-03-05 14:37:07 -05:00
drigato ebc68b980c CC-5718: Show content can get scheduled in instances that are in the past
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
2014-03-05 13:12:27 -05:00
Naomi 3ce67a6523 CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-04 12:52:26 -05:00
drigato 7660e0cd84 CC-5719: Incorrect show content start time
The show content was getting recalculated twice sometimes.
So if the difference between the original and now show start
date-time and was 2 hours, the scheduled content would have
a difference of 4 hours
2014-03-04 11:29:49 -05:00
Naomi bbdc9dcb6d CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-03 17:11:09 -05:00
drigato b433a529ab CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 2014-03-03 16:42:52 -05:00
Naomi e6896a3256 show instance clean up 2014-02-27 18:30:15 -05: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
drigato 1715f2187d CC-5715: Write database test to check the schedule start times after editing a repeating show and changing the repeat day 2014-02-27 13:08:41 -05:00
drigato 4cb785a062 CC-5716: Write database test to check the show content after editing a repeating show and removing a repeat day 2014-02-27 12:10:28 -05:00
drigato e5cdaf3785 Temporarily commenting out test 2014-02-27 09:32:28 -05:00
drigato 1acdf2ca80 CC-5716: Write database test to check the show content after editing a repeating show and removing a repeat day 2014-02-27 07:35:08 -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
drigato 753003639f CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
2014-02-25 17:22:17 -05:00
drigato f1658f6490 CC-5697: Editing a linked show's repeat day sets wrong day for show content
Fixed a problem where we can't store the original cc_show_day data
because none can exist at some points. If the user changes the only
repeat day, the cc_show_day rule is deleted first then recreated
2014-02-25 17:16:14 -05:00
Naomi 96a02c8642 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing imports and casting types.
2014-02-25 16:59:56 -05:00
drigato 3db1cd412a CC-5697: Editing a linked show's repeat day sets wrong day for show content
Optimized how we store the instance ids that already exist
2014-02-25 16:51:48 -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 594e8df606 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up file summary in history.
2014-02-24 18:42:33 -05:00
drigato cd592827fd CC-5698: Library -> Scheduled column doesn't get updated when bulk adding items
Array storing file ids of scheduled files was in wrong place
and was getting re-created everytime a file was inserted into a show
2014-02-24 17:46:16 -05:00
drigato 6cd84363a6 CC-5697: Editing a linked show's repeat day sets wrong day for show content
Added comment
2014-02-24 16:04:48 -05:00
drigato 787f19f69a CC-5697: Editing a linked show's repeat day sets wrong day for show content
When a user edits a show and changes the repeat day, we are really deleting the instances from the original
repeat day and creating new instances. Therefore, we don't need to update the show content's start/end time
in this case.
2014-02-24 14:49:11 -05:00
Naomi 362aa20cc1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
history item refactoring mostly done.
2014-02-21 18:44:00 -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 062d8ae9d6 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
removing all old media access from ApiController, using the new tables.
2014-02-20 16:10:08 -05:00