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

4135 Commits

Author SHA1 Message Date
denise 6b560eede1 Deleted unused functions in Show.php 2013-05-13 09:55:17 -04:00
denise 741507fab1 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-13 09:22:50 -04:00
denise ba82e3b3ae Added missing localization files for en_GB, and de_AT 2013-05-13 09:22:40 -04:00
Naomi 82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi da46757e28 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 17:36:18 -04:00
Naomi b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
denise 27b79c2e91 CC-5128: Library -> Do not auto sort by scheduled 2013-05-10 16:17:30 -04:00
denise a9d0b53954 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 16:08:07 -04:00
denise 79bc927a30 CC-5130: Calendar -> Linked icon disappears if show is full 2013-05-10 16:07:54 -04:00
Martin Konecny ab13acba84 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 15:24:56 -04:00
Martin Konecny 6e0a3ffc60 CC-5102: 
Cross Fading: No cross fading effect

-fixed start/end calculations
 2013-05-10 15:24:43 -04:00
denise a3eda62bb2 CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only 2013-05-10 15:18:54 -04:00
denise 7b8a37065a CC-5080: Calendar -> Warn user a show cannot be linked again once it has been unlinked 2013-05-10 14:53:01 -04:00
denise 414348dd11 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 14:18:03 -04:00
denise 13458ad687 CC-5122: Calendar -> linked show: Change the repeating weekday will lost all the contents 2013-05-10 14:17:54 -04:00
Martin Konecny 0c4691f3ea Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 13:20:07 -04:00
Martin Konecny 2250d89cbd CC-5013: 
Re-Added watched folder wont update

-fixed
 2013-05-10 13:19:56 -04:00
Martin Konecny c36333ae07 code cleanup 
-user proper method for checking null
-reduce line length to 80 chars
 2013-05-10 12:37:25 -04:00
Naomi 987537fbdc CC-5121 :fix some SQL statements not being escaped/prepared 2013-05-10 12:35:08 -04:00
Naomi d5e7185789 Merge branch 'sql-changes' 
Conflicts:
	airtime_mvc/application/models/StreamSetting.php
	airtime_mvc/application/models/Subjects.php
 2013-05-10 12:23:57 -04:00
Naomi 5666b688a0 CC-5112 : Listen Status: Please clean obsoleted mount point from status report page 
CRLF
 2013-05-10 12:03:33 -04:00
Naomi 263b89295f Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 11:59:49 -04:00
Naomi 115af29f2e Merge branch 'CC-5112-status-page' 2013-05-10 11:59:37 -04:00
Naomi 8f31dd3069 CC-5112 : Listen Status: Please clean obsoleted mount point from status report page 2013-05-10 11:56:20 -04:00
Martin Konecny f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -04:00
Martin Konecny 3948964e8d remove useless log 2013-05-09 16:58:50 -04:00
denise afb24c37ab CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 16:07:34 -04:00
denise 8cd8d0922f CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 16:05:04 -04:00
denise b7337d0df3 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 15:53:24 -04:00
denise 40eb51b892 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:53:12 -04:00
Martin Konecny 9c05511613 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:08:47 -04:00
Martin Konecny 21df9013ee CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 14:43:59 -04:00
Martin Konecny 3ed106af56 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 13:29:00 -04:00
Martin Konecny 92c7c9c951 should constants instead of literals - only in function for now... 2013-05-09 13:28:26 -04:00
Naomi 540e817101 fixing sql to be prepared statements. 2013-05-09 13:28:22 -04:00
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -04:00
denise 9c8935af47 CC-5114: Calendar: User from different timezone will see the same start/end time when editing show 2013-05-09 09:35:27 -04:00
Martin Konecny d06b2f3f94 CC-5116: 
Please add opus into the file name filter

-fixed
 2013-05-08 17:06:50 -04:00
denise 2e69b35d75 CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell 2013-05-08 16:28:45 -04:00
denise 8344f3f3d5 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 15:09:10 -04:00
denise fe88e6249a CC-5093: Please disable link option for recording show 2013-05-08 15:08:56 -04:00
Naomi 35c8e80f6b Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 14:21:55 -04:00
Naomi a18fc87d97 CC-5065 : Playlist length is not built on actual cue in/out value 2013-05-08 14:19:22 -04:00
denise 9dbec4636a CC-5106: Calendar: Context menu "Show contents" is missing for past shows 2013-05-08 13:43:27 -04:00
denise b4dc17f7e8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 12:06:00 -04:00
denise d8ba15fac4 CC-5091: Linked Show: Cannot change the start time ahead 2013-05-08 12:05:45 -04:00
Naomi 299dfdc18a Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 11:44:50 -04:00
Naomi fe916ec043 CC-2301 : adding in crossfade durations to smart blocks. 2013-05-08 11:43:53 -04:00
Martin Konecny 62d666ea4d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-07 16:21:50 -04:00
Martin Konecny 9f6a1033ea CC-5109: Fix race-condition when updating cc_pref table 2013-05-07 16:21:34 -04:00