Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap ... Conflicts: Gemfile Gemfile.lock app/assets/javascripts/angular-new/models/build_list.js.erb app/assets/javascripts/extra/build_list.js app/controllers/projects/build_lists_controller.rb app/controllers/projects/projects_controller.rb app/models/platform.rb app/views/projects/base/_layout.html.haml app/views/projects/build_lists/_new_form.html.haml app/views/projects/build_lists/show.html.haml app/views/projects/git/base/_fork.html.haml app/views/projects/git/commits/_commits.html.haml config/locales/en.yml config/locales/ru.yml		2014-10-16 16:41:29 +06:00
..
api/v1	[#330] fix searh api	2014-09-30 18:50:59 +06:00
groups	[#369] groups page	2014-06-26 19:18:56 +06:00
platforms	Merge branch 'master' into 369-bootstrap	2014-10-16 16:41:29 +06:00
projects	Merge branch 'master' into 369-bootstrap	2014-10-16 16:41:29 +06:00
users	fix Could not find a valid mapping for nil	2014-09-13 09:43:41 +06:00
advisories_controller.rb	[#369] advisories page	2014-06-27 17:43:31 +06:00
application_controller.rb	Merge branch 'master' into 369-bootstrap	2014-10-16 16:41:29 +06:00
autocompletes_controller.rb	#405: updated UI, added extra_mass_builds to MassBuild	2014-06-27 23:08:14 +04:00
contacts_controller.rb	#29: removed hack for encoding	2013-03-18 15:36:16 +04:00
home_controller.rb	[#369] fix main page	2014-05-12 16:02:48 +06:00
pages_controller.rb	[#343] use new ruby hash syntax	2014-01-21 10:51:49 +06:00
search_controller.rb	improve search	2014-09-30 18:08:45 +06:00
sitemap_controller.rb	#370: generate sitemap	2014-03-29 02:14:37 +04:00
statistics_controller.rb	#435: cleanup	2014-10-14 23:34:42 +04:00