rosa-build/app
Alexander Machehin f6b6bbfb54 Revert "[refs #114] emails control"
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.

Conflicts:

	app/models/subscribe.rb
	app/models/user.rb
	spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
..
controllers Revert "[refs #114] emails control" 2012-01-30 12:19:54 +06:00
helpers [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
mailers Revert "Merge branch 'fix-email-i18n' into 114-comment_notifications" 2012-01-30 12:09:52 +06:00
models Revert "[refs #114] emails control" 2012-01-30 12:19:54 +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 Revert "[refs #114] emails control" 2012-01-30 12:19:54 +06:00