Commit graph

758 commits

Author SHA1 Message Date
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
BenDroid
60c72eaaea Preparation for #1.3.2 2018-01-14 19:15:08 +01:00
BenDroid
d5dc20865f Merge branch 'dev'
Conflicts:
	src/App_unix.cpp
2018-01-12 23:14:49 +01:00
BenDroid
e8d8d4e866 Fixed for freebsd 2018-01-12 23:12:39 +01:00
BenDroid
e7bf633010 Integrated config less startup with only given CCServer and token #14
Fixed time drift issues on dashboard by sending server time to dashboard and use this for comparisson
2018-01-12 23:11:00 +01:00
xmrig
6352881fe6 Update CHANGELOG.md 2018-01-11 15:08:24 +07:00
XMRig
f8481a4430 #328 Added guard to prevent paused message spam and crash. 2018-01-10 22:55:45 +07:00
XMRig
aa60605578 Merge branch 'master' of github.com:xmrig/xmrig 2018-01-10 17:35:40 +07:00
XMRig
409741ddc1 Fix version. 2018-01-10 16:56:08 +07:00
xmrig
00b96be5fc Update README.md 2018-01-07 21:36:49 +07:00
stanz2g
49337f9992 can build without microhttpd when WITH_HTTPD=OFF 2018-01-06 17:07:07 +08:00
XMRig
1c68ca4f9d Add libmicrohttpd version to --version output. 2018-01-05 19:41:19 +07:00
XMRig
5b6045d398 Fix recent MSVC 2017 version detection. 2018-01-05 17:23:39 +07:00
BenDroid
0d652508b1 Preparation for #1.3.1 2018-01-04 21:19:13 +01:00
BenDroid
0a0f18322e Merged branch dev into master 2018-01-04 20:14:51 +01:00
BenDroid
193ff49ebd Added one notification per miner when sending a command 2018-01-04 20:14:32 +01:00
BenDr0id
e12b0070a9 Merge remote-tracking branch 'xmrig/master' into dev 2018-01-04 17:34:52 +01:00
BenDr0id
9620fe0eeb Added cpu sockets to dashboard client info popup
* Removed not working background mode for *nix
2018-01-04 17:32:56 +01:00
XMRig
aacb9b271e Fix wrong signal handle. 2018-01-04 11:38:32 +07:00
XMRig
4791e531f1 Update README.md. 2018-01-02 13:49:31 +07:00
XMRig
56e21b41fa Remove extra semicolon. 2018-01-02 13:41:00 +07:00
XMRig
158c4c1b64 #279 Add missing stdio header 2018-01-02 12:24:57 +07:00
Ben Gräf
36596dda59 Updated Dashboard Screenshot 2017-12-30 15:19:38 +01:00
BenDroid
9f0bc484c3 Added additional fix for #16 2017-12-29 21:42:46 +01:00
BenDroid
02534a3679 Removed debug log 2017-12-29 19:51:12 +01:00
BenDroid
a6a3447507 Added fix for miner to retry when server is not reachable 2017-12-29 19:50:14 +01:00
BenDroid
ff8a284acd Merged branch master into master 2017-12-29 19:44:36 +01:00
BenDroid
84a3a01dbf Fixed #10 CCServer spontaneously freezes and holds CPU 100% 2017-12-29 19:44:27 +01:00
Ben Gräf
d04ec17f93 Fix for #16 Build error on FreeBSD 2017-12-29 09:01:46 +01:00
BenDroid
9ef2eea854 Preparation for #1.3.0 2017-12-27 13:33:39 +01:00
BenDroid
5d92227cd2 Added toggle switch for turning off offline notifications
Cleanup
2017-12-27 12:56:27 +01:00
BenDroid
4a2cf5d387 Merged branch master into master 2017-12-26 23:09:29 +01:00
BenDroid
e40003601d Added notification when miner went offline
Added multi miner editor (search&replace)
Cleaned error and info notifications
2017-12-26 23:09:18 +01:00
Ben Gräf
2625168e37 Update README.md 2017-12-26 15:58:14 +01:00
Ben Gräf
81a06ee21d Added fix for av mode 3 and 4 (CPU without AES) #11 2017-12-26 15:14:42 +01:00
BenDroid
4bb86be776 Fixed MSC_VER for latest Visual Studio builds
Added build type to summary to detect if debug or release build
2017-12-24 21:16:28 +01:00
BenDroid
90f3bc9e4e Updated version/changelog 2017-12-20 21:03:08 +01:00
BenDroid
344a4997a6 Added select/deselect all to table header and footer 2017-12-20 20:34:32 +01:00
BenDroid
ebf0ecc3c0 Fixed Memory Leaks #7 in XMRigCCServer
+ Little cleanup in dashboard
2017-12-18 22:02:06 +01:00
BenDroid
21e231a6fc Merged latest xmrig master into master 2017-12-16 22:44:01 +01:00
BenDroid
cdbcd32ab1 Refactored Dashboard to send one command to multiple miners and "beautified" dashboard
- Miner now publishs own config to XMRigCCServer on startup
- Added command to trigger miner to upload config to XMRigCCServer
- Added threads to miner info tooltip on client id
2017-12-16 22:39:28 +01:00
BenDroid
e349dccb91 - Refactored Dashboard to send one command to multiple miners and "beautified" dashboard
- Miner now publishs own config to XMRigCCServer on startup
- Added command to trigger miner to upload config to XMRigCCServer
- Added threads to miner info tooltip on client id
2017-12-16 22:38:51 +01:00
XMRig
9fd354fee4 #262 Reduce cmake version requirement to 2.8. 2017-12-16 19:27:11 +07:00
BenDroid
b42e779bf6 Updated index 2017-12-10 16:50:28 +01:00
BenDroid
e443dbdee8 Merged branch master into master 2017-12-10 16:41:36 +01:00
BenDroid
c17d2ac8c8 Fixed total sum row for filtered tables 2017-12-10 16:41:28 +01:00
Ben Gräf
e87ced67f4 Update README.md 2017-12-05 14:19:50 +01:00
BenDroid
3dd0c12e38 Updated changelog 2017-12-04 21:52:31 +01:00