Commit graph

19 commits

Author SHA1 Message Date
BenDroid
9e9f708fd8 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	src/Options.h
	src/Platform_unix.cpp
	src/log/ConsoleLog.cpp
	src/version.h
2017-12-03 21:17:56 +01:00
XMRig
1961dcf824 #204 Fix Linux build, again. 2017-11-17 22:44:36 +03:00
XMRig
4b00eb4a9f #196 Fix Linux build. 2017-11-17 12:59:46 +03:00
Ben Gräf
b6fc43b8a4 Merge remote-tracking branch 'xmrig/master' into feature_cc 2017-10-07 20:05:56 +02:00
XMRig
b46f376f32 Remove unused variables . 2017-10-07 19:23:46 +03:00
XMRig
f02b98efe7 Fix clang warnings and job comparison bug. 2017-10-07 18:58:04 +03:00
Ben Gräf
eebb10c18e Fixed Linux compile issues 2017-10-06 22:00:22 +02:00
XMRig
914fdd5f0a #97 Ignore keepalive option with minergate and nicehash.com 2017-10-06 19:10:08 +03:00
XMRig
af51513614 libjansson replaced to rapidjson.
Sync changes with proxy.
2017-10-04 23:33:30 +03:00
XMRig
e9a16912c3 Fix typo. 2017-09-02 19:24:06 +03:00
XMRig
38e93ed6e3 Fixed Linux build. 2017-09-02 14:33:53 +03:00
XMRig
325e116624 Added API authorization via Bearer token. 2017-09-02 08:18:24 +03:00
XMRig
7798f09dc7 Added connection statistics to API. 2017-09-02 05:47:30 +03:00
XMRig
8e08df2fd2 Rename Results => NetworkState. 2017-09-01 15:35:00 +03:00
XMRig
9e9cddedc5 Added results statistics to API. 2017-09-01 08:02:56 +03:00
XMRig
1651b041de Added hashrate to reports. 2017-09-01 03:45:08 +03:00
XMRig
30dd7d6fe4 Added support for id and worker_id in API. 2017-08-31 06:31:49 +03:00
XMRig
71f06530df Added classes Api and ApiState. 2017-08-31 04:30:59 +03:00
XMRig
5601c7a672 Added Httpd class and API config options. 2017-08-31 02:28:33 +03:00