George Vinogradov ff36b1fdd3 Merge branch 'itima_web_refactoring' ... Conflicts: Gemfile Gemfile.lock app/models/user.rb app/views/layouts/application.html.haml config/locales/ru.yml config/routes.rb db/schema.rb		2011-10-19 18:09:58 +04:00
..
controllers	Merge branch 'itima_web_refactoring'	2011-10-19 18:09:58 +04:00
helpers	Product Builder xml-rpc and Product model	2011-04-11 12:35:08 +04:00
mailers	Add publish function for BuildList	2011-09-15 21:56:20 +04:00
models	Merge branch 'itima_web_refactoring'	2011-10-19 18:09:58 +04: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 'itima_web_refactoring'	2011-10-19 18:09:58 +04:00