Commit Graph

2644 Commits

Author SHA1 Message Date
Volker Fischer
6de42e4d82 merge fixes (further fixes needed) 2020-06-20 17:44:34 +02:00
Adam Sampson
c9516f1962 Escape server and user names in the status HTML. 2020-06-20 16:43:18 +01:00
Volker Fischer
d6759e4d92
Merge pull request #379 from Alberstein8/master
New Select switch to change several faders like one
2020-06-20 17:31:10 +02:00
Volker Fischer
b7b39ba6f2 some fixes for headless mode 2020-06-20 17:26:52 +02:00
Alberstein8
25f10fcb6d Update audiomixerboard.cpp 2020-06-20 16:26:18 +02:00
Alberstein8
bd2cca5a2c New Select option to move faders at once
New Select switch. All selected channels can be modified in their faders levels at the same time. Useful if channels are organized by instruments, set same level to similar instruments or to raise level of one particular set
2020-06-20 16:20:27 +02:00
Volker Fischer
70d2a0e069 added a TODO comment 2020-06-20 13:47:15 +02:00
Volker Fischer
2ce9b4907e added empty Swedish translation files 2020-06-20 12:45:41 +02:00
Volker Fischer
dbb0148a70 changed translation management so that not only the PC language setting is used but also the country 2020-06-20 12:40:47 +02:00
Volker Fischer
db7a7599b6 bug fixes for OMP implementation 2020-06-19 21:29:09 +02:00
ignotus
74f415f3af
Merge pull request #4 from corrados/master
update
2020-06-19 19:45:19 +02:00
Volker Fischer
34d89fae4f Merge branch 'master' of https://github.com/corrados/jamulus 2020-06-19 16:23:11 +02:00
Volker Fischer
a3dfa4fdf8 update 2020-06-19 16:22:59 +02:00
Volker Fischer
3ac8a2de8d Merge commit '0c7866eda3266bd7cba8bc6af03d969b777e188d' 2020-06-19 16:21:13 +02:00
Volker Fischer
750b60f7e3
Merge pull request #373 from ignotus666/master
Updated Spanish translation
2020-06-19 07:24:14 +02:00
daryl
d5434400a0 Update Spanish tr 2020-06-18 22:12:47 +02:00
ignotus
98075d355a
Merge pull request #3 from corrados/master
update
2020-06-18 22:11:28 +02:00
Volker Fischer
d52779518e update German translation 2020-06-18 21:12:12 +02:00
Volker Fischer
ed71214452 small fix 2020-06-18 21:06:39 +02:00
Volker Fischer
86e70b7d78 initialize pt_BR with pt_PT 2020-06-18 21:02:17 +02:00
Volker Fischer
44977e6557 added pt_BR initial translation file, update all translation files 2020-06-18 21:00:27 +02:00
Volker Fischer
86ddedb306 fix compiler warnings 2020-06-18 19:22:21 +02:00
Volker Fischer
e73b198f92 the local pan middle position is no longer attenuated in Mono-in/Stereo-out mode (#353) 2020-06-18 19:16:31 +02:00
Volker Fischer
ca60870a55 Merge branch 'master' of https://github.com/corrados/jamulus 2020-06-18 16:20:34 +02:00
Volker Fischer
e9f0af6864 check "headless nosound" mode in Travis 2020-06-18 16:20:19 +02:00
Volker Fischer
b84d9448ed output a qmake message on headless mode 2020-06-17 19:38:45 +02:00
Volker Fischer
30d8181423 some more merge fixes 2020-06-17 19:34:51 +02:00
Volker Fischer
a2a489e6f0 merge fixes 2020-06-17 19:26:24 +02:00
Volker Fischer
36ca0bab1f
Merge pull request #322 from marcan/headless-qt
[RFC] Add a "headless" build type which does not depend on QtGui/QtWidgets
2020-06-17 19:23:15 +02:00
Hector Martin
1651a8d065 Add a "headless" build type which does not depend on QtGui/QtWidgets 2020-06-18 00:29:56 +09:00
Alberstein8
f7d9732800
Merge pull request #1 from corrados/master
Update
2020-06-16 19:53:02 +02:00
Volker Fischer
dc7a844f0b bug fix with recording state indicator 2020-06-16 16:58:45 +02:00
daryl
4841437d46 Spanish tr update 2020-06-16 12:54:30 +02:00
ignotus
db428afbe1
Merge pull request #2 from corrados/master
update
2020-06-16 12:42:56 +02:00
Volker Fischer
c5e4d75be0 move the channels tighter together in slim fader mode; adjust help text so that we have as little HTML as possible to simplify translation 2020-06-15 22:45:11 +02:00
Volker Fischer
8d3cdb7a4b merge fixes 2020-06-15 21:48:30 +02:00
Volker Fischer
ac9f054ee3
Merge pull request #368 from pljones/feature/295-receive-and-display-recorder-state
#295 Part 3: Client side changes for recorder state - the end
2020-06-15 21:34:39 +02:00
Peter L Jones
3f4125fe9d Client side changes for recorder state 2020-06-15 19:58:48 +01:00
Volker Fischer
fa0ff9faae merge fixes and some other stuff 2020-06-15 17:29:17 +02:00
Volker Fischer
d4e09a4680
Merge pull request #366 from pljones/feature/295-define-and-send-recorder-state
#295 Part 2: Define and send recorder state
2020-06-15 17:20:09 +02:00
Peter L Jones
ed10faea6d Define and send recorder state 2020-06-14 22:03:14 +01:00
ignotus
2310832894
Merge pull request #1 from corrados/master
update
2020-06-14 22:50:50 +02:00
Volker Fischer
cf543eab7c merge fixes 2020-06-14 21:00:19 +02:00
Volker Fischer
7bce1230c4
Merge pull request #363 from pljones/feature/295-add-recorder-state-protocol-message
#295 Part 1: Define protocol message for server jam recorder state publishing
2020-06-14 20:55:01 +02:00
Peter L Jones
c7080afd0f Define protocol message for server jam recorder state publishing 2020-06-14 19:42:36 +01:00
Volker Fischer
ac140ff8a2 use actual instrument name for sorting by instrument 2020-06-14 19:17:50 +02:00
Volker Fischer
0f12b32766 update 2020-06-14 11:36:28 +02:00
Volker Fischer
e883a51db9 support for storing/recovering the server window positions (#357) 2020-06-14 08:49:58 +02:00
Volker Fischer
2285148cb8 Reference HTML file for welcome message #361 2020-06-13 18:15:52 +02:00
Volker Fischer
1e80a8659b update translation files 2020-06-13 17:43:41 +02:00