UPDATE : Development to Master - NO VERSION #2033
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… into development
Fixes #2020 once merged, thanks @mezrin
[FIX] Removed duplicate method implementation
Swiftmailer
i think i found a smarter solution without while and sleep
Minor fixes
|
This explains a lot.. |
TheSerapher
changed the title
[FIX] worker notification switch in user notifications
[ADDED] Bonus to earnings page
[UPDATE] style fixes, new designs
Contributor
Author
|
We should get this merged sometime this weekend. People running on dev please report back on these changes! |
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).
Fix bug in admin dashboard
Contributor
Author
|
@iAmShorty @nrpatten Any veto on merging this tomorrow? |
Contributor
|
runs fine so far. maybe i get #2003 in before merging. but rest runs good without error on 2 live pools. |
Contributor
Author
|
Is there a PR open for it? Most of our changes here have been bugfixes, so I'd like to get them out. We can work on the feature additions for the next merge. |
Contributor
|
naw, no pr open. runs on my local pool. will add it to next merge, so do it :) |
TheSerapher
added a commit
that referenced
this pull request
Mar 29, 2014
UPDATE : Development to Master - NO VERSION
|
Managed to do the "tweaks" live with no disruption "git stash git pull" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Master Update
We are once again preparing a merge into master fixing all issues that cropped up with our previous merge. This will bring us closer to a release again.
Changelog
Swiftmailer
We finally managed to replace our
mail()implementation with a proper mail library! We've had too many issues with sending mails in the past, either by missing options, headers or just inability of pool operators to run a local MTA, so we have no given all users the ability to switch between sendmail and SMTP (not recommended on large pools). If you run a small pool the SMTP option will probably work fine for you. If you notice large delays in sending notifications using SMTP you can either disable those (IDLE Worker and Found Blocks for example) or switch to sendmail to allow local queues for mails.This change will also allow us to easily modify how we send mails. Changing/adding and working with headers has become a whole lot easier.
For details on how to configure this, please see the configuration Wiki!