Dmitriy Zaporozhets 1ec106b853 Merge branch 'ldap_connections' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG		2014-03-14 12:58:43 +02:00
..
admin	Correct BackgroundJobs page for both OSX and linux	2014-03-13 23:15:33 +02:00
groups	added group avatars	2014-01-28 08:38:00 +01:00
profiles	Add email aliases for users	2014-02-13 22:59:39 -06:00
projects	Feature: reopen closed merge request	2014-02-28 22:43:16 +02:00
public	Allow access to groups with public projects.	2014-02-20 09:26:38 -06:00
application_controller.rb	Open/close LDAP in ApplicationController	2014-03-14 09:03:49 +01:00
dashboard_controller.rb	Move services for collecting items to Finders	2014-02-25 19:15:08 +02:00
files_controller.rb	Files controller handle redirect to remote storage. Added config block to carrierwave init	2013-05-15 22:35:59 +03:00
groups_controller.rb	Sort projects by activity at group show page	2014-03-06 18:31:08 +02:00
help_controller.rb	Show shotcut dialog on ?	2013-06-30 22:10:52 +03:00
omniauth_callbacks_controller.rb	Use new OAuth classes	2013-09-04 00:06:29 +03:00
profiles_controller.rb	Read-only email field for LDAP user	2013-11-27 10:32:37 +02:00
projects_controller.rb	Redirect to import page from show when import in progress	2014-03-13 10:27:05 +02:00
registrations_controller.rb	Fix user remove tests. Remove user even if he has projects	2013-09-04 16:20:40 +03:00
search_controller.rb	Merge pull request #6075 from skv-headless/remove_deprecated_finders	2014-01-22 11:04:56 -08:00
snippets_controller.rb	Remove deprecated finders	2014-01-19 23:39:56 +04:00
users_controller.rb	Allow access to groups with public projects.	2014-02-20 09:26:38 -06:00
users_groups_controller.rb	User can leave group from group page.	2014-02-12 15:52:53 +01:00