Marin Jankovski 2948a2afbc Add membership_lock to allowed params. Change settings page warning.

2014-12-15 10:32:53 +01:00

..

assets

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

controllers

Add membership_lock to allowed params. Change settings page warning.

2014-12-15 10:32:53 +01:00

finders

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

helpers

Show different controls on project member page depending on if the membership lock is in place.

2014-12-12 14:24:17 +01:00

mailers

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

models

Prevent adding users to project team if group membership lock is in place.

2014-12-12 14:25:58 +01:00

services

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

uploaders

Revert "Merge pull request #7349 from srna/patch-1"

2014-12-05 15:33:22 +01:00

views

Add membership_lock to allowed params. Change settings page warning.

2014-12-15 10:32:53 +01:00

workers

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00