156 Commits

Author	SHA1	Message	Date
Dan Brown	cee4dccc55	Compacted entity color options in settings view ... - Also extracted the view code into it's own blade template - Made smaller color input styles	2019-12-07 21:23:15 +00:00
Dan Brown	b09ea76b8d	Renamed properties input option as INI ... - Also made INI be recognised as the codemirror "Properties" format.	2019-10-17 21:16:55 +01:00
Dan Brown	e91ef54cc9	Merge branch 'fix-1575' of git://github.com/james-geiger/BookStack into james-geiger-fix-1575	2019-10-17 14:32:39 +01:00
Dan Brown	b24279cc12	Merge branch 'patching-v0.27'	2019-10-16 16:37:29 +01:00
Dan Brown	1ee3e779e4	Merge branch 'laravel-upgrade'	2019-09-14 14:21:24 +01:00
Dan Brown	6917ea088f	Upgraded app to Laravel 5.7	2019-09-06 23:36:16 +01:00