search

hhaccessibility / hhaccessibility.github.io

http://hhaccessibility.github.io/main/
7 stars 41 forks source link

Issue 588 #596

Closed passionInfinite closed 6 years ago

passionInfinite commented 6 years ago

Fixed coding style issues.

passionInfinite commented 6 years ago

@joshi1983 Remove the app/app/Libraries/Emailer.php file from the master. It is of no use now. Then, this branch will automatically resolve the merge conflict.

passionInfinite commented 6 years ago

The solution for the issue #588

joshi1983 commented 6 years ago

When getting latest from upstream, you'll have to manually rebase some changes from tests/HomeTest.php. I noticed the test was broken on master and updated it so all tests are passing.

Here is the associated pull request if it helps you rebase: https://github.com/hhaccessibility/hhaccessibility.github.io/pull/597

passionInfinite commented 6 years ago

@joshi1983 Good to go now!

joshi1983 commented 6 years ago

In a separate pull request, I merged most of the changes in this so that the whole code base follows the code styling rules as you defined them for now. I excluded the tool and dependency updates because I wasn't able to get them to work on my computer.

I wanted to get those in before they impede you or anyone else.

I didn't merge this yet because I ran into problems like this while checking code styling rules in Windows: image

passionInfinite commented 6 years ago

This PR is split into two PR. One is merged and another one is #602. So I am closing this PR.

passionInfinite commented 6 years ago

@joshi I merged master because of some reason.

On Mon, Jul 2, 2018, 2:00 PM Josh Greig, notifications@github.com wrote:

@joshi1983 commented on this pull request.

In app/resources/views/mails/confirmation.blade.php https://github.com/hhaccessibility/hhaccessibility.github.io/pull/596#discussion_r199576527 :

@@ -0,0 +1,202 @@ +<!DOCTYPE html>

@passionInfinite https://github.com/passionInfinite do you know how to remove a commit? I didn't mean revert it. If you use "git rebase -i master" and remove the line for the commit, the commit will completely disappear. Reverting adds another commit.

[image: image] https://user-images.githubusercontent.com/11838191/42178934-24c31108-7e00-11e8-83ae-205b167f3041.png

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/hhaccessibility/hhaccessibility.github.io/pull/596#discussion_r199576527, or mute the thread https://github.com/notifications/unsubscribe-auth/AQFIhmKZ3cJwDy62qXSsM5YSrDGk7B3pks5uCl-wgaJpZM4U9kee .