Pavel Chipiga 7d74b0af13 Merge branch 'master' into 96-upgrade_rails ... Conflicts: Gemfile Gemfile.lock app/models/group.rb app/views/layouts/application.html.haml db/schema.rb public/stylesheets/git/style.css		2012-02-14 02:14:03 +02:00
..
menu	Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96	2012-02-09 01:46:25 +02:00
_counters.html.erb	Add GA code to layouts and invite pages. Do not track admins. Refs #183	2012-02-13 18:42:11 +02:00
_flashes.html.haml	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
application.html.haml	Merge branch 'master' into 96-upgrade_rails	2012-02-14 02:14:03 +02:00
sessions.html.haml	Merge branch 'master' into 96-upgrade_rails	2012-02-14 02:14:03 +02:00