Commit Graph

3484 Commits

Author SHA1 Message Date
Sebastian Grewe
cda57db81f Merge pull request #1053 from Fredyy90/patch-6
[FIX] fixed 3 Notices
2013-12-20 07:27:06 -08:00
Sebastian Grewe
21238e6741 Merge pull request #1051 from Fredyy90/patch-5
Added one more Option to  "Ajax Data Interval", for better performance management
2013-12-20 07:25:57 -08:00
Frederick Behrends
a6d5b6e248 [FIX] fixed 3 Notices 2013-12-20 16:14:40 +01:00
Frederick Behrends
7e594324f3 Added one more Option to "Ajax Data Interval", for better performance management 2013-12-20 15:47:06 +01:00
Sebastian Grewe
d3e8bec679 Merge pull request #1050 from headzoo/patch-1
Undefined property: Notification::$mail
2013-12-20 02:15:57 -08:00
Sean Hickey
5ddf30983e Undefined property: Notification::$mail
I'm not 100% sure this is a bug, but I'm getting the following error from my crons.

> PHP Notice:  Undefined property: Notification::$mail in /var/www/MPOS/public/include/classes/notification.class.php on line 158

> PHP Fatal error:  Call to a member function getError() on a non-object in /var/www/MPOS/public/include/classes/notification.class.php on line 158

It appears the `Notification` class extends the `Mail` class instead of `Base`, in which case `$this->mail` does not exist.
2013-12-20 05:10:09 -05:00
Sebastian Grewe
ab05eca651 [UPDATE] Mention Markdown on Newspost creation 2013-12-20 10:29:09 +01:00
Sebastian Grewe
464c6fc5c2 Merge pull request #1044 from Fredyy90/patch-1
[FIX] use configured port for mysql connection
2013-12-19 22:51:13 -08:00
Sebastian Grewe
6d7004e5ec Merge pull request #1047 from Fredyy90/patch-3
added blocks until next difficulty change to EstNextDifficulty
2013-12-19 22:48:28 -08:00
Sebastian Grewe
c63abf66a4 Merge pull request #1046 from Fredyy90/patch-2
[FIX] enable Caching for  ExpectedNextDifficulty and NetworkExpectedTimePerBlock
2013-12-19 22:46:28 -08:00
Sebastian Grewe
0d0b5f83d3 Merge pull request #1048 from Fredyy90/patch-4
added my own pool to POOLS.md
2013-12-19 22:38:25 -08:00
Frederick Behrends
8495fa3fc3 [FIX] calculation 2013-12-20 06:51:41 +01:00
Frederick Behrends
3626ef8421 fixed links 2013-12-20 05:36:31 +01:00
Frederick Behrends
f7b0564e03 added my own pool to POOLS.md 2013-12-20 05:31:54 +01:00
Frederick Behrends
ccb14c37cd added blocks until next difficulty change to EstNextDifficulty 2013-12-20 03:59:47 +01:00
Frederick Behrends
4ec364f036 [FIX] enable Caching for ExpectedNextDifficulty and NetworkExpectedTimePerBlock 2013-12-20 03:38:53 +01:00
Frederick Behrends
fd66500a28 [FIX] use configured port for mysql connection 2013-12-20 02:02:38 +01:00
Hüseyin Uslu
a9beab8aa0 Updated pools.md. 2013-12-20 00:49:45 +02:00
Sebastian Grewe
28b71cbc2f Merge pull request #1031 from xisi/patch-2
[UPDATE] Fix for issue #957
2013-12-19 06:47:43 -08:00
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