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
..
activities.php	Removes some unncessary code.	2017-06-06 23:20:40 +05:30
auth.php	Neatened up social login/register buttons	2017-02-05 15:28:53 +00:00
common.php	Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master	2017-08-29 12:19:00 +05:30
components.php	Finished off main functionality of custom tinymce code editor	2017-07-01 13:23:46 +01:00
entities.php	Updated page view styles to align with 2017 update	2017-08-26 15:41:33 +01:00
errors.php	#47 - Fixes a couple of issues found during testing - delete not updating the UI, delete none not working properly.	2017-06-07 23:45:29 +05:30
pagination.php	Initial commit	2015-07-12 20:01:42 +01:00
passwords.php	Initial commit	2015-07-12 20:01:42 +01:00
settings.php	Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master	2017-08-29 12:19:00 +05:30
validation.php	Extracted text from logic files	2016-12-04 16:51:39 +00:00