Skip to content
  • Julien Fastré's avatar
    Implement user right refs #263 · 513d9aef
    Julien Fastré authored
    Merge of branch add_acl
    
    Squashed commit of the following:
    
    commit a3265a71014fc74bcc456aa9436494fc4ed434ea
    Merge: 2522634 b231b146
    Author: Julien Fastré <julien.fastre@champs-libres.coop>
    Date:   Tue Jun 30 09:58:23 2015 +0200
    
        Merge remote-tracking branch 'origin/master' into add_acl
    
        in order to future merging of add_acl into master
    
        Conflicts:
        	Tests/Controller/PersonControllerCreateTest.php
    
    commit 252263400b1fb54091a0cd36d9ab84812c3a9942
    Author: Julien Fastré <julien.fastre@champs-libres.coop>
    Date:   Mon Jun 29 23:00:25 2015 +0200
    
        check acl on timeline page
    
    commit 5f08806585ce4ce1d58c6c507b191221b924d861
    Author: Julien Fastré <julien.fastre@champs-libres.coop>
    Date:   Fri Jun 19 22:24:18 2015 +0200
    
        remove dead code
    
    commit 860d62d9c0d9db2186eee725e7ef553ddf1f98f3
    Author: Julien Fastré <julien.fastre@champs-libres.coop>
    Date:   Fri Jun 19 22:19:02 2015 +0200
    
        add access condition for link to person view in person view
    
    commit e7b295000...
    513d9aef