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

4560 Commits

Author SHA1 Message Date
Naomi Aro 17abb4ad9a need a better random field name generator to avoid problems 2013-08-21 21:44:52 -04:00
Naomi 84efdfd64a crlf 2013-08-20 17:23:48 -04:00
Naomi 007a7ee7ef casting non mandatory types from "", to avoid database query problems. 2013-08-20 17:23:15 -04:00
Naomi 2e572c652c creating a random string for field names to work for all languages. 2013-08-20 15:31:13 -04:00
Naomi 6d5febe4f7 getting rid of characters from a field name that may cause problems. 2013-08-20 15:18:05 -04:00
Naomi 10ef55b083 context menu just in the client now. works for both tables. 2013-08-20 14:58:22 -04:00
Naomi Aro 3ea2b920a6 crlf 2013-08-19 23:20:26 -04:00
Naomi Aro 09693ef174 changing to context menu single edit/delete. 2013-08-19 23:19:13 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi Aro 7230b3ef58 removing tabletools from schedule page. 2013-08-16 12:57:04 -04:00
denise 50d5685199 CC-5270: looping on InvalidContentType 2013-08-14 17:43:14 -04:00
Naomi 7cf654551d crlf 2013-08-14 16:39:50 -04:00
Naomi 673c422015 replacing booleans in table with checkbox + column title 2013-08-14 16:38:59 -04:00
denise 5f588afdd5 CC-5293: Calendar page cannot be loaded sometimes 2013-08-14 13:07:06 -04:00
drigato c48f556b7d CC-5303: Interface freezes sometimes when using smart blocks 2013-08-13 16:41:32 -04:00
drigato 033693721e CC-5302: Undefined variable in zend log 2013-08-13 16:36:04 -04:00
Naomi c3c64e6fb1 crlf 2013-08-12 18:18:58 -04:00
Naomi fdf18ec3ce upgrading table tools to version 2.1.5 2013-08-12 18:18:33 -04:00
Naomi b65007868a crlf fix 2013-08-12 15:08:09 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi 5676decd2d Using local copy of jquery UI 1.8.24 2013-08-09 17:11:34 -04:00
Naomi 557b7b641c downgrading UI to a version that still supports our custom CSS (not enough time to upgrade further) 2013-08-09 16:02:07 -04:00
Naomi d201efbe49 crlf 2013-08-09 15:52:50 -04:00
Naomi 333ee7453e downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x 2013-08-09 15:52:22 -04:00
denise 5bdc1a1e4b Update jplayer to 2.4.0 2013-08-09 13:04:33 -04:00
denise a2bba67679 Merge branch '2.4.x' 2013-08-09 13:02:33 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi aaf2e5c2f6 better casting on form checkbox, setting populate flag properly based on if id is set (for create/update) 2013-08-05 15:05:26 -04:00
Naomi 31c604d09c can update an existing history item entry. Form is pre-populated. 2013-08-02 18:16:23 -04:00
Naomi 590837a357 crlf 2013-08-02 16:16:04 -04:00
Naomi e047c2f71d can configure the file summary template as well now. 2013-08-02 16:15:32 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi b480a5ae18 crlf 2013-08-02 11:19:46 -04:00
Naomi 6e43094d10 pagination working properly (but not with filtering, have removed serach for now anyways.) 2013-08-02 11:18:15 -04:00
denise 8ba95b3587 CC-5262: PHP error happens when creating shows 
SAAS only because there is no recording show form
 2013-08-02 11:03:14 -04:00
Naomi 35f552361e more informative names 2013-08-01 17:50:10 -04:00
Naomi af38d3cb02 CRLF 2013-08-01 17:10:04 -04:00
Naomi 2341b7b68c can order data in the item table 2013-08-01 17:09:42 -04:00
Naomi 557b3f9c9b CRLF 2013-08-01 16:37:10 -04:00
Naomi a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
denise 06f5f2f5a7 CC-5283: Calendar gets messy, possibly after upgrade 2013-08-01 15:38:34 -04:00
Naomi b33f33964a crlf 2013-07-31 17:39:45 -04:00
Naomi 7ca28fe81d history item datatable is set up with configurable columns now. 
should add a field when configuring template field for "display name"
 2013-07-31 17:38:48 -04:00
Naomi 0c9c0c16e8 working on sql for custom templates 2013-07-30 20:04:10 -04:00
Naomi 07819d895d fix added to avoid a blank row in aggregate view 2013-07-30 19:32:31 -04:00
Naomi a170ee7308 crlf 2013-07-30 19:25:06 -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 a2d4af5449 CRLF 2013-07-29 17:22:44 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi db4e025c05 CRLF fix 2013-07-29 16:32:05 -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
denise 7d70a5ed28 Deleting show code improvement. 2013-07-29 15:13:47 -04:00
denise ff557ec75f CC-5283: Calendar gets messy, possibly after upgrade 2013-07-29 15:10:24 -04:00
denise 1046a0916d CC-5289: Exception about linked show in zendphp.log 2013-07-29 14:13:56 -04:00
Naomi Aro c0206ff8f4 CRLF 2013-07-29 08:59:04 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS. 
working on configuring a template.
 2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
Naomi Aro c7b5592fa9 starting to populate with the template. 2013-07-26 11:36:58 -04:00
drigato 4cbbd1145b CC-5285: API Request: Get ON AIR light status 2013-07-24 15:30:49 -04:00
drigato d9859ff006 CC-5285: API Request: Get ON AIR light status 2013-07-24 15:17:10 -04:00
Naomi ecb2f81211 creating an new row for edit/delete links in the datatable 
working on creating/editing records.
 2013-07-23 18:01:43 -04:00
denise c2f2a541c7 CC-5285: API Request: Get ON AIR light status 2013-07-23 17:39:38 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 19ba788bae CLRF 2013-07-22 10:47:11 -04:00
Naomi Aro 634eb40a0c creating an entry. 2013-07-22 10:45:39 -04:00
drigato f76bb5209e CC-5222: Calendar: Ends time of show is missed in Weekly view 2013-07-19 12:46:04 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Naomi 1abbe85d6d IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

dos2unix fix
 2013-07-03 16:02:17 -04:00
Naomi e63518f2da IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature

moving original functionality into the service.
 2013-07-03 16:00:48 -04:00
Naomi 9f7e85b273 IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature
 2013-07-03 15:20:40 -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
Naomi Aro e0d2de642d CC-5254 : Listener Status for SHOUTcast doesn't work 
clrf
 2013-06-24 17:26:20 -04:00
Naomi Aro c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Naomi Aro 3858371b16 CC-5251 : clrf 2013-06-24 11:15:09 -04:00
Naomi Aro a680421281 CC-5251 : Playlist length is not shown in Library 2013-06-24 11:09:03 -04:00
Naomi Aro bec56e5f4b CC-5247 : Single file audition pop-up has non-functional forward and reverse buttons 2013-06-24 10:19:10 -04:00
drigato c2e9f90eb9 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-20 15:22:00 -04:00
drigato f82cb364c1 CC-5246: Calendar: ON AIR show has an incorrect context menu 2013-06-20 15:21:33 -04:00
drigato 39d108ffb3 Merge branch '2.4.x' of https://github.com/bitdevil/Airtime into 2.4.x 2013-06-20 14:12:42 -04:00
Naomi Aro 157f66bb74 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-20 14:03:56 -04:00
Naomi Aro 6b0ab535e5 CC-5244 : Exception when creating Smartblock 2013-06-20 14:03:13 -04:00
drigato 3f9e756912 CC-5245: It's able to edit contents for current ON AIR linked show 2013-06-20 12:56:05 -04:00
drigato bc16ac0793 Updated ko_KR po file. Thanks James Moon! 2013-06-19 10:46:28 -04:00
drigato 28d73264da CC-5240: Overnight Linked Shows, newly generated not getting content 2013-06-19 01:17:32 -04:00
denise b95a0d7c4a CC-5241: deleting a linked show, show comes back in the schedule 2013-06-18 16:56:16 -04:00
Silvio M. c90aa2f7db update de_DE .po file 
merged and revised version (de_DE, de_AT)
 2013-06-15 19:48:10 +02:00
Martin Konecny 2a0c9769aa Merge branch '2.4.x' 
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	python_apps/pypo/liquidsoap_scripts/fdkaac.liq
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/telnetliquidsoap.py
 2013-06-14 16:45:52 -04:00
denise 3f43fc9e8a Merge branch '2.4.x' of https://github.com/danielhjames/Airtime into 2.4.x 2013-06-13 13:38:15 -04:00
Daniel James a7576009fa Updated Greek localization, thanks Kat! 2013-06-13 17:08:20 +01:00
picizse 204ee94535 Update airtime.po 
finished :)
 2013-06-13 17:18:41 +02:00
Naomi 440163f199 CC-5225 : Library: Fail to open Metadata Editor 2013-06-12 13:05:58 -04:00
Daniel James 4d0f93270d Added new string to all English localizations 2013-06-11 17:16:15 +01:00
Martin Konecny 3391aa90c5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-10 15:57:21 -04:00
Martin Konecny 93192853d5 CC-5221 
Don't refresh Calendar after closing add/remove popup
 2013-06-10 15:57:08 -04:00
Martin Konecny deecc9db7b CC-5220 
Cancelled show still appears on Dashboard
 2013-06-10 15:55:57 -04:00
Naomi fe0b0b9a65 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-10 15:54:32 -04:00
Naomi ee1cf64515 CC-4504 : Double scrollbars in Library view 2013-06-10 15:52:46 -04:00
Naomi 01f835c4c4 CC-4504 : Double scrollbars in Library view 2013-06-10 15:50:33 -04:00
Martin Konecny af595e0c8a CC-5217 
Calendar: "NaN..." appears at date field sometimes

fixed
 2013-06-10 14:52:43 -04:00
Martin Konecny b18495a79e CC-5210: "Linked" Icon is missing after adding contents into linked show 
-fixed
 2013-06-07 15:15:52 -04:00
denise 311e0c103d small fix 2013-06-07 14:44:21 -04:00
denise 8bc93fcba7 CC-5218: Provide show id and linked flag to calendar events 
Prefixed attribute names with "data"
 2013-06-07 14:36:52 -04:00
denise 3b353b47b1 CC-5216: Library length does not consider cue points 2013-06-07 14:19:46 -04:00
denise ede618b3ad Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-07 13:58:00 -04:00
denise ee41e13fe1 CC-5218: Provide show id and linked flag to calendar events 2013-06-07 13:57:48 -04:00
Martin Konecny fb4118208e Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-07 13:52:40 -04:00
Martin Konecny ade1890acd CC-5210: 
"Linked" Icon is missing after adding contents into linked show

-fixed
 2013-06-07 13:52:13 -04:00
denise 3f1c47b764 CC-5215: Linked shows sometimes lose crossfades 2013-06-07 13:47:12 -04:00
denise c9b7deba52 CC-5213: Crossfades aren't properly applied in schedule table sometimes 2013-06-07 13:07:08 -04:00
denise eaf337f317 CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:30:24 -04:00
drigato 66af5cddd9 Trying things 2013-06-07 11:30:13 -04:00
denise f4aba1a189 CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:29:45 -04:00
denise 02ca82f85e CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:17:35 -04:00
drigato bef2dc190e Trying things 2013-06-07 11:17:35 -04:00
denise ccb3da3192 CC-5209: Calendar -> Repeat by 5th day of the week problem 2013-06-07 11:17:35 -04:00
denise 59c68569ab CC-5208: DJ can try to edit show not assign to him 2013-06-07 11:17:35 -04:00
Martin Konecny 12221844e0 CC-5206: 
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page

fixed
 2013-06-07 11:17:35 -04:00
Martin Konecny 9f3e1d61d1 Use proper unit conventions for Kilo 2013-06-07 11:17:35 -04:00
Martin Konecny eeb73b7206 CC-5199 
aacencplus encoder is very low quality
 2013-06-07 11:17:35 -04:00
Naomi 99cc75ef51 users can open the current show to schedule and also rebroadcast shows. 2013-06-07 11:17:35 -04:00
Martin Konecny 6498f43dad CC-5211: 
Php Exception: Set large number as year in tracks Metadata

fixed
 2013-06-06 17:02:01 -04:00
Martin Konecny 046039ece1 CC-5207: 
media-monitor restart will reset the cuein/cueout value

-fixed
 2013-06-05 16:14:14 -04:00
denise bad5b12472 CC-5208: DJ can try to edit show not assign to him 2013-06-05 12:05:41 -04:00
Martin Konecny 86f3985c03 CC-5206: 
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page

fixed
 2013-06-04 14:52:26 -04:00
Martin Konecny 92bb9874a6 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-31 15:59:27 -04:00
Martin Konecny 905dd08ed5 Use proper unit conventions for Kilo 2013-05-31 15:59:20 -04:00
Martin Konecny 82a71fdb61 CC-5199 
aacencplus encoder is very low quality
 2013-05-31 15:59:04 -04:00
Naomi 926cf40c22 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-31 11:43:01 -04:00
Naomi 12302aa1dc users can open the current show to schedule and also rebroadcast shows. 2013-05-31 11:42:35 -04:00
denise f28ab12281 Fixed typo. 2013-05-31 09:40:23 -04:00
denise a563bc07ec Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-31 09:28:39 -04:00
denise 26c6a7659e Update to de_DE .po file 2013-05-31 09:28:25 -04:00
Naomi 2c35a0416a clrf fix 2013-05-30 16:53:03 -04:00
Naomi 61427647d6 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 16:52:17 -04:00
Naomi 891cc80069 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 16:52:03 -04:00
denise afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise 4728a90ce5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:43:49 -04:00
denise c1c90a4b9a Smart block fix 2013-05-30 15:43:31 -04:00
Naomi 5fbae77c1f Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:38:34 -04:00
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
denise 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
denise 4d2a569cb1 Fixed de_AT .po file encoding 2013-05-30 13:36:03 -04:00
denise 046c543fae CC-5189: Typo: Stream type's tooltip 2013-05-30 13:31:06 -04:00
denise 21ea3d2aac Fixed typo in fr_FR .po file 2013-05-30 11:59:09 -04:00
denise 4261c48a53 Fixed fr_FR .po file encoding 2013-05-30 11:56:54 -04:00
denise 28ddde3523 Updated version number in all .po files 
Updated fr_FR and de_AT .po files with completed translations
 2013-05-30 11:28:09 -04:00
denise 67e50354e9 CC-5189: Typo: Stream type's tooltip 2013-05-30 11:14:46 -04:00
denise df893af96b Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 11:06:57 -04:00
denise 3f97b071fe CC-5187: Edit show -> disable linking option if show is currently playing 2013-05-30 11:06:45 -04:00
cliff.wang 5d168ef7de Little correction about Chinese translation 2013-05-30 11:02:52 -04:00
cliff.wang adc52d7ff5 Update Chinese mo and po files. 
Update Chinese mo and po files.
 2013-05-30 10:54:28 -04:00
denise f9645980a4 Updating .po files with new string added 2013-05-29 15:28:26 -04:00
denise 91ea1f2240 CC-5184: Timeline -> Filter by show option doesn't work 2013-05-29 15:00:35 -04:00
denise 59d1b1e968 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-29 14:24:41 -04:00
denise e2810606ab CC-5186: Edit current playing show throws exception sometimes 2013-05-29 14:24:29 -04:00
Martin Konecny 2a2fd45567 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-29 13:48:01 -04:00
Martin Konecny 362eba60d5 CC-5181 
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number

-fixed
 2013-05-29 13:47:55 -04:00
denise d3355a527a Removed commented out code 2013-05-29 13:18:37 -04:00
denise 90e235350f Small fix 2013-05-29 13:16:14 -04:00
denise 4c2de70256 CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set 2013-05-29 13:14:44 -04:00
denise 4a7a08a119 CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set 
Crossfades were not getting applied to the track end time
 2013-05-29 12:49:48 -04:00
denise d00f8392bb CC-5183: Use of undefined variable 2013-05-29 12:34:00 -04:00
denise 0d436d323c CC-5179: Now Playing: Schedule will be incorrect after insert action 
Was not accounting for crossfade value when adjusting schedule times after insert
 2013-05-29 11:42:02 -04:00
denise be59810810 CC-5180: Now Playing: No crossfading effects if inserting tracks one by one 2013-05-29 09:41:06 -04:00
Martin Konecny 50ece038c2 fix errors reported by Facebook's scheck 
-controller dir
 2013-05-28 17:45:09 -04:00
Martin Konecny 4ed7c4ccd3 fix errors reported by Facebook's scheck 2013-05-28 17:30:48 -04:00
denise 6520211b4d Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 16:19:30 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table. 
We thought it would be a significant performance booster but it isn't
 2013-05-28 16:19:17 -04:00
Naomi Aro c5550d31fd Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 14:28:28 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -04:00
denise 8f418fb34c Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 14:18:38 -04:00
denise 950cc6d6b7 CC-5177: Create "?" icon beside linked show check box 2013-05-28 14:18:26 -04:00
Naomi Aro 51573d36c9 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:30:47 -04:00
Naomi Aro 96eefee407 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 13:12:15 -04:00
Naomi Aro 5a2b9796ec CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:11:47 -04:00
denise bb5f0c4301 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 11:25:50 -04:00
denise 85ee8aa0b2 Fixed bug where schedule start times were not getting calculated properly 2013-05-28 11:25:37 -04:00
Martin Konecny c8f0c9505e Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 11:07:52 -04:00
Martin Konecny 951eeb0bbe CC-5178: 
Dashboard: Error happens after creating a show

-fixed
 2013-05-28 11:07:45 -04:00
Naomi bf6437cf09 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 17:02:46 -04:00
Naomi 28f957be92 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-27 17:02:34 -04:00
Martin Konecny 84abd78c8f CC-5109: Fix race-condition when updating cc_pref table 
-not a race condition..was a logic error.
 2013-05-27 15:58:29 -04:00
denise 1c452988cf Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 15:35:06 -04:00
denise 90ad62e4f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Refactoring schedule inserts
 2013-05-27 15:34:54 -04:00
Naomi 5ba72d00bc CC-5109 : Fix race-condition when updating cc_pref table 2013-05-27 15:33:53 -04:00
Naomi 408ecc530d CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time 2013-05-27 14:37:16 -04:00
Martin Konecny 63b0d4194a CC-5109: 
Fix race-condition when updating cc_pref table

-not a race condition..was a logic error.
 2013-05-27 12:30:58 -04:00
Naomi 4c791e573b Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 11:57:00 -04:00
Naomi 9ce3b0c043 small modifications to make the waveform enabled in firefox 21 (playout does not work though) 2013-05-27 11:55:57 -04:00
denise cee74b59f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Calculate crossfades during insert instead of after
 2013-05-27 10:39:31 -04:00
Martin Konecny f23fc472ef Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-24 17:01:15 -04:00
Naomi Aro 69f6295553 CC-5108 : Waveform Editor UI 
error check for if both tracks cannot be decoded.
 2013-05-24 11:27:56 -04:00
Naomi Aro f5e03db9fe CC-5108 : Waveform Editor UI 
making sure the correct li is activated when a track has a decoding error.
 2013-05-24 11:23:08 -04:00
drigato 46cc2d00b8 Removed CRLF 2013-05-24 10:30:37 -04:00
drigato 0e9c9e3946 Updating de_DE datatables and plupload language files. Thanks to Silvio Mende 2013-05-24 10:29:07 -04:00
drigato 84dfe127b6 Updating de_DE .po file. Thanks to Silvio Mende 2013-05-24 10:27:02 -04:00