George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki ... Conflicts: Gemfile.lock config/locales/en.yml db/schema.rb		2012-01-31 02:07:11 +04:00
..
controllers	[issue #64] Merge branch 'master' into 64-project_wiki	2012-01-31 02:07:11 +04:00
helpers	[issue #64] Merge branch 'master' into 64-project_wiki	2012-01-31 02:07:11 +04:00
mailers	Add magic encodings. Refs #95	2012-01-30 22:39:34 +02:00
models	[issue #64] Merge branch 'master' into 64-project_wiki	2012-01-31 02:07:11 +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	[issue #64] Merge branch 'master' into 64-project_wiki	2012-01-31 02:07:11 +04:00