Pavel Chipiga 159ef26b38 Merge branch 'master' into 3.2-master ... Conflicts: app/views/wiki/_compare.html.haml app/views/wiki/_diff_data.html.haml db/schema.rb		2012-02-27 22:32:57 +02:00
..
_form.html.haml	[refs #2249] Global name to description and unixname to name renames	2011-11-29 14:51:14 +04:00
_list.html.haml	Changed representation of Repositories.	2011-10-17 18:20:35 +04:00
_proj_ajax.js.erb	[issue #76] Fixed bug with JSON generation.	2012-01-12 01:12:56 +04:00
_proj_list.html.haml	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
_proj_list1.html.haml	Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95	2012-01-30 22:36:58 +02:00
_sidebar.html.haml	Fix bugs. Refs #1858	2011-10-17 19:07:53 +03:00
index.html.haml	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
new.html.haml	Changed representation of Repositories.	2011-10-17 18:20:35 +04:00
projects_list.html.haml	Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205	2012-02-21 01:13:05 +02:00
show.html.haml	Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205	2012-02-21 01:13:05 +02:00