SamuelNZ
9418c48ee8
Update mpos.css
...
Fixes positioning errors
2014-03-30 22:44:10 +13:00
Sebastian Grewe
1684b2e388
Merge pull request #2057 from SamuelNZ/patch-7
...
Update default.tpl
2014-03-30 10:01:16 +02:00
SamuelNZ
99f4417f1f
Update default.tpl
...
Update to my update.
2014-03-30 20:59:33 +13:00
Sebastian Grewe
80b1ee043a
Merge pull request #2056 from MPOS/master
...
Master to Development
2014-03-30 09:54:38 +02:00
Sebastian Grewe
d0c40baf60
Merge pull request #2055 from SamuelNZ/patch-6
...
Update default.tpl
2014-03-30 09:46:39 +02:00
SamuelNZ
4ace79f7a4
Update default.tpl
...
This was really out dated, i re-wrote for the pool i run and thought i would just paste it here as well.
2014-03-30 20:41:35 +13:00
Sebastian Grewe
4a4e276b76
Merge pull request #2033 from MPOS/development
...
UPDATE : Development to Master - NO VERSION
2014-03-29 22:08:16 +01:00
Sebastian Grewe
a70d6af9dd
Merge pull request #2046 from LucasJones/development
...
Fix bug in admin dashboard
2014-03-28 20:08:02 +01:00
LucasJones
dbba22ca67
Fix bug in admin dashboard
...
Fixes a bug causing the admin dashboard to throw an error, when the wallet has an account name which is an integer (e.g. "1").
This is caused by json_decode decoding the account address as an integer, which is passed to getaddressesbyaccount, throwing an error (as the daemon only accepts string values for account names).
2014-03-28 19:02:06 +00:00
Sebastian Grewe
bd8ae40c20
Merge pull request #2037 from iAmShorty/style-fixes
...
[UPDATE] style fixes, new designs
2014-03-28 17:15:56 +01:00
Sebastian Grewe
a326cc315c
Merge pull request #2044 from MPOS/add-bonus-earnings
...
[ADDED] Bonus to earnings page
2014-03-28 15:28:26 +01:00
Sebastian Grewe
ed517ed74c
[ADDED] Bonus to earnings page
2014-03-28 15:25:35 +01:00
iAmShorty
9fb64901f0
[UPDATE] more style fixes
2014-03-28 14:05:33 +01:00
iAmShorty
9db6d7ecee
[FIX] admin news div fix
2014-03-28 13:59:23 +01:00
iAmShorty
4b13360568
[UPDATE] more style fixes
2014-03-28 13:51:37 +01:00
iAmShorty
821d7ad473
[FIX] isset host
2014-03-28 13:28:25 +01:00
iAmShorty
f90f6152a3
[UPDATE] style fixes, new designs
2014-03-28 09:55:42 +01:00
Sebastian Grewe
3089d0729f
Merge pull request #2042 from iAmShorty/notification-switch
...
[FIX] worker notification switch in user notifications
2014-03-28 09:40:07 +01:00
iAmShorty
5bb3727802
[FIX] worker notification switch in user notifications
2014-03-28 09:36:51 +01:00
Sebastian Grewe
a9d7726617
[FIX] Properly run all upgrades
2014-03-28 09:22:19 +01:00
Sebastian Grewe
ab2a065b9a
[FIX] Removed duplicate SQL upgrade
2014-03-28 09:16:02 +01:00
nrpatten
8a272da7ae
[FIX] table overflow ref issue #2022
2014-03-27 19:09:44 -07:00
Sebastian Grewe
69ea8d9702
Merge pull request #2038 from stambetto/development
...
Minor fixes
2014-03-27 20:21:44 +01:00
Stan Statev
da40fd7606
Merge branch 'development' of https://github.com/MPOS/php-mpos into development
2014-03-27 21:14:39 +02:00
Stan Statev
59f490d9d6
[FIX] Wrong Memcache file path for Windows based systems
2014-03-27 21:07:53 +02:00
Stan Statev
256d438861
[FIX] In case of SQL error function should return it
2014-03-27 21:06:37 +02:00
iAmShorty
3541d05958
[FIX] socket timeout setting
2014-03-27 17:46:11 +01:00
iAmShorty
79478ceb55
[FIX] stratum connect with timeout
...
i think i found a smarter solution without while and sleep
2014-03-27 17:23:21 +01:00
Sebastian Grewe
6159123551
[CLEANUP] Admin Checks formatting and better exit message
2014-03-27 14:45:45 +01:00
Sebastian Grewe
7a31e3c35b
Merge pull request #2035 from MPOS/swiftmailer
...
Swiftmailer
2014-03-27 09:00:08 +01:00
Sebastian Grewe
623fc4c394
[ADDED] Sendmail/SMTP configuration options
2014-03-27 08:31:29 +01:00
Sebastian Grewe
59d9a9a5d7
[REPLACED] PHP mail() with Swiftmailer
2014-03-27 07:55:23 +01:00
Sebastian Grewe
1d8fd33560
[FIX] PPS 24 hour estimates
2014-03-27 07:31:09 +01:00
nrpatten
222979e8fe
[FIX] Login Form/Registration Form Look
2014-03-26 16:41:09 -07:00
iAmShorty
2c81712754
[FIX] stratum poke timeout error
2014-03-26 20:56:30 +01:00
iAmShorty
26c0ee772d
[FIX] user invitations style fix
2014-03-26 20:07:20 +01:00
iAmShorty
2cc6943048
[FIX] user invitations
2014-03-26 20:01:23 +01:00
iAmShorty
57c4e9c6ae
Merge branch 'development' of https://github.com/MPOS/php-mpos into development
2014-03-26 20:00:38 +01:00
Nathan Patten
3c6b6454b1
[FIX] Admin News Delete Icon
2014-03-27 00:20:19 +11:00
Sebastian Grewe
6a793693b7
Merge pull request #2021 from MPOS/duplicate-method
...
[FIX] Removed duplicate method implementation
2014-03-26 11:22:16 +01:00
Sebastian Grewe
a555fa56bf
[FIX] Removed duplicate method implementation
...
Fixes #2020 once merged, thanks @Mezrin
2014-03-26 11:15:42 +01:00
iAmShorty
b9aa4aa26c
Merge branch 'development' of https://github.com/MPOS/php-mpos into development
2014-03-26 09:54:52 +01:00
Sebastian Grewe
e45a29c7d0
Merge pull request #2019 from MPOS/development
...
Development to Master
2014-03-26 09:51:03 +01:00
Sebastian Grewe
e7d5397c56
[REMOVED] Backup files ... TsTsTs
2014-03-26 09:49:58 +01:00
Sebastian Grewe
acced2bed7
Merge pull request #1853 from MPOS/bootstrap
...
[ENHANCEMENT] Bootstrap implementation
2014-03-26 09:39:10 +01:00
nrpatten
ff6b2674d6
[FIX] Me Being Silly :P
2014-03-25 23:13:38 -07:00
nrpatten
557856e6db
[UPDATE] More tweeks
2014-03-25 22:16:54 -07:00
nrpatten
07ba44786b
[UPDATE] More color tweeks
2014-03-25 21:52:09 -07:00
nrpatten
dffd5a7edf
[UPDATE] Couple of color tweeks
2014-03-25 21:35:02 -07:00
iAmShorty
b46479190f
[FIX] style fix in admin news and css
2014-03-25 23:53:52 +01:00
