Commit graph

2893 commits

Author SHA1 Message Date
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
daryl
9e7dea91d8 updated help texts 2020-06-04 17:51:32 +02:00
ignotus
fbc2156283
Update connectdlg.cpp 2020-06-04 17:40:11 +02:00
daryl
4cf71c11a9 update 2020-06-04 17:35:14 +02:00
ignotus
706a92184e
Update clientsettingsdlg.cpp 2020-06-04 16:02:00 +02:00
ignotus
1923bf469e
Update clientsettingsdlg.cpp 2020-06-04 15:58:01 +02:00
ignotus
94b4ed854e
Update clientsettingsdlg.cpp 2020-06-04 15:48:53 +02:00
daryl
68cddb20ae update 2020-06-04 15:42:16 +02:00
daryl
c38cf1c825 update 2020-06-04 15:31:19 +02:00
Volker Fischer
87ade59aac
Merge pull request #329 from gilgongo/patch-1
Corrections
2020-06-04 15:05:33 +02:00
Jonathan
be4d87409c
Corrections
Incorrect (and incomplete) description of "muted" icon behaviour.
2020-06-04 13:20:24 +01:00
daryl
3a01ede996 update 2020-06-04 13:36:14 +02:00
daryl
bd75c353cf update 2020-06-04 13:33:50 +02:00
ignotus
c68b943812
Update util.cpp 2020-06-04 12:28:28 +02:00
ignotus
7b7f65f4b3
Update util.cpp 2020-06-04 12:25:07 +02:00
ignotus
8fa4b8472b
Update util.cpp 2020-06-04 12:20:23 +02:00
daryl
e38e8d6f08 update 2020-06-04 11:53:04 +02:00
daryl
acadfd223d update 2020-06-04 11:49:53 +02:00
Volker Fischer
667c2cc461
Merge pull request #323 from marcan/opus-bugfix
opus: fix equivalent bitrate calculation for <20ms frame sizes
2020-06-04 09:36:32 +02:00
Volker Fischer
3fb699aa2a
Merge pull request #327 from alexbuckland/patch-1
Update small typo on manual.md
2020-06-04 08:51:27 +02:00
Alex Buckland
68ce14f533
Update small typo on manual.md 2020-06-04 00:50:40 +01:00
Hector Martin
36e6b37fa4 opus: fix equivalent bitrate calculation for <20ms frame sizes 2020-06-03 20:16:02 +09:00
Sebastian Krzyszkowiak
a123498cbf
instruments: Add ukulele and bass ukulele
The icons are derived from an Openclipart image by qubodup:
https://openclipart.org/detail/214439/simple-ukulele-no-outline
2020-06-02 19:36:25 +02:00