New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cleaning controllers #486
Cleaning controllers #486
Conversation
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
…lity Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
mhh, I've used git cherry-pick 7eba297.. and the code seems changed, however the author is me, not you (as expected).. Is this related to the conflict I had to solve in order to get it merged? |
It sounds like it (but I'm a bit surprised tbh.) Well, I don't feel it's relevant in this case, but if you wish the commit can be amended to change author. |
I believe it's again related to my IDE (Netbeans).. I had some conflicts to solve in order to get it merged. After resolving the conflicts I used "commit" from the GUI in Netbeans which automatically adds my sign-off and the author params (that's probably the reason) --amend can AFAIK be used with the latest commit in that branch? In theory I'd need to reset to 749e4ef, use --amend on 749e4ef and then re-apply d4ca718 ? |
Yes, that's how I'd do it, reset first, --amend and re-apply (cherry) :) Playing with them git! :D |
Or rebase -i (should work that way too) |
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by: Norv <a.w.norv@gmail.com>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
oki, finally I got it.. changed my own edits back to its original state, then cherry-picked Norv's commit without getting conflicts :) the last commit 6d37940 is a new one, was too lazy to cherry-pick the old one.. |
Signed-off-by: Norv <a.w.norv@gmail.com>
Several bug fixes (from TE's todo items)
Conflicts: sources/controllers/Emailpost.controller.php
Eurich various fixes
yet another cleaning PR, controllers this time..