Vladimir Sharshov 4828aa24f8 Merge branch 'master' into 349-anonymous_access ... Conflicts: spec/controllers/platforms/maintainers_controller_spec.rb spec/factories/build_lists.rb		2012-09-07 00:36:06 +04:00
..
admin	Merge pull request #587 from warpc/586-datatables_json_fixes	2012-07-27 05:45:23 -07:00
groups	[issue #551] by_object changed to by_actor.	2012-07-27 08:12:09 +04:00
platforms	Merge branch 'master' into 349-anonymous_access	2012-09-07 00:36:06 +04:00
projects	Merge branch 'master' into 263-refactoring	2012-09-06 21:14:14 +04:00
users	[refs #443] invite localization	2012-05-18 22:54:57 +06:00
activity_feeds_controller.rb	[refs #396] Devise token auth update for atom feed. Some atom feed fixes.	2012-04-18 19:15:04 +04:00
advisories_controller.rb	[issue #428] Fixed bug with before_filter in advisory	2012-07-06 18:23:49 +04:00
application_controller.rb	Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263	2012-07-17 11:02:56 +03:00
contacts_controller.rb	[issue #565] Added feedback form.	2012-07-20 20:06:31 +04:00
pages_controller.rb	[refs #630] swap tour conten for porject and build pages	2012-09-04 18:30:02 +04:00
search_controller.rb	[refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules	2012-09-06 21:09:10 +04:00