104 Commits

Author	SHA1	Message	Date
Bharadwaja G	c1a1bc0135	Books grid view	2017-09-04 20:27:52 +05:30
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
Dan Brown	36f524a354	Updated page view styles to align with 2017 update	2017-08-26 15:41:33 +01:00
Dan Brown	5187d3fa78	Updated chapter views with new design	2017-08-26 14:36:48 +01:00
Dan Brown	8fcbe44d3e	Updated styles for auth and books views. ... Also added sourcemaps to gulp sass build	2017-08-26 13:24:55 +01:00
Bharadwaja G	7f902e41c7	Resolved conflicts	2017-08-24 12:21:43 +05:30
Dan Brown	3da8c01c1f	Rolled out new design further	2017-08-20 13:57:25 +01:00
Timo Schwarzer	0d6a6b5b63	Update/fix german translation	2017-08-16 22:31:07 +02:00
Dan Brown	e9831a7507	Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master	2017-08-01 19:24:33 +01:00
Dan Brown	bbaa2f4cda	Merge pull request #435 from JachuPL/polish-localization ... Polish translation	2017-07-27 16:48:19 +01:00
Jérôme Le Gal	0b2c3c1aa7	settings.php: add missing french translation	2017-07-22 23:45:09 +02:00
Jérôme Le Gal	0dc9d0bed7	errors.php: add missing french translation	2017-07-22 23:45:09 +02:00
Jérôme Le Gal	a2a2e37797	settings.php: fix some spelling issues in french translation	2017-07-22 23:45:09 +02:00
Jérôme Le Gal	3d9819f97c	passwords.php: fix some spelling issues in french translation	2017-07-22 23:45:09 +02:00
Jérôme Le Gal	b2b4a24d7c	errors.php: fix some spelling issues in french translation	2017-07-22 23:45:08 +02:00
Jérôme Le Gal	7557d6d619	entities.php: fix some spelling issues in french translation	2017-07-22 23:45:08 +02:00
Jérôme Le Gal	57eeb9b0a3	common.php: fix some spelling issues in french translation	2017-07-22 23:45:08 +02:00
Jérôme Le Gal	813c7d5902	auth.php: fix some spelling issues in french translation	2017-07-22 23:45:08 +02:00
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
Dan Brown	c5b58d8fd2	Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation	2017-07-02 16:09:12 +01:00
Dan Brown	968e7b8b72	Finished off main functionality of custom tinymce code editor	2017-07-01 13:23:46 +01:00
Shuma Yoshioka	b2b8706d05	Translate errors.php	2017-07-01 16:38:43 +09:00
Shuma Yoshioka	2d345fe454	Translate entities.php	2017-07-01 16:38:20 +09:00
Shuma Yoshioka	7bec70d429	Translate common.php	2017-07-01 16:37:07 +09:00
Shuma Yoshioka	60710e7fb4	Translate auth.php	2017-07-01 16:33:54 +09:00
Shuma Yoshioka	f10d3a8564	Translate validation.php	2017-07-01 16:32:36 +09:00
Shuma Yoshioka	b020520366	Translate passwords.php	2017-07-01 16:32:02 +09:00
Shuma Yoshioka	52010e5820	Translate pagination.php	2017-07-01 16:31:32 +09:00
Nilesh Deepak	af72f0d490	Bookstack grid view.	2017-06-29 18:54:04 +05:30
Shuma Yoshioka	75eca03b05	Translate settings.php	2017-06-24 20:49:24 +09:00
Shuma Yoshioka	b8ebefd803	Translate components.php	2017-06-24 20:48:34 +09:00
Shuma Yoshioka	168c66815e	add ja to settings	2017-06-24 20:46:38 +09:00
Shuma Yoshioka	26e703a1cd	translate activities.php	2017-06-19 00:02:09 +09:00
Abijeet	8dab31b87a	Merge branch 'master' of https://github.com/Abijeet/BookStack	2017-06-10 22:56:07 +05:30
Abijeet	e155c52256	#47 - Fixes a few issues with the code.	2017-06-10 22:55:36 +05:30
Abijeet Patro	c76e7c706c	adding a comment on top.	2017-06-10 19:47:45 +05:30
Abijeet	4efe3b41da	#47 - Added translations for other language files using Google translate.	2017-06-10 15:21:28 +05:30
Abijeet	218376a41c	#47 - Fetching values from language files.	2017-06-08 01:30:43 +05:30
Abijeet	38fe756725	#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
Abijeet	652a67ad65	Removes some unncessary code.	2017-06-06 23:20:40 +05:30
Abijeet	5bd9da6054	#47 - Adds various translations in English, and a few code improvements.	2017-06-06 01:46:59 +05:30
Abijeet	7c6fe8c4e2	#47 - Changes the location of the reply and edit comment box.	2017-06-05 00:20:37 +05:30
Abijeet	689d1eb082	#47 - Adds a cancel button for edit and reply button.	2017-06-04 20:43:56 +05:30
Abijeet	06d75e1804	#47 - Updates the total comments when a comment is added.	2017-06-04 20:12:01 +05:30
Abijeet	8b82753218	#47 - Gets rid of simplemde	2017-05-03 02:42:04 +05:30