Commit Graph

3365 Commits

Author SHA1 Message Date
xisi
fd98a9bfaa Actually fixing the code this time? 2013-12-19 09:25:20 -05:00
xisi
a51d195141 Cleanup code for update/add 2013-12-19 09:20:15 -05:00
Sebastian Grewe
0d6ee6d821 [IMPROVED] Auto/Manual Payout Disabled
This will re-add the ability to disable auto or manual payouts. Option
to disable the entire cronjob is left intact.

Fixes #1034 when merged.
2013-12-19 15:17:29 +01:00
Joey
47a13f937b Update worker.class.php
Cleaned up code
2013-12-19 09:11:59 -05:00
Sebastian Grewe
01656e28c4 Merge pull request #1033 from TheSerapher/master
Correct Undefined Index error in mail.class.php
2013-12-19 05:48:19 -08:00
Sebastian Grewe
3444ac27c2 Merge pull request #1032 from nrpatten/PopUp-Tac
[ADDED] PopUp window for registration tac
2013-12-19 05:31:03 -08:00
nrpatten
8b69ba1216 Update layout.css 2013-12-20 00:28:45 +11:00
nrpatten
61151a50ac Update tacpop.inc.php 2013-12-20 00:15:28 +11:00
nrpatten
01a23a638f Update index.php 2013-12-20 00:14:25 +11:00
nrpatten
e02df01ed0 Update master.tpl
[ADDED] tinybox.js for tac popup, Removed not double type="text/javascript"
2013-12-19 23:04:47 +11:00
nrpatten
ff8f2d94e3 TAC PopUp window for registrations 2013-12-19 06:58:53 -05:00
Joey
d85ae9bd7c Update worker.class.php
[UPDATE] Fix for issue #957
2013-12-19 06:51:28 -05:00
Joey
fcebc8eb2b Update worker.class.php
Fix for issue #957
2013-12-19 06:48:00 -05:00
nrpatten
fc2ffd4868 TAC PopUp window for registrations 2013-12-19 06:42:34 -05:00
Joey
722432fecc Update error_codes.inc.php
Fix to issue #957
2013-12-19 06:00:55 -05:00
Joey
019e3c8082 Update worker.class.php
Fix for issue #957
2013-12-19 05:59:23 -05:00
nrpatten
6df340c1ef Update default.tpl
Add Tac Popup Center Captcha align Tac Image
2013-12-19 21:11:51 +11:00
nrpatten
66a99cd086 Create default.tpl
Add TacPop default.tpl
2013-12-19 21:07:10 +11:00
nrpatten
147f7bfc21 Update master.tpl
Add tinybox.js
2013-12-19 21:02:17 +11:00
nrpatten
e0c066d656 Create tacpop.inc.php 2013-12-19 20:59:26 +11:00
nrpatten
4d06f36590 Update custom.css
Add PopUp CSS
2013-12-19 20:57:38 +11:00
nrpatten
64494672d8 Create tinybox.js
TinyBox PopUp JS
2013-12-19 20:51:35 +11:00
Sebastian Grewe
0ecb921035 [IMPROVED] Debug logging for purgeArchive calls 2013-12-19 09:36:16 +01:00
Sebastian Grewe
ac1a561f7b [IMPROVED] Better handling of archived shares
Please check the appropriate ticket #1021 for details of the changes
made. Tested locally with shares created via INSERT.

Fixes #1021 after merge.
2013-12-19 09:34:45 +01:00
Sebastian Grewe
f14fd17b2b Merge pull request #1028 from TheSerapher/issue-1024
[CHANGE] 8 digits for dashboard estimates
2013-12-19 00:06:17 -08:00
Sebastian Grewe
4992274eea [CHANGE] 8 digits for dashboard estimates
Fixes #1024 once merged.
2013-12-19 09:04:38 +01:00
Sebastian Grewe
cba4e5f1a4 Merge pull request #1003 from TheSerapher/issue-986
[FIX] Admin User Panel for PPS Payouts
2013-12-18 22:40:22 -08:00
Sebastian Grewe
4849beb0cc Merge pull request #1022 from xisi/patch-1
[FIX] Uninitialized var in roundstats class
2013-12-18 22:16:48 -08:00
Joey
e0c2a19542 [FIX] Uninitialized var in roundstats class 2013-12-18 09:34:38 -05:00
Sebastian Grewe
dd80fdcc1a Merge pull request #1020 from TheSerapher/issue-997
Issue 997
2013-12-18 00:27:42 -08:00
Sebastian Grewe
5c6d7c5009 Merge pull request #1019 from TheSerapher/issue-1017
[FIX] Typo in Navbar
2013-12-18 00:23:37 -08:00
Sebastian Grewe
322a759249 [FIX] Typo in Navbar
Fixes #1017 once merged.
2013-12-18 09:23:12 +01:00
Sebastian Grewe
3715f30f7b [FIX] Disable verbose mode, use cmdline switch instead 2013-12-17 11:38:43 +01:00
Sebastian Grewe
6cc367ad50 [FIX] Admin User Panel for PPS Payouts
This will fix #986 once merged.
2013-12-17 10:56:37 +01:00
Sebastian Grewe
cef176c754 [FIX] Wrong parameter count 2013-12-17 09:48:07 +01:00
Sebastian Grewe
9d9401d673 Merge pull request #999 from headzoo/memcache_fix
Windows Memcache Compatibility
2013-12-17 00:35:23 -08:00
Sebastian Grewe
17345f953e [FIX] Missing x bit 2013-12-17 09:16:56 +01:00
Sebastian Grewe
bb04f890ae [CHANGE] Split statistics from Maintenance cron 2013-12-17 09:14:39 +01:00
Sebastian Grewe
405fd3d9e0 Merge pull request #981 from Fredyy90/next
3 small improvments
2013-12-17 00:10:09 -08:00
Sebastian Grewe
e4d97b9555 Merge pull request #1001 from headzoo/bitcoin_class_fix
Calling $this from static context
2013-12-17 00:02:17 -08:00
Sebastian Grewe
df613dd284 Merge pull request #1002 from ckoeber/patch-1
Update POOLS.md
2013-12-17 00:01:59 -08:00
ckoeber
945303db6b Update POOLS.md
Added my pool at spotspool.chriskoeber.com
2013-12-17 02:40:20 -05:00
headz
cb4d69f092 [FIX] Calling $this from static context
The static function pubKeyToAddress() was calling $this->hash160(). Changed to self::hash160().
2013-12-16 23:51:50 -05:00
Frederick Behrends
ed769f9659 Moved Calculation of "Expected Time Per Block (Network)" and "Next Difficulty" to Statistics Class and fixed Dashboard-API for Ajax Refresh 2013-12-16 21:51:31 +01:00
Frederick Behrends
8d3efd3801 Clean Up .gitignore 2013-12-16 21:03:39 +01:00
Frederick Behrends
c83fe6a09d [FIX] added "IF NOT EXISTS" to SQL-Query to avoid errors while import 2013-12-16 20:07:05 +01:00
Frederick Behrends
2517f22b2f [FIX] changed to new payout-cronjob name 2013-12-16 20:01:49 +01:00
Frederick Behrends
f09459433b added "Est. Next Difficulty" and "Avg. Time per Round" to dashboard and dashboard api 2013-12-16 20:01:22 +01:00
Frederick Behrends
a407f964d7 fix autopayment for coins with larger blockreward 2013-12-16 20:01:21 +01:00
Frederick Behrends
788929ae79 fixed payout cronjob 2013-12-16 20:01:21 +01:00