Jan-Willem van der Meer 6c0994a3b3 Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers ...

Conflicts:
	app/controllers/omniauth_callbacks_controller.rb

2014-10-13 17:07:53 +02:00

..

assets

Remove border radius because it has wrong background

2014-10-08 20:33:28 +03:00

controllers

Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers

2014-10-13 17:07:53 +02:00

finders

Admin: user sorting

2014-10-13 16:07:57 +03:00

helpers

Add refactoring for multiple LDAP server support

2014-10-13 13:39:54 +02:00

mailers

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

models

Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers

2014-10-13 17:07:53 +02:00

services

Remove unused method

2014-10-09 22:33:29 -05:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers

2014-10-13 17:07:53 +02:00

workers

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00