Pavel Chipiga 310f588621 Resolve conflict with User nickname and uname		2011-10-21 20:17:49 +03:00
..
controllers	Merge branch 'easy_urpmi'	2011-10-21 17:57:29 +03:00
helpers	Merge branch 'private_repos'	2011-10-20 19:49:35 +04:00
mailers	Add publish function for BuildList	2011-09-15 21:56:20 +04:00
models	Resolve conflict with User nickname and uname	2011-10-21 20:17:49 +03:00
stylesheets	Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954	2011-10-11 23:56:51 +03:00
views	Merge branch 'catalog'	2011-10-21 17:55:41 +03:00