search

wlanslovenija / PiplMesh

A social info portal for wireless networks.
http://dev.wlan-si.net/wiki/PiplMesh
Other
40 stars 19 forks source link

Issue#269 Login drop-down menu #270

Closed igypigi closed 12 years ago

igypigi commented 12 years ago

Added login drop-down menu

mitar commented 12 years ago

I would like to warn you that you should be sure to commit with same git data as you have on GitHub because otherwise there could be a chance I will miss your contributions (I try not to, but it is harder).

mitar commented 12 years ago

You should improve style ob buttons. Make them of same width and height. No space in between vertically, make them more condensed.

igypigi commented 12 years ago

I dont understand. Should i commit with name which has #269 in it?

mitar commented 12 years ago

No, you should commit with your real e-mail and not "igor@localhost".

igypigi commented 12 years ago

is my email now ok?

mitar commented 12 years ago

Yes, e-mail is OK now.

mitar commented 12 years ago

It looks OK now. Please make it XHTML compliant.

mitar commented 12 years ago

Please update from main repository.

igypigi commented 12 years ago

how do i do this? do i use rebase?

igypigi commented 12 years ago

i used some magic and i think it worked... :)

mitar commented 12 years ago

No, why would you rebase? You just pull and merge.

mitar commented 12 years ago

Hm. Interesting. Which magic have you been using?

igypigi commented 12 years ago

i could not merge because of conflicts so i just pulled updates to new branch and edited it... and there was some problem pushing it to GitHub so i used some magical flag with git push and it worked :)

mitar commented 12 years ago

i could not merge because of conflicts

But merge conflicts are not bad. They just mean you have to manually resolve them. Manually decide what is the resulting code.

and there was some problem pushing it to GitHub so i used some magical flag with git push and it worked :)

You lost the history of your commit changes. Which is in practice bad.

igypigi commented 12 years ago

is it ok now?

mitar commented 12 years ago

Please update from main repository. Now we have also support for BrowserID.