Commit graph

541 commits

Author SHA1 Message Date
BenDroid
e9b2a73635 Fixing mvsc build server breaks 2018-03-01 20:23:13 +01:00
BenDroid
e3d647859c Added new dependencie package to appveyor 2018-03-01 20:04:19 +01:00
Ben Gräf
19a68424c2 Merge remote-tracking branch 'origin/dev_tls' into dev_tls 2018-03-01 17:44:27 +01:00
Ben Gräf
9d0f570577 Fixed TLS build on Windows GCC/MVSC
Cleanup TLS compile
2018-03-01 17:44:15 +01:00
Unknown
fa0d1e2d0e Made executable names of miner and daemon settable via CMake parameters. 2018-03-01 13:10:55 +01:00
Ben Gräf
67220c8d3d
Added new features to Readme 2018-02-26 21:35:50 +01:00
Ben Gräf
48493bbbb2
Update Options.cpp 2018-02-26 11:44:37 +01:00
Ben Gräf
c3aa7b446b Cleanup 2018-02-26 09:19:46 +01:00
BenDroid
1343d89d59 Merged branch wip_tls_stratum_2nd_approach into dev_tls 2018-02-25 23:33:41 +01:00
BenDroid
69afccf762 Cleanup and added integrated tls config params parsing 2018-02-25 23:32:51 +01:00
BenDroid
b26c1d637a Added clibs-net and clibs-buffer to 3rdparty 2018-02-25 22:10:49 +01:00
BenDroid
6b13f2ad88 Added SSL/TLS support to stratum communication 2018-02-25 22:06:40 +01:00
Ben Gräf
c5fa48215b Merge remote-tracking branch 'origin/master' into dev_tls 2018-02-22 08:36:12 +01:00
BenDroid
9e37fa98fd Manual merged #43 Mac OS Compilation fixes 2018-02-21 23:17:11 +01:00
BenDroid
97df127e81 Fixed hugepages on MacOSx 2018-02-21 23:09:29 +01:00
BenDroid
e082a3d093 Added tls flag to Url 2018-02-09 20:16:07 +01:00
BenDroid
7f9e86a627 Fixed behavior for non-tls mode 2018-02-09 20:15:11 +01:00
BenDroid
576d5f06ae Merged branch master into dev_tls 2018-02-06 21:44:10 +01:00
BenDroid
1330ffae0b Fixed Uptime column in Dashboard
Implemented HTTPS for miner -> server and server -> dashboard
2018-02-06 21:43:53 +01:00
BenDroid
054b302ab5 Added miner uptime to dashboard
WIP SSL/TLS for CC communication and Dashboard
2018-02-05 22:53:38 +01:00
Ben Gräf
0b12e50ac3
Update README.md 2018-01-30 20:45:54 +01:00
Ben Gräf
dd1f131938
Update README.md 2018-01-24 21:44:40 +01:00
Ben Gräf
a63f2ee924
Update README.md 2018-01-24 21:40:44 +01:00
BenDroid
b47e5623a4 Alignment 2018-01-24 21:32:38 +01:00
BenDroid
9f82f98118 Merged branch master into master 2018-01-24 21:31:41 +01:00
BenDroid
9dce071711 When miner is offline status now shows "OFFLINE"
Cleanup of Readme.md
2018-01-24 21:31:27 +01:00
Ben Gräf
a155156ac4
Update README.md 2018-01-23 21:41:04 +01:00
BenDroid
138ad25c74 Changed cmake minimum for test to 2.8 2018-01-20 14:54:06 +01:00
BenDroid
c323b71a1f Fixed 32bit build 2018-01-20 14:49:15 +01:00
BenDroid
a16b608643 Added workaround for xmrigCCServer build issues 2018-01-20 14:16:05 +01:00
BenDroid
36f0d9c68a Fixed arm build and windows build server script 2018-01-20 13:46:46 +01:00
sebastianstolzenberg
12d2663b5a Fixes stub build break and maybe also arm (#31) 2018-01-20 13:34:56 +01:00
BenDroid
bb96310b6a Fixed appveyor build version 2018-01-19 19:45:18 +01:00
Ben Gräf
cf868666d4
Preparation for #1.4.0 (#30)
- Fixed CPU affinity on Windows for NUMA and CPUs with lot of cores
- Implemented per thread configurable Multihash mode (double, triple, quadruple, quintuple)
- Rebased from XMRig 2.4.4
2018-01-19 19:42:06 +01:00
BenDroid
990bf8d963 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
	src/version.h
2018-01-19 19:25:31 +01:00
BenDroid
656e93ad3c Fixed windows gcc build issues 2018-01-14 19:57:59 +01:00
BenDroid
a90681537c Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/cc/XMRigd.cpp
2018-01-14 19:16:10 +01:00
BenDroid
2a0b575420 Preparation for #1.3.2 2018-01-14 19:15:08 +01:00
BenDroid
7d5c2afb2f Merge branch 'dev'
Conflicts:
	src/App_unix.cpp
2018-01-12 23:14:49 +01:00
BenDroid
302660e3ab Fixed for freebsd 2018-01-12 23:12:39 +01:00
BenDroid
bdb0bb9926 Integrated config less startup with only given CCServer and token #14
Fixed time drift issues on dashboard by sending server time to dashboard and use this for comparisson
2018-01-12 23:11:00 +01:00
xmrig
916cf0ae0d
Update CHANGELOG.md 2018-01-11 15:08:24 +07:00
XMRig
e6540229cb #328 Added guard to prevent paused message spam and crash. 2018-01-10 22:55:45 +07:00
XMRig
360f0e8ffd Merge branch 'master' of github.com:xmrig/xmrig 2018-01-10 17:35:40 +07:00
XMRig
038bb1f6bc Fix version. 2018-01-10 16:56:08 +07:00
xmrig
d73bee81ab
Update README.md 2018-01-07 21:36:49 +07:00
XMRig
49b45ddd18 Add libmicrohttpd version to --version output. 2018-01-05 19:41:19 +07:00
XMRig
8b7a737ceb Fix recent MSVC 2017 version detection. 2018-01-05 17:23:39 +07:00
BenDroid
e4b1c8844d Preparation for #1.3.1 2018-01-04 21:19:13 +01:00
BenDroid
882d52927a Merged branch dev into master 2018-01-04 20:14:51 +01:00