George Vinogradov 159bf21810 Merge branch 'master' into 64-project_wiki		2012-02-14 02:29:32 +04:00
..
controllers	Merge branch 'master' into 64-project_wiki	2012-02-14 02:29:32 +04:00
helpers	[issue #133] Writed draft of web editing.	2012-02-08 21:51:30 +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	[issue #133] Merge branch 'master' into 133-editing_from_web	2012-02-13 21:48:40 +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 pull request #175 from warpc/133-editing_from_web	2012-02-13 13:07:55 -08:00