CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-01 21:02:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,434 Commits 14 Branches 16 Tags 1.8 GiB
05ab554d09
Commit Graph

1755 Commits

Author SHA1 Message Date
Jamie Newbon
05ab554d09 Merge branch 'master' into v1-issue-6538-systemscope-setting 
# Conflicts:
#	src/gui/src/AppConfig.cpp
 2020-04-01 16:09:45 +01:00
Jamie Newbon
fdd09d0f5d #6587 Added signal when auto config is changed to update UI 2020-04-01 10:23:14 +01:00
Jamie Newbon
c62d23ab06 #6538 started adding modified settings check to prevent saving changes multiple times 2020-03-31 15:18:57 +01:00
Jamie Newbon
2bff3807f8 #6538 Moved settings from main window to appconfig 2020-03-31 11:09:50 +01:00
Jamie Newbon
ab92492d65 Merge branch 'master' into v1-issue-6538-systemscope-setting 2020-03-27 14:53:39 +00:00
Jnewbon
edbeb325bb
Updated translation from Crowdin (Japanese and Polish) (#6647) 2020-03-27 14:41:37 +00:00
Jamie Newbon
5bdafa3214 Revert "#6622 Changed translation command to update ts files as well" 
This reverts commit a38ac372
 2020-03-24 00:45:11 +00:00
Jamie Newbon
3eb2fe26f0 #6622 Fixed accidentally removed image 2020-03-24 00:29:08 +00:00
Jamie Newbon
1cd3066283 #6622 Fixed error in html text cause all translations to fail to build silently 2020-03-24 00:26:17 +00:00
Jamie Newbon
91db5906f5 #6622 Updated update languages command 2020-03-23 23:51:03 +00:00
Jamie Newbon
a38ac37280 #6622 Changed translation command to update ts files as well 2020-03-23 23:38:18 +00:00
Jamie Newbon
c7a55a6fa7 #6622 Moved compiled translations and added language resource file 2020-03-23 23:32:22 +00:00
talyz
3e80a0bfc0
Build tests again 
The tests were accidentally disabled in
688095d0a7. Since then, the code has
drifted slightly: the synergy lib has been renamed from synergy to
synlib in 4263fd1717 and the curl
dependency was dropped in 491bb2de00.

This re-enables the tests, targets the right lib and removes the
obsolete test.
 2020-03-19 19:08:59 +01:00
Jnewbon
a1421bf13c
Merge pull request #6638 from 67hz/enhancement/help-menu-help-link-6472 
#6472
 2020-03-19 16:15:19 +00:00
Jamie Newbon
11eda20378 #6538 Changed System scope path to be OS dependant 2020-03-19 15:35:29 +00:00
Aaron Hinojosa
1fb400da44 6472 - adding help site to help menu 
6472 - updating help hyperlink text
 2020-03-10 14:14:56 -05:00
Jamie Newbon
a2009d0aa0 #6538 Added event to live swap configs as soon as the scope is changed in settings 2020-02-28 11:34:28 +00:00
Jamie Newbon
70f50a655b #6538 Moved System scope to ini format and saved to application folder 2020-02-28 11:33:30 +00:00
Jamie Newbon
d4ecffd1f0 #6538 Added Scope selection to settings 2020-02-27 00:41:27 +00:00
Jamie Newbon
691019c6b5 #6538 Fixed missing setting and added function to remove repetitions 2020-02-27 00:40:58 +00:00
jnewbon
d4ae9faad0 #6538 Added settings scope switching to AppConfig 
Signed-off-by: jnewbon <jamie@symless.com>
 2020-02-25 17:06:09 +00:00
jnewbon
0243ba9171 #6583 Changed Server config to pull Settings directly from AppConfig instead of maintaining its own pointer 
Signed-off-by: jnewbon <jamie@symless.com>
 2020-02-25 17:06:07 +00:00
jnewbon
87692ad0a5 #6538 Changed mainwindow to grab settings from appconfig instead of maintaining its own pointer 
Signed-off-by: jnewbon <jamie@symless.com>
 2020-02-25 17:06:05 +00:00
Jamie Newbon
969595dfe0 #6538 Loading of global settings if user setting dont exist 2020-02-25 17:06:01 +00:00
Jamie Newbon
59254c1c10 #6538 Made Loading and saving of settings more readable 
Signed-off-by: Jamie Newbon <jamie@symless.com>
 2020-02-25 17:04:57 +00:00
Jnewbon
963fbca39b
Merge pull request #6624 from symless/v1-issue-6622-cmake-language 
Updated build to include compiling of language files
 2020-01-24 15:33:18 +00:00
Jamie Newbon
15744e9069 #6622 Sorting out local codes for translation integration 2020-01-21 18:07:28 +00:00
Jamie Newbon
e2b671dd19 #6622 Added english source for Translation service integration 2020-01-21 16:56:36 +00:00
Jnewbon
e047cd66fa
Merge pull request #6435 from vifino/patch-1 
Fixed missing SSL_get_client_ciphers with LibreSSL
 2020-01-21 16:19:40 +00:00
Jamie Newbon
e7263ae763 Merge branch 'statico-statico-icons' into v1-dev 2020-01-21 16:15:03 +00:00
Jamie Newbon
1ea39d5ff6 #6622 Updates language files 2020-01-21 16:13:26 +00:00
Jnewbon
bbdc842b04
Merge pull request #6618 from symless/v1-issue-4288-printscreen-issue 
Send Print Screen key to Windows clients
 2020-01-21 15:47:24 +00:00
Jnewbon
1027f41053
Merge pull request #6616 from symless/v1-issue-4-quote-deadkey 
Fixed quote key on US International keyboard
 2020-01-21 15:47:04 +00:00
Jnewbon
a7891e721b
Merge pull request #6617 from symless/v1-issue-6593-unicode-support 
Fixed possible data index bug for Unicode read
 2020-01-21 15:46:39 +00:00
Jamie Newbon
4395291b4f #6622 Added compiling of language files to cmake 2020-01-21 11:33:55 +00:00
Jamie Newbon
3ca9bd7af8 #6622 Removed compiled language files from source resources 2020-01-21 11:29:58 +00:00
Jamie Newbon
526de88ca6 #6622 Added all translation files to qt project for easy updating 2020-01-21 11:29:02 +00:00
Jamie Newbon
cb488a3f0f #6622 Removed compiled language files 2020-01-21 11:27:45 +00:00
Jnewbon
e67090bd69
Merge pull request #6621 from jose1711/slovak_translation 
Update Slovak translation
 2020-01-21 09:16:24 +00:00
Jose Riha
ccf8b46c94 Update Slovak translation 2020-01-15 22:57:06 +01:00
Jnewbon
22f6f95494
Merge pull request #6615 from symless/v1-6608-tls-moved 
Reverting changes the the openSSL binary location
 2020-01-15 10:21:46 +00:00
Jamie Newbon
9f700a1977 #4937 Add .mm files to cmake if builder is mac 2020-01-11 15:42:34 +00:00
Jamie Newbon
1c9bb4ad78 #4937 Merge branch 'statico-icons' of https://github.com/statico/synergy into statico-statico-icons 
# Conflicts:
#	src/gui/res/Synergy.qrc
#	src/gui/res/icons/256x256/synergy.ico
#	src/gui/res/mac/Synergy.icns
#	src/gui/src/MainWindow.cpp
 2020-01-11 14:57:44 +00:00
Jamie Newbon
4f2e0b6cdb #4288 Fixed if assignment instead of equals 2020-01-11 01:33:03 +00:00
Jamie Newbon
23a7e5c05f #4288 removed #if 0 blocks 2020-01-11 01:24:22 +00:00
Jamie Newbon
9015f6a328 WIP printscreen fixes for Windows 
# Conflicts:
#	src/lib/platform/MSWindowsDesks.cpp
#	src/lib/platform/MSWindowsDesks.h
 2020-01-11 01:08:00 +00:00
Josh Stone
8299bcda95 #6593 Fix data indexes in Unicode::fromUTF8 2020-01-11 00:15:21 +00:00
Martin van Zijl
9f9627aa66 #4. Fix quote key on US International keyboard. 2020-01-10 23:50:11 +00:00
Jamie Newbon
1a2be15b95 Revert "change openssl path relative to binary" 
This reverts commit 1bc2cf57
 2020-01-09 10:09:49 +00:00
Jamie Newbon
dc363d66ab #6611 Updated untrusted server dialog to show sha256 fingerprint 2020-01-09 10:03:40 +00:00