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
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
BenDroid
fe108a524e
Merged branch master into dev_tls
2018-02-06 21:44:10 +01:00
BenDroid
80c0381dc7
Fixed Uptime column in Dashboard
...
Implemented HTTPS for miner -> server and server -> dashboard
2018-02-06 21:43:53 +01:00
BenDroid
1b7b48f6e3
Added miner uptime to dashboard
...
WIP SSL/TLS for CC communication and Dashboard
2018-02-05 22:53:38 +01:00
Ben Gräf
4f1a288d41
Update README.md
2018-01-30 20:45:54 +01:00
Ben Gräf
e6f05b3648
Update README.md
2018-01-24 21:44:40 +01:00
Ben Gräf
44cf3d8a8f
Update README.md
2018-01-24 21:40:44 +01:00
BenDroid
3f000282e6
Alignment
2018-01-24 21:32:38 +01:00
BenDroid
69950c3470
Merged branch master into master
2018-01-24 21:31:41 +01:00
BenDroid
512bbf83de
When miner is offline status now shows "OFFLINE"
...
Cleanup of Readme.md
2018-01-24 21:31:27 +01:00
Ben Gräf
c62dd7828e
Update README.md
2018-01-23 21:41:04 +01:00
BenDroid
9367814833
Changed cmake minimum for test to 2.8
2018-01-20 14:54:06 +01:00
BenDroid
50a0dbb39f
Fixed 32bit build
2018-01-20 14:49:15 +01:00
BenDroid
d24c27e847
Added workaround for xmrigCCServer build issues
2018-01-20 14:16:05 +01:00
BenDroid
ba3a62ca88
Fixed arm build and windows build server script
2018-01-20 13:46:46 +01:00
sebastianstolzenberg
b2301c07ca
Fixes stub build break and maybe also arm ( #31 )
2018-01-20 13:34:56 +01:00
BenDroid
61db1fec72
Fixed appveyor build version
2018-01-19 19:45:18 +01:00
Ben Gräf
acf27e9341
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
5f8ea98764
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
c7d9074ab4
Fixed windows gcc build issues
2018-01-14 19:57:59 +01:00
BenDroid
34f7fcc957
Merge remote-tracking branch 'refs/remotes/origin/master'
...
Conflicts:
src/cc/XMRigd.cpp
2018-01-14 19:16:10 +01:00
BenDroid
60c72eaaea
Preparation for #1.3.2
2018-01-14 19:15:08 +01:00
BenDroid
d5dc20865f
Merge branch 'dev'
...
Conflicts:
src/App_unix.cpp
2018-01-12 23:14:49 +01:00
BenDroid
e8d8d4e866
Fixed for freebsd
2018-01-12 23:12:39 +01:00
BenDroid
e7bf633010
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
6352881fe6
Update CHANGELOG.md
2018-01-11 15:08:24 +07:00
XMRig
f8481a4430
#328 Added guard to prevent paused message spam and crash.
2018-01-10 22:55:45 +07:00
XMRig
aa60605578
Merge branch 'master' of github.com:xmrig/xmrig
2018-01-10 17:35:40 +07:00
XMRig
409741ddc1
Fix version.
2018-01-10 16:56:08 +07:00
xmrig
00b96be5fc
Update README.md
2018-01-07 21:36:49 +07:00
XMRig
1c68ca4f9d
Add libmicrohttpd version to --version output.
2018-01-05 19:41:19 +07:00
XMRig
5b6045d398
Fix recent MSVC 2017 version detection.
2018-01-05 17:23:39 +07:00
BenDroid
0d652508b1
Preparation for #1.3.1
2018-01-04 21:19:13 +01:00
BenDroid
0a0f18322e
Merged branch dev into master
2018-01-04 20:14:51 +01:00
BenDroid
193ff49ebd
Added one notification per miner when sending a command
2018-01-04 20:14:32 +01:00
BenDr0id
e12b0070a9
Merge remote-tracking branch 'xmrig/master' into dev
2018-01-04 17:34:52 +01:00
BenDr0id
9620fe0eeb
Added cpu sockets to dashboard client info popup
...
* Removed not working background mode for *nix
2018-01-04 17:32:56 +01:00
XMRig
aacb9b271e
Fix wrong signal handle.
2018-01-04 11:38:32 +07:00
XMRig
4791e531f1
Update README.md.
2018-01-02 13:49:31 +07:00
XMRig
56e21b41fa
Remove extra semicolon.
2018-01-02 13:41:00 +07:00
