Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap ... Conflicts: Gemfile.lock app/models/concerns/feed/git.rb app/models/issue.rb		2014-11-08 01:09:32 +03:00
..
admin	ActiveAdmin integration	2014-04-12 00:29:43 +04:00
advisories	[#369] refactoring a build list page	2014-11-06 23:19:57 +05:00
api/v1	#392: added use_extra_tests field to BuildList, MassBuild	2014-05-24 00:29:24 +04:00
contacts	[#343] use new ruby hash syntax	2014-01-21 10:51:49 +06:00
devise	fix mistype with reset password token	2014-04-09 12:43:12 +06:00
feedback_mailer	[#343] use new ruby hash syntax	2014-01-21 10:51:49 +06:00
groups	[#369] fix group form pages	2014-11-07 09:08:36 +05:00
home	[#369] fix expression in the home page	2014-10-31 15:01:55 +05:00
layouts	[#369] update angularjs locale	2014-11-07 21:14:12 +05:00
pages	Update tos	2014-02-18 17:15:44 +06:00
platforms	[#369] platforms page: fix pagination, small refactoring	2014-10-31 15:19:41 +05:00
projects	[#369] update a git tree page datetime format	2014-11-07 22:54:07 +05:00
search	[#343] use new ruby hash syntax	2014-01-21 10:51:49 +06:00
shared	[#369] update a standart datetime format	2014-11-07 22:53:27 +05:00
sitemap	#370: generate sitemap	2014-03-29 02:14:37 +04:00
statistics	Merge branch 'master' into 369-bootstrap	2014-11-08 01:09:32 +03:00
user_mailer	#345: fixed: usage of name_with_owner	2014-03-27 00:02:28 +04:00
users	[#369] change file input in the user profile form	2014-11-07 09:00:29 +05:00