Nick Bolton
f6c05e7635
removed files from legacy merge
2014-11-07 08:53:13 +00:00
Nick Bolton
ae62f49ba0
merged legacy into master
2014-11-07 08:45:49 +00:00
Xinyu Hou
0588be0696
Versioned to 1.6.2
2014-11-06 18:18:38 +00:00
Nick Bolton
ddbef300ad
ChangeLog for 1.6.1
2014-11-06 18:09:27 +00:00
Xinyu Hou
afa24f4a02
Disable the privilege helper tool #4191
2014-11-06 17:08:58 +00:00
Xinyu Hou
37be6ec45f
Merge pull request #4160 from cribe78/cribe-pullrequest#4055
...
Fixed: Shift keys are not sent to clients #4055
2014-11-06 15:39:30 +00:00
Xinyu Hou
785bf4c01b
Merge pull request #4123 from pdecat/master
...
Fixed: Linux Chrome hover doesn't work
2014-11-05 14:57:10 +00:00
Xinyu Hou
060d8da671
Used move instead of copytree since copy loses symlinks
2014-11-05 14:53:46 +00:00
Xinyu Hou
d347cbd45f
Merge branch 'pdecat-master'
2014-11-05 10:25:31 +00:00
chris
65fc59eeae
clean up changes for pull request
2014-11-04 12:17:30 -05:00
chris
93d864ad6f
clean up changes for pull request
2014-11-04 12:16:58 -05:00
chris
8024aa9ab1
Working fix for #4055 (client shift key problem) in place
2014-11-04 12:06:30 -05:00
Xinyu Hou
3ebd939f32
Made Mac version check before fixing
2014-11-04 16:04:35 +00:00
Xinyu Hou
deed8a28a2
Made Qt frameworks reorganised only once
2014-11-04 15:41:36 +00:00
Xinyu Hou
546a40a653
Checked source and target existence when move #4149
2014-11-04 13:27:47 +00:00
Xinyu Hou
648d9400f3
Reorganize Qt frameworks layout on Mac 10.9 and 10.10#4149
2014-11-04 12:54:45 +00:00
Patrick Decat
fe15c4e928
Merge branch 'master' of https://github.com/pdecat/synergy
2014-10-29 18:43:05 +01:00
Patrick Decat
1f5c18720a
Apply patch from https://github.com/synergy/synergy/issues/3749
2014-10-28 16:06:38 +01:00
Xinyu Hou
e98b3678df
Merge branch 'jerry-sandbox'
2014-10-28 10:52:47 +00:00
Nick Bolton
6dea28d2a0
Update README
2014-10-27 15:53:53 -07:00
Nick Bolton
8e05604338
Update README
2014-10-27 15:51:36 -07:00
Nick Bolton
5d33d7fa86
Added some simple "getting started" info to the wiki
2014-10-27 15:51:10 -07:00
Xinyu Hou
117208754f
Hided elevate checkbox on Unix #4130
2014-10-27 17:15:50 +00:00
Xinyu Hou
23670c5f9b
Moved elevate checkbox to settings #4130
2014-10-27 17:10:12 +00:00
Xinyu Hou
d2191b6b93
Auto elevate for Windows UAC and screen lock #4130
2014-10-27 16:39:18 +00:00
Xinyu Hou
4d3fd14ada
Merge branch 'caramis-master'
2014-10-27 14:46:54 +00:00
Xinyu Hou
6a5da5aaac
Merge branch 'jerry-sandbox'
2014-10-27 14:40:39 +00:00
Xinyu Hou
6756296d85
Made daemon take full responsibility for logging #4128
2014-10-27 14:11:43 +00:00
Xinyu Hou
39b534f3b8
Merge branch 'petroules-mac-fixes'
2014-10-27 13:04:59 +00:00
Xinyu Hou
35e8c88887
Updated ignored list on Mac
2014-10-27 12:00:18 +00:00
Xinyu Hou
de68346874
Fixed hm config error
2014-10-27 11:58:25 +00:00
Xinyu Hou
4f51d5fa50
Used Mac Sdk from config to detect Mac version
2014-10-24 17:22:07 +01:00
Xinyu Hou
df29bf8e54
Merge branch 'helkanen-master'
2014-10-24 15:10:44 +01:00
Jake Petroules
5b4e46f8ea
Fix Info.plist for Synergy GUI.
...
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07:00
Jake Petroules
fed63422a6
Fix typo causing 64-bit binaries to be excluded on OS X 10.6+.
2014-10-23 08:19:00 -07:00
Xinyu Hou
e707b426cf
Ignore Qt Creator user's settings file
2014-10-23 13:22:51 +01:00
Xinyu Hou
5c6eba8790
Merged argsParse to master
2014-10-23 13:21:41 +01:00
Xinyu Hou
561d1c6993
Version to 1.6.1
2014-10-23 12:39:28 +01:00
Nick Bolton
c364befde2
Merge branch 'petroules-64bit'
2014-10-23 12:36:32 +01:00
Xinyu Hou
a32cb41342
Parse arg refactoring #4124
...
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou
a71ebc78b3
Parse arg refactoring #4124
...
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou
943a355359
Parse arg refactoring #4124
...
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Nick Bolton
a7a0b0021d
Only build 64-bit for OS X 10.6 and above #4126
...
@jakepetroules: Looks like we use ScreenSaver.framework which is not
available in 64-bit until OS X 10.6
(https://developer.apple.com/library/mac/documentation/UserExperience/Reference/ScreenSaver/ObjC_classic/index.html#//apple_ref/doc/uid/20001822 ).
I've changed the CMake configuration to only build 64-bit for OS X 10.6
and above. Hopefully everything should work now - try it out!
2014-10-23 10:00:11 +01:00
Jake Petroules
67f17a0fda
Fix SDK detection to work with modern versions of Xcode.
...
This finds the the OS X SDK directory by using xcrun and known fallbacks; users shouldn't be symlinking /Developer.
2014-10-23 01:13:33 -07:00
Jake Petroules
e3d57af4fd
Add support for building with 64-bit architectures on OS X.
...
This patch brings full 64-bit compatibility to Synergy on OS X by
replacing all obsolete 32-bit only Carbon functions with modern
equivalents. All functions introduced have been available since 10.4 so
this won't affect the minimum deployment target. Specifically:
Creating an empty CGEvent and getting its location is behaviourally
identical to GetGlobalMouse, and yes, both are in flipped coordinates.
This was tested with a multi-monitor configuration as well.
TrackMouseLocationWithOptions is behaviourally identical to
GetGlobalMouse in these cases because the timeout was 0 and none of the
other out params were used, except for the MouseTrackingResult in one
call was checked against kMouseTrackingTimedOut. Since the timeout was 0
and not kEventDurationForever, that value never could have been returned
anyway.
Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h
is included on OS X. These types were wrong in 64-bit mode because of
this, causing type redefinition errors.
2014-10-23 01:13:33 -07:00
Nick Bolton
e786dbd60f
fixed code style
2014-10-22 17:04:20 +01:00
Xinyu Hou
e26ccfdce6
Parse arg refactoring #4124
...
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou
f9f2d8e8af
Parse arg refactoring #4124
...
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou
d2814a423c
Parse arg refactoring #4124
...
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Nick Bolton
cfa10d68ca
Merge branch 'master' of https://github.com/ali1234/synergy into ali1234-master
2014-10-22 15:52:06 +01:00