Improved Login

[mboie]

I changed the login page so it would work the way Will needs it to.

[mboie]

@jdarnston Check this out, please.

[mboie]

Is there a way to delete a pull request? I just noticed an error here. So, don't put it through Mike.

[mboie]

It is telling me that there is a syntax error, unexpected '@' when i try to load my views. Has anyone tested the code since Sam's routes were added? I think there is either an issue in there or I merged things incorrectly.

[mboie]

When I removed Sam's new routes from my code the problem goes away. According to my Git Bash it occurs on line 36 of the routes. @samuelfrench and @apotheos

[xwang12]

I got the same problem too.

[mboie]

Maybe the addition of the GitController code to the route page without a GitController actually being created causes it to get confused.

[mboie]

Well... I have got to go to class for the next few hours. I'll check back after that.

[samuelfrench]

It’s very likely there is an issue with my code. I have class until 8:30 and then I will take a look at it. Are you working in the lab?

Sam

On Feb 10, 2014, at 4:56 PM, Matt Oie notifications@github.com wrote:

It is telling me that there is a syntax error, unexpected '@' when i try to load my views. Has anyone tested the code since Sam's routes were added? I think there is either an issue in there or I merged things incorrectly.

— Reply to this email directly or view it on GitHub.

[mikeholler]

I see the fix. I'll pull it down and fix it. GitController@stageFiles needs to be in quotes, because it should be a string. Same for the others. @samuelfrench, you need to try your routes out before you commit code, or at the very, very least syntax check it. Pull requesting code with bad syntax is not cool.

[mikeholler]

That may be a little harsh, because the fact of the matter is the responsibility for merging it also falls on @cdwainscott and I, since we are supposed to be looking for this when we merge. But still, please syntax check your code before committing it.

[samuelfrench]

I realize what I’ve done and to be honest I’m kind of embarrassed about being so careless.

Will not happen again. On Feb 10, 2014, at 7:24 PM, Michael Holler notifications@github.com wrote:

I see the fix. I'll pull it down and fix it. GitController@stageFiles needs to be in quotes, because it should be a string. Same for the others. @samuelfrench, you need to try your routes out before you commit code, or at the very, very least syntax check it. Pull requesting code with bad syntax is not cool.

— Reply to this email directly or view it on GitHub.

[samuelfrench]

Got it, see previous email.

@cdwainscott - We need to test the code before doing pulls in the future. Live and learn.

On Feb 10, 2014, at 7:26 PM, Michael Holler notifications@github.com wrote:

That may be a little harsh, because the fact of the matter is the responsibility for merging it also falls on @cdwainscott and I, since we are supposed to be looking for this when we merge. But still, please syntax check your code before committing it.

— Reply to this email directly or view it on GitHub.

[mikeholler]

No worries @samuelfrench, it's a simple fix and we know what went wrong. The beauty of git is that it's all so easy to fix! Just be more careful next time :smile:

[mikeholler]

Everybody, see #47. It has everything in this pull request plus the fix for the routes file.