Commit Graph

12143 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
cliff.wang b827321093 cc-5747 Replaygain: doesnt work for aac tracks 2014-03-20 13:02:37 -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
Albert Santoni 2cf9c5ca1b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-11 18:28:47 -04:00
Albert Santoni 73cbead4c3 CC-5729: Pypo race condition on show source kick event kills playout
* Fixed a race condition in pypo which could kill playout. Input kick
  events and non-file/webstream events could result in an exception
  being thrown. Fixed the logic error behind this, caught the exception
  just in case, and added some code to prevent uncaught pypopush
  exceptions from terminating the thread.
* Could prevent playout breakage in similar situations
2014-03-11 18:01:29 -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