George Vinogradov 2f5ce7cebe Merge branch 'groups_reincarnation' into staging ... Conflicts: app/models/ability.rb app/models/project.rb config/environments/production.rb		2011-12-05 17:16:32 +04:00
..
controllers	Merge branch 'groups_reincarnation' into staging	2011-12-05 17:16:32 +04:00
helpers	Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249	2011-11-24 23:48:58 +02:00
mailers	Add publish function for BuildList	2011-09-15 21:56:20 +04:00
models	Merge branch 'groups_reincarnation' into staging	2011-12-05 17:16:32 +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 'groups_reincarnation' into staging	2011-12-05 17:16:32 +04:00