Commit graph

639 commits

Author SHA1 Message Date
BenDroid
540f97adc5 Fixed more linker errors 2018-03-03 16:28:37 +01:00
BenDroid
c7094eff7d Fixed centos static buid with tls 2018-03-03 16:12:53 +01:00
BenDroid
1c123868a5 Preparation for release 1.5.0 2018-03-03 12:25:27 +01:00
BenDroid
f36d04a9c5 Full TLS support CC/Pool
-Easy rename of miner/daemon
-Dockerfile
-Miner uptime in Dashboard
-Based on XMRig 2.4.5
2018-03-03 11:48:37 +01:00
BenDroid
327a9b20d7 Merge branch 'master'
Conflicts:
	src/net/Client.cpp
2018-03-02 23:22:06 +01:00
BenDroid
ac805bd56f Fixed merge issues 2018-03-02 21:54:23 +01:00
BenDroid
f171801a61 Manual merge 2018-03-02 21:29:53 +01:00
BenDroid
892c7207fb Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
	src/App.cpp
	src/App.h
	src/Cpu.cpp
	src/Options.cpp
	src/Options.h
	src/crypto/CryptoNight_arm.h
	src/crypto/CryptoNight_x86.h
	src/version.h
2018-03-02 21:29:33 +01:00
BenDroid
30069aef22 Fixed merging 2018-03-02 20:51:48 +01:00
BenDroid
7ad143a0ac Merge branch 'master'
Conflicts:
	src/cc/Httpd.cpp
2018-03-02 20:49:05 +01:00
BenDroid
78283d2975 Merged branch master into master 2018-03-02 20:48:27 +01:00
BenDroid
38f06ac4ca Increased network connection timeouts 2018-03-02 20:48:15 +01:00
BenDr0id
b9efc0e1fd Merge remote-tracking branch 'origin/master' into dev_tls 2018-03-02 09:21:43 +01:00
Ben Gräf
faa996b19c Update README.md 2018-03-02 09:19:49 +01:00
Ben Gräf
9e71f9c80a Added Dockerfile 2018-03-02 08:38:39 +01:00
Ben Gräf
ef9a4f18dc Update README.md 2018-03-01 22:37:04 +01:00
BenDroid
2cb6a0e2a7 Readded build 2018-03-01 21:37:51 +01:00
BenDroid
905f143e00 Changed again dependencies download 2018-03-01 21:33:43 +01:00
BenDroid
3ce89105da Changed download urls 2018-03-01 21:20:02 +01:00
BenDroid
19f7b8d5d7 windows buildserver fixes 2018-03-01 21:10:29 +01:00
BenDroid
e1d6a3a0dc More buildserver fixes 2018-03-01 21:05:25 +01:00
BenDroid
042c5c1c16 Changes in build config 2018-03-01 20:57:51 +01:00
BenDroid
65fb65f228 Fixing mvsc build server breaks 2018-03-01 20:23:13 +01:00
BenDroid
a61d5056ea Added new dependencie package to appveyor 2018-03-01 20:04:19 +01:00
BenDr0id
fa96fc6faf Merge remote-tracking branch 'origin/dev_tls' into dev_tls 2018-03-01 17:44:27 +01:00
BenDr0id
972f542901 Fixed TLS build on Windows GCC/MVSC
Cleanup TLS compile
2018-03-01 17:44:15 +01:00
Unknown
12fa14f034 Made executable names of miner and daemon settable via CMake parameters. 2018-03-01 13:10:55 +01:00
Ben Gräf
26a260b21e Added new features to Readme 2018-02-26 21:35:50 +01:00
Ben Gräf
bc110ef162 Update Options.cpp 2018-02-26 11:44:37 +01:00
BenDr0id
246f6bcebd Cleanup 2018-02-26 09:19:46 +01:00
BenDroid
9522e09c3d Merged branch wip_tls_stratum_2nd_approach into dev_tls 2018-02-25 23:33:41 +01:00
BenDroid
be293d72cd Cleanup and added integrated tls config params parsing 2018-02-25 23:32:51 +01:00
BenDroid
16fff2fd51 Added clibs-net and clibs-buffer to 3rdparty 2018-02-25 22:10:49 +01:00
BenDroid
b5cba7bf57 Added SSL/TLS support to stratum communication 2018-02-25 22:06:40 +01:00
BenDr0id
d6f27624b7 Merge remote-tracking branch 'origin/master' into dev_tls 2018-02-22 08:36:12 +01:00
BenDroid
8fd88a4e11 Manual merged #43 Mac OS Compilation fixes 2018-02-21 23:17:11 +01:00
BenDroid
204835a3f3 Fixed hugepages on MacOSx 2018-02-21 23:09:29 +01:00
xmrig
3ebff4137c Update CHANGELOG.md 2018-02-19 15:58:44 +07:00
XMRig
def56d5233 v2.4.5 RC 2018-02-19 04:31:50 +07:00
xmrig
968365ffc5 Update README.md 2018-02-19 04:17:50 +07:00
xmrig
e5ffa34206 Update README.md 2018-02-18 05:49:37 +07:00
xmrig
5c598ef545 Merge pull request #379 from DeadManWalkingTO/master
Update README.md
2018-02-18 05:48:09 +07:00
xmrig
2cce6e0c72 Update CHANGELOG.md 2018-02-18 05:32:36 +07:00
xmrig
2cb4424f99 Update README.md 2018-02-18 05:06:10 +07:00
BenDroid
bcbda15832 Added tls flag to Url 2018-02-09 20:16:07 +01:00
BenDroid
f97a7fb121 Fixed behavior for non-tls mode 2018-02-09 20:15:11 +01:00
XMRig
2571fd1958 Merge branch 'master' of github.com:xmrig/xmrig 2018-02-08 17:35:20 +07:00
XMRig
c434312be6 Merge branch 'Foudge-master' 2018-02-08 17:34:33 +07:00
XMRig
8a3b8ff788 Fix code style, replace tabs to space #2. 2018-02-08 17:21:12 +07:00
XMRig
9cf2b0a782 Fix code style, replace tabs to space. 2018-02-08 17:02:32 +07:00