Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments ... Conflicts: app/controllers/comments_controller.rb app/views/comments/edit.html.haml app/views/issues/show.html.haml db/schema.rb		2012-01-17 15:52:46 +06:00
..
controllers	Right merge branch 'master' into 18-commit_comments	2012-01-17 15:52:46 +06:00
helpers	[refs #54] Add settings notifier	2012-01-11 17:58:13 +04:00
mailers	[refs #94] Add new notifier rules. Fix some issues and comments bugs	2012-01-13 19:07:01 +04:00
models	Right merge branch 'master' into 18-commit_comments	2012-01-17 15:52:46 +06: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	Right merge branch 'master' into 18-commit_comments	2012-01-17 15:52:46 +06:00