-
Notifications
You must be signed in to change notification settings - Fork 683
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
@Phone @IPv4Address @IPv6Address validators plus test units #50
Conversation
Conflicts: framework/src/play/data/validation/Phone.java framework/src/play/data/validation/PhoneCheck.java
Unit test should fully pass now
Ok I will rebase it. Can you please: update the documentation page, at http://www.playframework.org/documentation/1.1/validation-builtin, and add the corresponding methods to play.data.validation.Validation |
hum.. can u teach me how you rebase these changes ? -> will work on the changes later today. |
You can merge all this commits into only one using git rebase, http://book.git-scm.com/4_rebasing.html Basically you have to type:
And then edit your commits. But don't worry, I can do it for you if you want. |
Sorry, the correct book page is http://book.git-scm.com/4_interactive_rebasing.html |
Guillaume, I believe I an done. I tried to itemized the commits as much as possible for ease of reading (except fo the first ones which were a mess :/ ) on top of the phone and ip validators, I also added a missing method for validation.url (along with a doc update) and added a reference to my sheet cheat in home.textile |
Ok I'll integrate it ASAP |
Sorry but the PhoneValidationTest fails for me. Can you check again? |
Will do tomorrow. Just to confirm, how did you test ? your branch + my changes ? Either ways, I will give it another shot tomorrow... and probably pull the latest changes from HEAD Olivier |
Just checked and everything is fine. Here are the results from a Fresh play clone: Here are the results of my fork: you will notice that SimpleJPATest and binding are failing. but they were failing to begin with. Please advise, |
Yes the tests are broken after the merge. Btw the merge is very complicated to do with a lot of conflicts... I'll try again. |
Done. |
Merci Guillaume. |
Desole pour les differents commits, j'apprends GIT et ce n'est pas facile!
Discussion @ http://groups.google.com/group/play-framework/browse_thread/thread/9cf9085e49aa800a