Alexander Machehin f6dd072a24 Merge branch '3.2-master' into 257-new_design_for_profiles ... Conflicts: config/locales/users.en.yml config/locales/users.ru.yml		2012-03-12 23:04:31 +06: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	Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263	2012-03-03 02:28:27 +02:00
application.html.haml	Merge branch '3.2-master' into 257-new_design_for_profiles	2012-03-12 23:04:31 +06:00
issues.html.haml	[refs #194] tracker without tags manage	2012-02-20 22:54:45 +06:00
sessions.html.haml	[refs #230] fix error messages + some refactoring	2012-03-02 18:27:38 +06:00