15 Commits

Author	SHA1	Message	Date
George Vinogradov	09ef860e0e	Removed registartion	2011-10-24 17:20:24 +04:00
George Vinogradov	82d72a851c	ACL for testing.	2011-10-24 01:39:44 +04:00
Pavel Chipiga	310f588621	Resolve conflict with User nickname and uname	2011-10-21 20:17:49 +03:00
George Vinogradov	505cb74c34	Merge branch 'itima_web_refactoring' ... Conflicts: app/models/user.rb	2011-10-20 20:00:52 +04:00
George Vinogradov	5732e999b1	Finished merging of master with itima_web_refactoring	2011-10-20 18:05:06 +04:00
Toljio	b84ab42d00	add extension actions, model role_relations	2011-10-20 00:19:45 +04:00
George Vinogradov	ff36b1fdd3	Merge branch 'itima_web_refactoring' ... Conflicts: Gemfile Gemfile.lock app/models/user.rb app/views/layouts/application.html.haml config/locales/ru.yml config/routes.rb db/schema.rb	2011-10-19 18:09:58 +04:00
George Vinogradov	f7ff112087	Finished models.	2011-10-18 19:07:09 +04:00
George Vinogradov	0d10c50710	Changed representation of Users	2011-10-17 18:23:51 +04:00
George Vinogradov	229b4bb3f4	Created new models and provided relationships between them.	2011-10-13 19:55:03 +04:00
Pavel Chipiga	0efa8c83a2	Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954	2011-10-13 13:19:42 +03:00
Pavel Chipiga	77e03df70b	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
Alexey Nayden	3350d420d3	fixed user seeds	2011-03-30 02:16:04 +04:00
Alexey Nayden	0ff80b3e16	User management	2011-03-11 00:48:15 +03:00
Alexey Nayden	d3fd18a700	Device users	2011-03-09 19:16:48 +03:00