Commit graph

342 commits

Author SHA1 Message Date
Ben Gräf
084f207884 Merge 2017-10-21 22:14:39 +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
fb902506f1 Typo fixes 2017-10-21 22:07:17 +02:00
Ben Gräf
caa409f87c Added default_config.json and modified README 2017-10-21 21:58:30 +02:00
Ben Gräf
7d1a31539b Updated readme 2017-10-20 21:25:52 +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
Ben Gräf
e245b50a41 Added reloading and action buttons to dashboard 2017-10-20 20:06:20 +02:00
XMRig
66e9f5a8bf Merge branch 'vcambur-master' 2017-10-20 19:55:03 +03: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
bb5f9ba872 Added first simple dashboard 2017-10-19 22:12:38 +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
7e4d0d83ff Update CHANGELOG.md 2017-10-15 03:42:45 +03:00
xmrig
4138d4a178 Update README.md 2017-10-12 22:40:20 +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
1964e4f370 Merge branch 'dev' 2017-10-07 00:58:24 +03:00
xmrig
14cd81a7a1 Update CHANGELOG.md 2017-10-07 00:56:32 +03:00
XMRig
1123c20da0 Add comments to config file. 2017-10-07 00:49:38 +03:00
XMRig
fc810dc87b Fix for msvc 2017-10-07 00:06:58 +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
b43d986537 Update CHANGELOG.md 2017-10-06 19:37:42 +03:00
XMRig
04d3dd6df1 #130 Fixed compatibility with CMake older than 3.1.0. 2017-10-06 19:34:06 +03:00
XMRig
603a9c4c6e Merge branch 'dev' of github.com:xmrig/xmrig into dev 2017-10-06 19:11:05 +03:00
XMRig
914fdd5f0a #97 Ignore keepalive option with minergate and nicehash.com 2017-10-06 19:10:08 +03:00
xmrig
08f6c222ca Update CHANGELOG.md 2017-10-06 17:25:23 +03:00
xmrig
3ead4eba89 Update CHANGELOG.md 2017-10-06 17:17:56 +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
80b0ac2492 #87 Use CMAKE_CXX_STANDARD. 2017-09-04 06:12:45 +03:00