BenDroid
|
54302257f2
|
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
|
563fdf6485
|
Merge branch 'master'
Conflicts:
src/net/Client.cpp
|
2018-03-02 23:22:06 +01:00 |
|
BenDroid
|
85ee140ea7
|
Fixed merge issues
|
2018-03-02 21:54:23 +01:00 |
|
BenDroid
|
4f6200f057
|
Manual merge
|
2018-03-02 21:29:53 +01:00 |
|
BenDroid
|
e9edd366fe
|
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
|
b799a28923
|
Fixed merging
|
2018-03-02 20:51:48 +01:00 |
|
BenDroid
|
887bdbeace
|
Merge branch 'master'
Conflicts:
src/cc/Httpd.cpp
|
2018-03-02 20:49:05 +01:00 |
|
BenDroid
|
8ec749b6c5
|
Merged branch master into master
|
2018-03-02 20:48:27 +01:00 |
|
BenDroid
|
80ca028e39
|
Increased network connection timeouts
|
2018-03-02 20:48:15 +01:00 |
|
Ben Gräf
|
ab66c2a4d9
|
Merge remote-tracking branch 'origin/master' into dev_tls
|
2018-03-02 09:21:43 +01:00 |
|
Ben Gräf
|
7116c8b1b4
|
Update README.md
|
2018-03-02 09:19:49 +01:00 |
|
Ben Gräf
|
aad64970d3
|
Added Dockerfile
|
2018-03-02 08:38:39 +01:00 |
|
Ben Gräf
|
c6d1b57d74
|
Update README.md
|
2018-03-01 22:37:04 +01:00 |
|
BenDroid
|
ed6f58186a
|
Readded build
|
2018-03-01 21:37:51 +01:00 |
|
BenDroid
|
e0fe2f633a
|
Changed again dependencies download
|
2018-03-01 21:33:43 +01:00 |
|
BenDroid
|
35fc62677f
|
Changed download urls
|
2018-03-01 21:20:02 +01:00 |
|
BenDroid
|
8d09bc9800
|
windows buildserver fixes
|
2018-03-01 21:10:29 +01:00 |
|
BenDroid
|
7f36b9eb3e
|
More buildserver fixes
|
2018-03-01 21:05:25 +01:00 |
|
BenDroid
|
8bbd30695c
|
Changes in build config
|
2018-03-01 20:57:51 +01:00 |
|
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 |
|
xmrig
|
79345119c6
|
Update CHANGELOG.md
|
2018-02-19 15:58:44 +07:00 |
|
XMRig
|
9af8ceb063
|
v2.4.5 RC
|
2018-02-19 04:31:50 +07:00 |
|
xmrig
|
f5a0429f0d
|
Update README.md
|
2018-02-19 04:17:50 +07:00 |
|
xmrig
|
cc22c9d61c
|
Update README.md
|
2018-02-18 05:49:37 +07:00 |
|
xmrig
|
45f5afd2b7
|
Merge pull request #379 from DeadManWalkingTO/master
Update README.md
|
2018-02-18 05:48:09 +07:00 |
|
xmrig
|
c9acc2912e
|
Update CHANGELOG.md
|
2018-02-18 05:32:36 +07:00 |
|
xmrig
|
f0604d1e97
|
Update README.md
|
2018-02-18 05:06:10 +07: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 |
|
XMRig
|
531c657b64
|
Merge branch 'master' of github.com:xmrig/xmrig
|
2018-02-08 17:35:20 +07:00 |
|
XMRig
|
c50ccd4e06
|
Merge branch 'Foudge-master'
|
2018-02-08 17:34:33 +07:00 |
|
XMRig
|
184f79ad3f
|
Fix code style, replace tabs to space #2.
|
2018-02-08 17:21:12 +07:00 |
|
XMRig
|
e78e810cfe
|
Fix code style, replace tabs to space.
|
2018-02-08 17:02:32 +07:00 |
|
XMRig
|
c804ef1888
|
Merge branch 'master' of https://github.com/Foudge/xmrig into Foudge-master
|
2018-02-08 16:56:20 +07: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 |
|