denise
2e3e8659c1
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:06:09 -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
Martin Konecny
bc22a8a871
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 14:02:13 -04:00
Martin Konecny
6fddabdd7c
CC-5192
...
Pypo: Live Streaming in first show will block the next show's first track
-fixed. Was caused by clashing keys
2013-05-30 14:02:05 -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
1e9829e85c
CC-5182
...
Liquidsoap: Sometime the tracks in schedule cannot be played
2013-05-28 18:06:23 -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
Martin Konecny
13f7c3941d
update gen-snapshot for 2.4.x git branch
2013-05-28 16:47:06 -04:00
Martin Konecny
73a908055a
Revert "CC-5123 Pypo: Redundant Pypopush happens after restart pypo service"
...
This reverts commit 4c3d2b20db
.
2013-05-28 16:38:15 -04:00
Martin Konecny
176dd91e20
use proper parameters for earlier versions of 'timeout' command
...
-hide warning if older version of timeout doesn't support --version
2013-05-28 16:29:07 -04:00
Martin Konecny
c22df32dd8
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 16:21:57 -04:00
Martin Konecny
3247c7288d
use proper parameters for earlier versions of 'timeout' command
...
-small typo
2013-05-28 16:21:45 -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
Martin Konecny
a4ca2deb0f
use proper parameters for earlier versions of 'timeout' command
...
-lucid has timeout with incompatible parameters compared to newer
versions of ubuntu.
2013-05-28 16:18:29 -04:00
Martin Konecny
4c3d2b20db
CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
...
-if does not exist does not work on pre 5.2 monit version
2013-05-28 15:54:31 -04:00
Martin Konecny
66bb1f6d93
CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
...
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:48:15 -04:00
Martin Konecny
866f007c37
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 15:24:34 -04:00
Martin Konecny
82c0fe1088
CC-5123
...
Pypo: Redundant Pypopush happens after restart pypo service
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:24:26 -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