denise
|
2d09ba3a16
|
CC-4863: I18N:System -> Listener status: string is not translated
|
2013-05-14 11:50:01 -04:00 |
denise
|
4ee7724149
|
CC-4864: I18N: Password reset page is not translated
|
2013-05-14 11:32:21 -04:00 |
denise
|
c173744929
|
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
|
2013-05-14 10:58:06 -04:00 |
denise
|
bfd525395a
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-14 08:59:30 -04:00 |
denise
|
9377e21293
|
Removed unnecessary function call when editing a show
|
2013-05-14 08:59:21 -04:00 |
Naomi
|
d9b6a15fb6
|
CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block
|
2013-05-13 18:21:24 -04:00 |
Martin Konecny
|
298e5a9b77
|
better idenfication of which mksafe is being applied
|
2013-05-13 17:52:43 -04:00 |
Martin Konecny
|
f5a0d0a9a4
|
CC-5123:
Pypo: Redundant Pypopush happens after restart pypo service
-was clearing the queue after fetching the schedule :S
|
2013-05-13 17:52:22 -04:00 |
Martin Konecny
|
21a51b6287
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-13 16:10:43 -04:00 |
Martin Konecny
|
be465be9b2
|
CC-5133: Make sure Liquidsoap 1.1.1 is used
add missing file
|
2013-05-13 16:10:21 -04:00 |
Naomi
|
4892b3b544
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-13 16:01:52 -04:00 |
Naomi
|
872f68505b
|
CC-5108 Waveform Editor UI
|
2013-05-13 16:01:06 -04:00 |
Martin Konecny
|
85afe53c89
|
CC-5133: Make sure Liquidsoap 1.1.1 is used
fixed
|
2013-05-13 15:45:56 -04:00 |
Naomi
|
2ba743a436
|
CC-5132 : Playlist Editor: Add file before Smart Block will cause exception
|
2013-05-13 12:23:05 -04:00 |
Naomi
|
bd2462170b
|
CC-5121 : fix some SQL statements not being escaped/prepared
|
2013-05-13 11:42:11 -04:00 |
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 |
Martin Konecny
|
28576adf42
|
disable liquidsoap's add operator normalizing audio
|
2013-05-10 23:19:54 -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 |