Bharadwaja G 6200948eec Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master ...

Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php

2017-08-29 12:19:00 +05:30

..

Auth

Updated remaining views to 2017 design update.

2017-08-26 17:17:04 +01:00

AttachmentController.php

Finished refactor of entity repos

2017-01-02 11:07:27 +00:00

BookController.php

Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master

2017-08-29 12:19:00 +05:30

ChapterController.php

Added chapter export options

2017-02-26 14:25:02 +00:00

CommentController.php

#47 - Adds various translations in English, and a few code improvements.

2017-06-06 01:46:59 +05:30

Controller.php

Upgraded to Laravel 5.4

2017-01-25 19:35:40 +00:00

HomeController.php

Made custom home ignore permissions and added tests

2017-08-28 13:55:39 +01:00

ImageController.php

Finished refactor of entity repos

2017-01-02 11:07:27 +00:00

PageController.php

Added ability to set a page to view on the homepage.

2017-08-28 13:38:32 +01:00

PermissionController.php

Extracted text from logic files

2016-12-04 16:51:39 +00:00

SearchController.php

Added chapter search

2017-04-15 19:16:07 +01:00

SettingController.php

Extracted text from logic files

2016-12-04 16:51:39 +00:00

TagController.php

Extracted text from logic files

2016-12-04 16:51:39 +00:00

UserController.php

Added user setting system and added user-lang option

2017-01-15 16:27:24 +00:00