Dan Brown 80865b30a5 Merge branch 'custom_role_system' ...

Conflicts:
	app/Repos/BookRepo.php
	app/Repos/ChapterRepo.php
	app/Repos/PageRepo.php

2016-03-05 18:21:44 +00:00

..

BookRepo.php

Merge branch 'custom_role_system'

2016-03-05 18:21:44 +00:00

BookRepo.php.orig

Merge branch 'custom_role_system'

2016-03-05 18:21:44 +00:00

ChapterRepo.php

Merge branch 'custom_role_system'

2016-03-05 18:21:44 +00:00

ChapterRepo.php.orig

Merge branch 'custom_role_system'

2016-03-05 18:21:44 +00:00

EntityRepo.php

Added in restriction queries for most lists

2016-02-28 19:03:13 +00:00

ImageRepo.php

Added custom user avatars

2015-12-09 22:30:55 +00:00

PageRepo.php

Merge branch 'custom_role_system'

2016-03-05 18:21:44 +00:00

PageRepo.php.orig

Merge branch 'custom_role_system'

2016-03-05 18:21:44 +00:00

PermissionsRepo.php

Added a whole load of permission & role tests

2016-03-05 12:09:09 +00:00

UserRepo.php

Implemented database structure and inital interfaces for entity restrictions

2016-02-28 10:49:41 +00:00