Commit graph

2615 commits

Author SHA1 Message Date
ignotus
da9bc481c5
Merge pull request #9 from corrados/master
update
2020-06-06 22:13:06 +02:00
Volker Fischer
bb0c3a03c5 merge fix 2020-06-06 17:21:38 +02:00
Volker Fischer
e4ddf24758
Merge pull request #326 from pljones/feature/315-audacity-lof
Feature/315 audacity lof
2020-06-06 17:20:14 +02:00
Volker Fischer
0e2185ae01 using Qt5 connections instead of the old Qt4 ones (just a subset converted right now, more TODO) 2020-06-06 17:19:25 +02:00
Peter L Jones
552b3ba5f3 #315 Provide Audacity "list of file" for session 2020-06-06 16:05:32 +01:00
Volker Fischer
33073658c6 show channel numbers if --ctrlmidich is used (#241, #95) 2020-06-06 15:51:54 +02:00
Volker Fischer
ab92abfd63 update German translation 2020-06-06 13:51:06 +02:00
Volker Fischer
0bcb654ff7 some more work for German translation 2020-06-06 13:37:40 +02:00
Volker Fischer
09fe7d566c small updates 2020-06-06 11:02:31 +02:00
Volker Fischer
40cf36eb87 small fix 2020-06-06 10:24:22 +02:00
Volker Fischer
66cc806fb0
Merge pull request #337 from gilgongo/master
Updates for mute icon behaviour
2020-06-05 23:04:37 +02:00
Jonathan
726d4c27a2
Added mute icon description 2020-06-05 22:01:36 +01:00
Jonathan
67a34bdff7
Add mute icon 2020-06-05 21:44:37 +01:00
Volker Fischer
81d000b773 merge fixes 2020-06-05 22:43:14 +02:00
Volker Fischer
a9dc06f167
Merge pull request #336 from Martyna27/master
Initial polish translation
2020-06-05 22:41:31 +02:00
Volker Fischer
ff54814264
Merge pull request #335 from atsampson/installdesktop2
Better jamulus.desktop installation
2020-06-05 22:34:36 +02:00
Martyna27
2827b7689c Initial polish translation 2020-06-05 22:02:16 +02:00
Adam Sampson
69e3286057 Install the 512x512 icon, used by the .desktop file. 2020-06-05 20:55:20 +01:00
Adam Sampson
d66a8fac60 Expand $TARGET in jamulus.desktop. 2020-06-05 20:54:22 +01:00
ignotus
352389b8cb
Merge pull request #8 from corrados/master
additional fix for #316 -> do not send valid IP address from server
2020-06-05 21:50:48 +02:00
Volker Fischer
e7621af754 additional fix for #316 -> do not send valid IP address from server 2020-06-05 20:56:52 +02:00
ignotus
4c2d26efde
Merge pull request #7 from corrados/master
update
2020-06-05 14:35:14 +02:00
Volker Fischer
4c58ea8e8d small fix 2020-06-05 14:26:25 +02:00
Volker Fischer
b1c97c2d36 avoid showing IP address if no name in the musician profile is given #316 2020-06-05 14:22:44 +02:00
daryl
ac0c26221b update 2020-06-05 13:44:36 +02:00
ignotus
12dc74285a
Merge pull request #6 from corrados/master
update
2020-06-05 13:43:00 +02:00
Volker Fischer
850883f3fc Merge branch 'master' of github.com:corrados/jamulus 2020-06-05 13:40:06 +02:00
Volker Fischer
cb48d6fb85 prepare for #316 2020-06-05 13:39:54 +02:00
Volker Fischer
f67292137d
Merge pull request #334 from ignotus666/master
Spanish tr update
2020-06-05 13:37:34 +02:00
ignotus
7b668d9a29
Update translation_es_ES.ts 2020-06-05 13:32:58 +02:00
ignotus
cea9212b6d
Merge pull request #5 from corrados/master
some fixes for the German translations
2020-06-05 13:31:44 +02:00
daryl
762991d13c Spanish tr update 2020-06-05 13:26:34 +02:00
Volker Fischer
781861cb3d some fixes for the German translations 2020-06-05 13:21:11 +02:00
ignotus
13521ac2d9
Merge pull request #4 from corrados/master
update
2020-06-05 13:16:54 +02:00
Volker Fischer
b6cd0c16f4
Merge pull request #333 from ignotus666/master
corrections
2020-06-05 13:11:51 +02:00
Volker Fischer
b11b4024fe merge fixes 2020-06-05 13:10:59 +02:00
ignotus
7f533cfa6b
Merge pull request #3 from corrados/master
Merge pull request #330 from ignotus666/master
2020-06-05 13:08:45 +02:00
ignotus
724717312c
Update manual.md 2020-06-05 13:06:50 +02:00
ignotus
693dcf9962
Update clientdlg.cpp 2020-06-05 13:06:06 +02:00
Volker Fischer
1a6123f499
Merge pull request #330 from ignotus666/master
Updated/reviewed help texts and Spanish translation
2020-06-05 13:04:51 +02:00
ignotus
bab77e4695
Merge pull request #2 from corrados/master
update
2020-06-05 12:01:27 +02:00
Volker Fischer
7c7c0ad930 merge fixes 2020-06-05 11:19:04 +02:00
Volker Fischer
b3b52f74e0
Merge pull request #319 from dos1/ukulele
instruments: Add ukulele and bass ukulele
2020-06-05 11:05:28 +02:00
Volker Fischer
6b1737e74c permanent server is now a server which is on for 2 days (was changed to 3 days previously but 2 should be sufficient) 2020-06-05 11:03:24 +02:00
Volker Fischer
c780d82ac2
Merge pull request #331 from atsampson/installdesktop
Install jamulus.desktop
2020-06-05 10:53:51 +02:00
ignotus
b36097eba4
Added contributors back who got deleted for some reason 2020-06-04 22:52:02 +02:00
daryl
ffbe471427 corrections 2020-06-04 22:07:56 +02:00
Adam Sampson
4c2a5d1834 Install jamulus.desktop.
Because this assumes the binary is called jamulus, and qmake doesn't
have a mechanism for string expansion, only do so if noupcasename is
set.
2020-06-04 18:09:48 +01:00
ignotus
f1087591d1
Merge pull request #1 from corrados/master
update
2020-06-04 18:57:52 +02:00
daryl
94e75d66ec update Spanish translation 2020-06-04 18:56:37 +02:00