118 Commits

Author	SHA1	Message	Date
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
Dan Brown	55759bd22a	Added ability to set a page to view on the homepage. ... Relates to #372 and #126	2017-08-28 13:38:32 +01:00
Bharadwaja G	7f902e41c7	Resolved conflicts	2017-08-24 12:21:43 +05:30
JachuPL	9e0c931573	Polish translation	2017-07-13 16:00:42 +02:00
Abijeet	f37509062e	Merge pull request #8 from OsmosysSoftware/feature-181 ... Issue 181	2017-07-12 18:41:35 +05:30
Nilesh Deepak	7a724f9134	Updated modifications.	2017-07-12 13:44:37 +05:30
Abijeet	844976c85b	Revert "Revert "Bookstack grid view.""	2017-07-12 11:40:50 +05:30
Nilesh Deepak	cc553cc93d	Added labels for 'Thumbnail toggle' and 'Cover image' in different languages.	2017-07-05 16:11:15 +05:30
Shuma Yoshioka	168c66815e	add ja to settings	2017-06-24 20:46:38 +09:00
Vlado Jendroľ	9b639f715f	Add Slovak translation	2017-04-11 23:20:52 +02:00
Dan Brown	9b35aa42a2	Fixed spanish encoding, Added new lang to settings	2017-03-05 14:43:43 +00:00
Dan Brown	26da81a3b0	Added pt_BR to language dropdown and renamed folder	2017-01-18 20:04:29 +00:00
sirgix	d3dc73ca06	remove trailing spaces	2017-01-16 15:34:34 +01:00
sirgix	d5ea15e6dd	fix typo	2017-01-16 14:51:45 +01:00
Dan Brown	dabf149411	Added user setting system and added user-lang option ... Supports #115	2017-01-15 16:27:24 +00:00
Dan Brown	573357a08c	Extracted text from logic files	2016-12-04 16:51:39 +00:00
Dan Brown	0775cd09a1	Extracted text for remaining views	2016-12-04 14:08:04 +00:00
Dan Brown	da10c50945	Added app name header display setting + extracted setting text ... Closes #194	2016-09-22 18:53:22 +01:00