search

TheConstructors / QwikStubs

An online ticket selling and purchasing system that is designed to be easy and convenient to use by both sellers and purchasers.
http://qwikstubs.com/
3 stars 0 forks source link

No-FullName + Non-EmbeddedEmail #7

Closed jroesch closed 11 years ago

jroesch commented 11 years ago

Current working changes with Non-EmbeddedEmail and removal of :full_name as a requisite field. I also changed up the UserController#create to have simpler logic(that actually works, and reports errors) until we finalize our login procedure.

CommanderHamster commented 11 years ago

Merged email-embedded with develop

kjorg50 commented 11 years ago

@jroesch you sent this pull request to be merged directly into master, did you want to merge it into develop instead? Also I think there are conflicts because it says this pull request cannot be automatically merged.

CommanderHamster commented 11 years ago

Yeah I merged it in email-embedded to develop without any merge conflicts. I haven't messed with the no-fullname branch yet but I'm not sure there are any actual commits there.

On Feb 23, 2013, at 5:36 PM, Kyle Jorgensen notifications@github.com wrote:

@jroesch https://github.com/jroesch you sent this pull request to be merged directly into master, did you want to merge it into develop instead? Also I think there are conflicts because it says this pull request cannot be automatically merged.

— Reply to this email directly or view it on GitHubhttps://github.com/TheConstructors/QwikStubs/pull/7#issuecomment-14001696.