Commit graph

196 commits

Author SHA1 Message Date
BenDr0id
eda12de623 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	src/version.h
2017-10-25 14:14:05 +02:00
BenDroid
e1135e7c8c Reenabled restart in daemon for win/linux 2017-10-24 23:54:45 +02:00
Ben Gräf
627321b6cc Fixed windows build 2017-10-24 14:24:29 -07:00
XMRig
fd029201b0 v2.4.2. 2017-10-23 15:32:07 +03:00
Ben Gräf
a3c6548790 Updated empty admin page 2017-10-23 11:55:40 +02:00
Ben Gräf
9eddece9ab Set default dashboard to index.html, when it isn't configured 2017-10-23 11:50:02 +02:00
Ben Gräf
baa9faddd5 Fixed crash on startup 2017-10-23 11:48:34 +02:00
BenDroid
94a830302d Updated documentation, minor cleanup 2017-10-22 22:48:38 +02:00
BenDroid
e4ccdd000f Removed compiler warning, fixed links in readme 2017-10-21 23:09:04 +02:00
Ben Gräf
1b0805bacc Modified version 2017-10-21 22:27:20 +02:00
Ben Gräf
bb09944cb8 Merge remote-tracking branch 'xmrig/master' into feature_cc 2017-10-21 22:13:24 +02:00
Ben Gräf
caa409f87c Added default_config.json and modified README 2017-10-21 21:58:30 +02:00
Ben Gräf
9e92a84405 Added howto/notes doc and new default configs 2017-10-20 21:18:36 +02:00
Ben Gräf
4be1a6e1b2 Merge remote-tracking branch 'origin/feature_cc' into feature_cc 2017-10-20 20:07:36 +02:00
Ben Gräf
d34d51d7a2 Cleanup 2017-10-20 20:07:25 +02:00
XMRig
10df3ec227 Code style fixes for FreeBSD support pull request. 2017-10-20 19:54:18 +03:00
vcambur
9c0fe73102 Some FreeBSD fixes 2017-10-20 08:41:08 +00:00
Ben Gräf
25d7302f07 Added missing file 2017-10-20 09:15:44 +02:00
Ben Gräf
3f39ca31fd Added xmrigDaemon to control xmrigMiner
Fixed some issues in CCClient and CCServer
2017-10-19 22:12:20 +02:00
BenDroid
2b97e2f4ff Fixed bugs in CCClient, added missing delete/desttructors for restart 2017-10-17 22:31:22 +02:00
Ben Gräf
5c065a8e48 Fixes in command handling 2017-10-16 22:33:18 +02:00
Ben Gräf
641bd27b77 Added default cc server config 2017-10-16 21:58:13 +02:00
Ben Gräf
cf06186a3f Added default client config 2017-10-16 21:54:44 +02:00
Ben Gräf
215efcabb8 Implemented CCClient and extended CCServer service 2017-10-16 21:38:00 +02:00
XMRig
1af1ba6b5f #153 Force reconnect when duplicated job received. 2017-10-16 01:26:55 +03:00
XMRig
bea3bc74b2 v2.4.1. 2017-10-15 04:52:00 +03:00
XMRig
f9202c6951 #147 Fixed comparability with monero-stratum. 2017-10-10 16:31:19 +03:00
Ben Gräf
003e17d18f Cleanup CMakeLists, Added ControlCommand 2017-10-08 20:46:48 +02:00
Ben Gräf
4f606644fe Fixed compile issues 2017-10-07 22:54:49 +02:00
Ben Gräf
b6fc43b8a4 Merge remote-tracking branch 'xmrig/master' into feature_cc 2017-10-07 20:05:56 +02:00
XMRig
a3297b9ea4 Fixed 32 bit version crash. 2017-10-07 20:36:02 +03: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
XMRig
7d4bdfc913 v2.4.0 2017-10-07 16:55:58 +03:00
XMRig
1123c20da0 Add comments to config file. 2017-10-07 00:49:38 +03:00
XMRig
8729616698 Added special option -t all 2017-10-06 23:44:25 +03:00
Ben Gräf
eed483581a Added initial CC Server / Webservice 2017-10-06 22:01:17 +02: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
4cf3bb9930 #111 Fixed build without AEON support. 2017-09-16 15:20:33 +03:00
XMRig
3a7bb24b40 #108 Silently ignore invalid values for donate-level option. 2017-09-13 18:01:28 +03:00
XMRig
729ee08631 #101 Fix MSVC 2017 (15.3) version detection. 2017-09-08 14:54:43 +03:00
XMRig
e9a16912c3 Fix typo. 2017-09-02 19:24:06 +03:00
XMRig
4928b6d3e3 Sync changes with xmrig-nvidia 2017-09-02 19:04:40 +03:00
XMRig
d0db4770ed Added API port to summary. 2017-09-02 15:50:27 +03:00
XMRig
38e93ed6e3 Fixed Linux build. 2017-09-02 14:33:53 +03:00
XMRig
d52aa5a72b v2.4.0-dev 2017-09-02 14:25:54 +03:00
XMRig
5591666069 Fixed msvc build. 2017-09-02 14:14:10 +03:00
XMRig
fd98dc236a Added support to build without API. 2017-09-02 12:12:40 +03:00