1660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Timo Schwarzer	9357620d55	Add docker development environment	2019-08-12 16:43:39 +02:00
Dan Brown	4de432b50d	Removed console.log & added readme discord badge	2019-08-11 20:30:51 +01:00
Dan Brown	20c36d58a6	Merge pull request #1527 from BookStackApp/129-page-templates ... Page Templates Implementation	2019-08-11 20:21:17 +01:00
Dan Brown	5fdab3b8af	Updated template test to be more stable	2019-08-11 20:10:27 +01:00
Dan Brown	de3e9ab094	Added ability to use templates ... - Added replace, append and prepend actions for template content into both the WYSIWYG editor and markdown editor. - Added further testing to cover.	2019-08-11 20:04:43 +01:00
Dan Brown	421dd93ffd	Merge branch 'v0.26'	2019-08-06 21:50:56 +01:00
Dan Brown	f417675b1d	Prevented normal users from changing own email ... To address #1542 Updates to only allow email changes by users with the users-manage role permission.	2019-08-06 21:29:42 +01:00
Dan Brown	2955f414dd	Added iframe JS and data url escaping ... Related to #1531	2019-08-06 21:08:24 +01:00
Dan Brown	4de719b325	Prevented potential apache image dir listing ... Closes #1545	2019-08-06 20:35:27 +01:00
Dan Brown	2ebbc6b658	Merge branch 'master' into 129-page-templates	2019-08-04 16:26:38 +01:00
Dan Brown	0b1ece664d	Updated editor z-indexing to not hide app menu ... Closes #1556	2019-08-04 16:21:16 +01:00
Dan Brown	83ef086470	Added missing locale option	2019-08-04 16:10:04 +01:00
Dan Brown	1b8a164412	Merge pull request #1561 from danielroehrig-mm/task/updateGermanTranslation ... German translation extended	2019-08-04 16:08:48 +01:00
Dan Brown	84a387cf5b	Merge pull request #1554 from miles75/lang-hu ... Hungarian translation	2019-08-04 16:07:19 +01:00
Dan Brown	71ebb9df8b	Removed unused config item ... Left in by mistake during development	2019-08-04 14:41:08 +01:00
Dan Brown	0ac50c0e50	Updated phpunit instructions to composer phpunit ... Closes #1555	2019-08-04 14:34:02 +01:00
Dan Brown	4b0c4e621a	Replaced use of custom 'baseUrl' helper with 'url' ... Also changed up how base URL setting was being done by manipulating incoming request URLs instead of altering then on generation.	2019-08-04 14:26:39 +01:00
Daniel Röhrig	fbf8378ae5	German translation extended	2019-07-31 13:44:28 +02:00
miles	d63157175b	Hungarian translation	2019-07-27 14:03:01 +02:00
Dan Brown	30da105812	Started refactor of URL system to better extend Laravel	2019-07-21 21:32:08 +01:00
Dan Brown	1e7df28238	Set export service to set correct svg image mimetype ... For #1538	2019-07-17 22:37:19 +01:00
Dan Brown	629b7a674e	Merge pull request #1534 from DeehSlash/pt_BR ... Fix pt_BR translations	2019-07-15 20:11:03 +01:00
Dan Brown	ce1c70084e	Merge pull request #1485 from lucaguindani/update-fr-lang ... Updated the french lang files	2019-07-15 20:02:13 +01:00
André Luiz da Silva	94f610d040	Fix pt_BR translations	2019-07-11 19:30:00 -03:00
Dan Brown	8fcb0e6820	Merge branch 'v0.26'	2019-07-10 20:30:36 +01:00
Dan Brown	c732970f6e	Hardened page content script escaping ... Increased range of tests to cover. Fixes #1531	2019-07-10 20:17:22 +01:00
Dan Brown	94441832c5	Removed old translation endpoint tests	2019-07-07 13:54:17 +01:00
Dan Brown	71167426bb	Started implementation of page template	2019-07-07 13:45:46 +01:00
Dan Brown	f7f7cd464c	Removed jquery from dropzone ... Also added fadeout to custom animation lib	2019-07-06 15:08:26 +01:00
Dan Brown	15c39c1976	Updated JS translations to be inserted from back-end ... Removes old awkward JS translations endpoint. New system still a little akward in code but not now in process. Also extracted out page editors into their own files. Closes #1258	2019-07-06 14:52:25 +01:00
Dan Brown	6fa093d9d0	Merge branch 'master' of github.com:BookStackApp/BookStack	2019-07-06 13:45:31 +01:00
Dan Brown	97fdfa6ebe	Moved config dir into app dir ... Closes #1506	2019-07-06 13:44:50 +01:00
Dan Brown	5c43a5a59a	Merge pull request #1517 from bjubes/patch-1 ... Fix missing word in users_social_accounts_info string	2019-07-03 19:54:26 +01:00
Brian Jubelirer	e7508689de	fix missing word	2019-07-02 09:14:42 -04:00
Dan Brown	5c70413784	Fixed incorrect testing vars and reset env vars in config test	2019-06-25 22:52:07 +01:00
Dan Brown	52b4c81aff	Merge pull request #1505 from timoschwarzer/hide-permissions-table-unless-enabled ... Hide permissions table unless custom permissions are enabled	2019-06-25 21:52:52 +01:00
Dan Brown	9a080da29f	Added debugbar config ... - Set debugbar support for APP_URL - Set debugbar to not show by default in debug mode. Closes #1508	2019-06-24 20:24:24 +01:00
Dan Brown	762d1d7595	Allowed different storage types for images and attachments ... - Added new env and config vars to allow this. - Also added tests for awkward config logic including fallback for new env vars. Closes #1302	2019-06-23 16:01:15 +01:00
Timo Schwarzer	6504a6f599	Hide permissions table unless custom permissions are enabled	2019-06-23 14:29:58 +02:00
Dan Brown	bf1371d04c	Fixed firefox tri-layout grid issue and added tablet sticky sidebar ... - Fixed issue with original left-sidebar content being placed halfway down the page. - Added sticky sidebar to mid-size tablet layout, only for original left sidebar items. Fixes #1434.	2019-06-16 12:46:23 +01:00
Dan Brown	f08668706f	Updated page-nav to show more title content ... Will now be truncated using CSS instead of being truncated on PHP side. Closes #1206.	2019-06-16 12:08:07 +01:00
Dan Brown	7b506447c7	Updated WYSIWYG edtitor to be iOS scrollable ... Fixes #1058	2019-06-16 11:55:01 +01:00
Dan Brown	fbb2b7ac6a	Updated page nav header shift logic to be accurate ... Added tests to cover. Fixes #542	2019-06-16 11:32:38 +01:00
Dan Brown	56e31a5df7	Cleaned some page pointer layout/styles up	2019-06-16 11:17:15 +01:00
Dan Brown	282c45f088	Updated roadmap & dev version, removed dupe locale mappings	2019-06-11 22:45:41 +01:00
Dan Brown	214c09c2b2	Changed translation key for last commit	2019-06-10 21:21:27 +01:00
Dan Brown	dda0200a94	Added note to custom HTML head input ... To warn of being inactive while viewing the settings page. Closes #1144	2019-06-10 19:54:22 +01:00
Dan Brown	53ba5b7e33	Removed jQuery and replaced axios with fetch	2019-06-08 00:02:51 +01:00
Dan Brown	b532ed0f86	Removed jquery usage from wysiwyg editor JS	2019-06-07 19:21:38 +01:00
Dan Brown	fdd34a74ed	Removed jquery usage from page-display	2019-06-07 17:46:19 +01:00