3992 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastian Grewe	daf709147d	Merge pull request #2688 from TopoX84/patch-4 ... Update status.tpl	2018-03-05 15:21:03 +01:00
TopoX84	2566b674d8	Update status.tpl ... by adding <div class="table-responsive"> it will fix a display issue on the mobile version while looking at wallet status	2018-03-05 08:17:39 -06:00
Sebastian Grewe	40ba37490e	Merge pull request #2687 from desaerun/patch-4 ... add start to getusertransactions api page	2018-03-05 11:29:02 +01:00
desaerun	fbdcd9c4e7	add "start" to getusertransactions api	2018-03-05 03:24:28 -07:00
Sebastian Grewe	cfcd1d1081	Merge pull request #2674 from smiba/patch-1 ... Minor changes to the block overview template	2018-03-03 16:31:14 +01:00
Sebastian Grewe	1b217711a4	Revert "add 'start' parameter to getusertransactions api page"	2018-03-03 16:27:10 +01:00
Sebastian Grewe	64c5c99cfe	Merge pull request #2681 from desaerun/patch-3 ... add 'start' parameter to getusertransactions api page	2018-03-03 16:27:04 +01:00
desaerun	653729e6dc	add 'start' parameter to getusertransactions api page ... sets db start row	2018-02-27 23:12:45 -07:00
Sebastian Grewe	6c0d9a1e9e	Merge pull request #2676 from smiba/development-patch-1 ... Expend CSRF token expiry & Est. Diff for constantly changing coins	2018-02-21 20:38:58 +01:00
smiba	f0f4e005a0	Minor spelling correction	2018-02-21 14:32:06 +01:00
smiba	85ef9d521c	Expend CSRF token expiry time ... Change it to 15 minutes, 2 minutes is not enough.	2018-02-21 14:31:58 +01:00
smiba	1c53b2efb7	For coins with constant difficulty change ... Do not show in x amount of blocks, if the coin’s difficulty changes on every block	2018-02-21 14:27:49 +01:00
Bart S	ef8f66468c	Add orange colour to blocks found ... Together with #83efd60	2018-02-21 13:32:47 +01:00
Bart S	83efd6026c	Minor changes to the block overview template ... Often my pool is at 101% because thats just luck, however bright red makes users often think something is wrong I'd say up to 115% make it orange, its less worrying.	2018-02-21 13:22:25 +01:00
Sebastian Grewe	ae337b418c	Merge pull request #2673 from smiba/patch-1 ... Fix: Calculate the efficiency correctly in API	2018-02-21 10:27:18 +01:00
Bart S	a598e6ecd6	Don't divide by zero ... Small change I overlooked	2018-02-21 10:08:21 +01:00
Bart S	963a8f7d27	Fix: Calculate the efficiency correctly in API	2018-02-20 22:57:16 +01:00
Sebastian Grewe	9e6f02b648	Merge pull request #2669 from mecab/ignore-old-cronjob-option ... Add -t option to ignore too old cronjob active flag	2018-02-05 11:26:40 +01:00
mecab	495f48d4e5	Add -t option for cronjobs to ignore too old active jobs.	2018-02-04 10:20:05 -06:00
Sebastian Grewe	3cb167a70e	Merge pull request #2666 from mecab/fix-contact-form ... Fix errors while sending mail is not displayed in contact form.	2018-02-01 09:51:38 +01:00
Sebastian Grewe	1d32e1e6af	Merge pull request #2667 from mecab/remove-validation ... Remove unnessesary validation in sending contact form	2018-02-01 09:51:14 +01:00
Sebastian Grewe	6dab6be177	Merge pull request #2665 from mecab/fix-sql ... Fix SQL in cleaning up old notifications	2018-02-01 09:50:17 +01:00
mecab	1b871e16ce	Remove unnessesary validation in sending contact form ... Non-alphanumeric character causes some problems if used in the mail header (i.e., sender name or subject), but the filled info is just used in the mail body so removing the validation is safe at this time.	2018-01-31 11:36:45 -06:00
mecab	2fec35cf70	Fix errors while sending mail is not displayed in contact form.	2018-01-31 11:33:59 -06:00
mecab	be1b57a838	Fix SQL in cleaning up old notifications ... Subtracting numbers from datetime causes wrong value, or raises error depending on MySQL version/configurations	2018-01-31 11:32:58 -06:00
Sebastian Grewe	2dfe1751f3	Merge pull request #2649 from tperalta82/master ... Fix INSERTS with Selects inside	2017-12-29 07:45:49 +01:00
Tiago Peralta	0e3cbe2876	Fix INSERTS with Selects inside	2017-12-29 03:45:42 +00:00
Sebastian Grewe	9628c34e82	Merge pull request #2646 from tperalta82/master ... Possibly fixed all the MySQL errors from my previous pull request	2017-12-13 14:56:51 +01:00
Tiago Peralta	d259610ac5	Properly fixed possible MySQL Errors, will test in prod for 1 day ... Had to rewrite all the mysqli->error/errno to mysqli->lastused because of the read/write splitting, shoud be working now Reverted notifications code back to previous version Added the lastused property to mysqlms, so that when calling the error/errno we know what was the lsat connection used, same for insert_id	2017-12-11 03:30:56 +00:00
Tiago Peralta	12cee6e25a	There was a bug here, whereas the query is perfectly fine, but instead of returning false it was returning the this->sqlError.... which by then was returning the return false, the problem was the log in the cron that was misleading, took 2 days figuring this one out	2017-12-11 02:05:26 +00:00
Tiago Peralta	c27db96f05	removed trash	2017-12-10 20:48:14 +00:00
Tiago Peralta	c5ca7a83b2	Modified slave validation ... .gitignore composer.lock, and remove composer.lock from repo	2017-12-10 20:46:30 +00:00
Tiago Peralta	142261d4e0	Same as previous... damn hangover	2017-12-10 20:34:53 +00:00
Tiago Peralta	7929ac79ab	Same as previous	2017-12-10 20:34:15 +00:00
Tiago Peralta	f290aeee63	Small bugfix to not validate the Slave when it's not enabled	2017-12-10 20:22:58 +00:00
Sebastian Grewe	777f167a62	Merge pull request #2642 from tperalta82/master ... Implement Read/Write Split directly on PHP / Fixed statistics->graphs page	2017-12-10 11:32:35 +01:00
Tiago Peralta	4233563573	Removed var_dump from debugging....	2017-12-08 23:11:19 +00:00
Tiago Peralta	52c3e2ff93	Implemented Read/Write Mysql Split (Master for writes, Slave for reads)	2017-12-08 22:53:15 +00:00
Tiago Peralta	064ab5ac83	No need for composer.lock to be versioned	2017-12-08 15:53:56 +00:00
Tiago Peralta	b5cfd0e90b	Fixed statistics graphs	2017-12-03 03:10:35 +00:00
Sebastian Grewe	02581f1ea3	Merge pull request #2632 from MPOS/development ... UPDATE : Development to Master	2017-11-02 09:49:15 +00:00
Sebastian Grewe	eedbaba316	[VERSION] 1.0.8 release	2017-11-02 10:38:51 +01:00
Sebastian Grewe	810bd4dc0b	Merge pull request #2629 from sunk818/patch-2 ... Update default.tpl	2017-11-02 09:22:54 +00:00
Sebastian Grewe	8d8ba4fcbf	Merge pull request #2630 from blondak/development ... Development	2017-10-30 07:09:52 +00:00
sunk818	3f52e01c9b	Update default.tpl ... Formatting fixes. Linked github URL for mpos.	2017-10-27 14:20:41 -07:00
Sebastian Grewe	043bde2a4d	Merge pull request #2624 from Caberhagen/master ... Address change	2017-10-17 15:04:36 +00:00
Caberhagen	e42fc1859f	Address change	2017-10-07 10:06:41 +02:00
Sebastian Grewe	cca0179d83	Merge pull request #2605 from shtse8/master ... Update findblock.php	2017-09-29 07:02:04 +02:00
Kyle Tse	94d67b3013	Update findblock.php ... Try-Catch any exception thrown from `getblockhash` for safety.	2017-09-29 05:50:48 +08:00
Kyle Tse	15c7c02268	Update findblock.php ... Fixed Invalid Blockhash for listsinceblock.	2017-09-29 05:01:20 +08:00