Commit graph

11456 commits

Author SHA1 Message Date
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
b1c18f89db Merge branch '2.4.x' 2013-05-31 09:32:29 -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
6f0af2bb52 Merge branch '2.4.x' 2013-05-30 15:52:40 -04:00
Martin Konecny
a46763b092 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:52:36 -04:00
Martin Konecny
8ca1caecbe CC-5194:
Fail to execute phone_home_stat

-fixed by using native Zend autoloader
2013-05-30 15:52:29 -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
586bdf99e9 Merge branch '2.4.x'
Conflicts:
	python_apps/pypo/pypopush.py
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/pypofile.py
	python_apps/pypo/schedule/pypoliqqueue.py
2013-05-30 15:21:32 -04:00
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