konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed		2012-02-14 14:30:27 +04:00
..
controllers	Merge branch 'master' into 123-activity-feed	2012-02-14 14:30:27 +04:00
helpers	Merge branch 'master' into 123-activity-feed	2012-02-14 14:30:27 +04:00
mailers	Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174	2012-02-10 18:33:16 +02:00
models	Merge branch 'master' into 123-activity-feed	2012-02-14 14:30:27 +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 'master' into 123-activity-feed	2012-02-14 14:30:27 +04:00