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
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
