741 Commits

Author	SHA1	Message	Date
Dan Brown	3acea12f1c	Merge branch 'unicode' of git://github.com/kostasdizas/BookStack into kostasdizas-unicode	2019-08-18 18:51:20 +01:00
Dan Brown	eab0ca9648	Covered new invite system with testing ... Closes #316	2019-08-18 13:55:28 +01:00
Dan Brown	42d8548960	Finished new user invite flow	2019-08-18 13:11:30 +01:00
Dan Brown	e5155a5dcb	Refactored confirm actions to their own controller	2019-08-18 10:47:59 +01:00
Dan Brown	44330bdd24	Start user invite system	2019-08-17 15:52:33 +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	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
Daniel Seiler	8e723f10dc	Add error messages, fix LDAP error	2019-08-07 15:31:10 +02:00
Daniel Seiler	03dbe32f99	Refactor for codestyle	2019-08-07 12:07:21 +02:00
Daniel Seiler	bda0082461	Add login and automatic registration; Prepare Group sync	2019-08-06 23:42:46 +02: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
Daniel Seiler	3c41b15be6	Initial work on SAML integration	2019-08-05 20:06:39 +02:00
Dan Brown	2ebbc6b658	Merge branch 'master' into 129-page-templates	2019-08-04 16:26:38 +01:00
Dan Brown	83ef086470	Added missing locale option	2019-08-04 16:10:04 +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	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
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	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	71167426bb	Started implementation of page template	2019-07-07 13:45:46 +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	97fdfa6ebe	Moved config dir into app dir ... Closes #1506	2019-07-06 13:44:50 +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
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	fbb2b7ac6a	Updated page nav header shift logic to be accurate ... Added tests to cover. Fixes #542	2019-06-16 11:32:38 +01:00
Kostas Dizas	86f56dd22b	Added locale and text direction to html templates	2019-06-11 23:01:08 +01:00
Dan Brown	282c45f088	Updated roadmap & dev version, removed dupe locale mappings	2019-06-11 22:45:41 +01:00
Dan Brown	3ad1b42a74	Updated page delete to handle inactive custom homepage correctly ... Fixes #1447	2019-05-27 12:40:19 +01:00
Dan Brown	13c0386e84	Updated string functions to use mulitbyte versions where needed ... Fixes #816	2019-05-25 16:15:19 +01:00
Dan Brown	8ae35f645a	Fixed faulty baseUrl rewrites ... Fixes #1452 May help #1377	2019-05-19 16:25:05 +01:00
Dan Brown	0a0ceb382e	Doubled image upload display thumb size ... Related to #1108	2019-05-19 14:52:17 +01:00
Dan Brown	896f88174a	Updated page navigation logic to ignore empty headers ... Fixes #1429	2019-05-15 21:02:11 +01:00
Dan Brown	d62d2384cb	Updated guest settings system to format value as per non-guest ... Fixes #1431	2019-05-07 22:56:48 +01:00
Dan Brown	97ffbaa740	Fixed issue where books titles could be leaked via shelf home view ... - Also added test to cover Fixes #1425	2019-05-07 22:42:48 +01:00
Dan Brown	ba09dad1fe	Fixed shelf activity display & updated book sort operation	2019-05-05 15:54:22 +01:00
Dan Brown	3f83c548f8	Ran phpcbf	2019-05-05 14:54:37 +01:00
Dan Brown	ad542f0407	Prevented potential inline JS event usage ... - Removes 'on*' attributes from elements. - Also updated script logic to remove scripts instead of escaping. - All JS injection removal now uses DomDocument + xpath parsing.	2019-05-05 13:53:37 +01:00
Dan Brown	8c190324ac	Updated existing image tests to reflect changes ... - Also added some new tests	2019-05-04 18:11:19 +01:00
Dan Brown	79f6dc00a3	Change image-selector to not use manager ... - Now changes the images directly for user, system & cover. - Extra permission checks added to edit & delete actions.	2019-05-04 15:50:29 +01:00
Dan Brown	cb832a2c10	Started diversion to not using image manager for cover/system/user	2019-04-27 14:55:23 +01:00
Dan Brown	a87ae16010	Started extraction of image controller to separate controllers	2019-04-27 14:18:00 +01:00
Dan Brown	aeb1fc4d49	Started rewriting back-end image managment	2019-04-21 15:52:29 +01:00
Dan Brown	4e49d06182	Merge branch 'fix/registraion-form-validation' of git://github.com/cw1998/BookStack into cw1998-fix/registraion-form-validation	2019-04-21 12:24:39 +01:00
Dan Brown	2bb06463d5	Added deeper content id de-duplication ... Closes #1393	2019-04-21 12:22:41 +01:00
Dan Brown	6c66a8935a	Added test to check page HTML id de-duplication ... Relates to #1393	2019-04-20 13:01:56 +01:00
Dan Brown	c24764018a	Updated ldap server option parsing to work with protocol and port ... - Aligns with PHP behaviour where ports is ignore for full LDAP URI. - Added tests to check format being passed to LDAP is as expected. - May be related to #1220 - Related to #1386 and #1278	2019-04-16 22:47:53 +01:00
Christopher Wilkinson	c8cf6731e2	Add min length validation on name on register form & add sign up link	2019-04-16 12:18:51 +01:00
Dan Brown	c380c10d54	Prevented bad duplicate IDs causing major exception ... Related to #1393	2019-04-15 21:20:32 +01:00
Dan Brown	7f3f6e65b9	Aligned item creation wording and updated shelf-book-add logic	2019-04-15 20:45:04 +01:00
Christopher Wilkinson	d3cd369247	Fix phpcs issues	2019-04-15 09:27:17 +01:00
Christopher Wilkinson	faa3a8b842	Add button to add a book directly from a shelf view	2019-04-15 09:27:17 +01:00
Dan Brown	ee58bea8b7	Updated user references to be app-default-supporting functions	2019-04-14 13:19:33 +01:00
Dan Brown	9406b4d4c9	Updated view toggle to store date ... Also added test for user list order preferences	2019-04-14 13:01:51 +01:00
Dan Brown	b12ae6d11b	Added bookshelves to breadcrumbs ... - Updated breadcrumb dropdown switchers and back-end sibling code to handle new breadcrumbs. - Added breadcrumb view composer and EntityContext system to mangage tracking if in the context of a bookshelf.	2019-04-07 18:28:11 +01:00
Dan Brown	221a483b40	Standardised view referencing to dot-notation	2019-04-07 12:00:09 +01:00
Dan Brown	0a06e2bce3	Actioned some todo items, Cleaned old grid css	2019-04-07 09:57:48 +01:00
Dan Brown	d9cde4123d	Fixed entity excerpt function signature misalignment	2019-04-06 18:47:27 +01:00
Dan Brown	7cda9b026e	Updated tests to suit layout changes, Updated 404 page ... - Also replaced 'or' usage in templates with null coalescing operator	2019-04-06 18:36:17 +01:00
Dan Brown	745a0bb98d	Updated custom homepage views	2019-04-06 17:31:59 +01:00
Dan Brown	aedff7dc6d	Added book selector to books sort ... Now more efficient rather than listing all books in the system.	2019-04-06 16:59:04 +01:00
Dan Brown	17969c0bbf	Added shelves and search shortcuts to profile page	2019-04-06 16:21:20 +01:00
Dan Brown	37bf7f11e4	Implemented new design in entity selector ... - Also showed entity path in search. - Cleaned popular entity fetch logic. - Cleaned entity selector JS code a little	2019-03-30 16:54:15 +00:00
Dan Brown	53a26a365c	Merge branch 'master' into 2019-design	2019-03-30 13:17:29 +00:00
Dan Brown	193e2ffebe	Prevent dbl exts. on img upload, Randomized attachment upload names	2019-03-24 19:08:21 +00:00
Dan Brown	f5fe524e6c	Added extension whitelist for image uploads ... - A continuation of the security issues addressed in v0.25.3	2019-03-21 19:43:15 +00:00
Dan Brown	37b91b6b0e	Hardened image file validation by removing custom validation ... - Added test to check PHP files cannot be uploaded as an image.	2019-03-20 23:59:55 +00:00
Dan Brown	8b7bee7c67	Updated standard entity lists	2019-03-17 15:07:03 +00:00
Dan Brown	5f2d226f09	Merge branch 'master' into 2019-design	2019-03-10 21:40:02 +00:00
Dan Brown	44c537de1a	Performed some LDAP service/test cleanup	2019-03-10 10:54:19 +00:00
Dan Brown	6bccf0e64a	Merge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into dfanara-feature-ldap-attributes	2019-03-10 10:31:09 +00:00
Dan Brown	042a6f9760	Updated shelf menu item to show on custom permission ... - Extended new 'userCanOnAny' helper to take a entity class for filtering. Closes #1201	2019-03-09 21:15:45 +00:00
Dan Brown	5c9b528517	Abstracted userCanCreatePage helper to work for any permisison ... - Added test to cover scenario where someone with create-own permission would want to copy a viewable item into a container entity that they own.	2019-03-09 16:50:22 +00:00
Dan Brown	6be2d3f28c	Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark-james-Copy-For-View-Only	2019-03-09 16:12:12 +00:00
Daniel Fanara	502ea608bf	Issue #1306 - Unit Tests for LdapService Changes	2019-03-09 01:08:49 -05:00
Daniel Fanara	55b07c7076	Issue #1306 - Specify display name attribute from LDAP	2019-03-08 23:55:11 -05:00
Dan Brown	98a4359198	Updated user language select to use correct default ... - Updated localisation system to take note of system defaul locale before replacing the current locale Fixes #1316	2019-03-07 21:09:23 +00:00
Dan Brown	035a0d8efb	Added experimental breadcrumb traversal	2019-02-24 15:57:35 +00:00
Dan Brown	f1e571a57c	Made shelf listing more unique & efficient ... - Now includes listing of all books within.	2019-02-16 17:13:01 +00:00
Dan Brown	a112c11df8	Re-ordered and updated main settings page	2019-02-16 14:17:35 +00:00
Dan Brown	3286f29a61	Merge branch 'master' into 2019-design	2019-02-09 14:58:38 +00:00
Dan Brown	5325870271	Updated auth pages to new design, Removed public layout	2019-02-03 17:34:15 +00:00
Dan Brown	138f5d5c4f	Updated user and shelf views to new design	2019-02-03 13:45:45 +00:00
Dan Brown	20988962fe	Migrated a whole load more page/chapter/shelf views	2019-02-02 11:41:41 +00:00
Dan Brown	32603362a6	Updated a bunch of book views	2019-01-31 20:37:12 +00:00
abijeet	5ef0992d5b	PHPCS related fixes.	2019-01-27 15:59:23 +05:30
Dan Brown	36424a24b5	Added ability for date format strings to be localized by back-end ... Requires the locale to be installed on the system-side. Closes #1214	2019-01-19 12:11:18 +00:00
Dan Brown	0efed43389	Converted more views to new layout and made breadcrumbs more flexible	2019-01-13 15:54:55 +00:00
Dan Brown	163a57cf70	Merge branch 'master' into 2019-design	2019-01-13 14:10:27 +00:00
Dan Brown	0e0a17cc30	Prevented page text content includes ... Avoids possible permission issues where included content shown in search or preview where the user would not normally have permission to view the included content. Closes #1178	2019-01-05 17:18:40 +00:00
Dan Brown	a2087fe3ff	Made delete permissions a requirement for move operations ... Closes #1200	2019-01-05 14:39:40 +00:00
Mark James	19770d2792	Use joint_permissions to determine is a user has an available page or chapter to copy.	2019-01-02 16:55:28 +11:00
Mark James	99c6d70c51	Initial updates to allow for page copy when the user can read the page but can't update it.	2018-12-31 17:01:49 +11:00
Dan Brown	2317bf2350	Added check for last admin on role change ... Will show error message if last admin and admin role is removed. Closes #1124 Also cleaned up user controller a little.	2018-12-30 16:11:58 +00:00
Dan Brown	68017e2553	Added testing for avatar fetching systems & config ... Abstracts imageservice http interaction. Closes #1193	2018-12-23 15:34:38 +00:00
Dan Brown	b56fc21aaf	Abstracted user avatar fetching away from gravatar ... Still uses gravatar as a default. Updated URL placeholders to follow LDAP format. Potential breaking config change: `GRAVATAR=false` replaced by `AVATAR_URL=false` Builds upon #1111	2018-12-22 19:29:19 +00:00
Dan Brown	d673bf61c2	Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into Vinrobot-custom-avatar-provider	2018-12-22 18:18:14 +00:00
Dan Brown	7c8edf5673	Merge pull request #1096 from christophert/add-ldaptlsinsecure ... Add option to disable LDAPS Certificate Validation	2018-12-22 16:38:50 +00:00
Dan Brown	26ec1cc3dc	Added proper escaping to LDAP filter operations ... To cover #1163	2018-12-20 20:04:09 +00:00
Dan Brown	7f6929d716	Re-enabled plaintext view for email notifications ... Updated mail notifications to set the HTML and plaintext views since before no plaintext version was being created. Closes #1182	2018-12-16 20:44:57 +00:00
Dan Brown	323bff7d6d	Extended translations system for arrays & extension ... Extended the base Laravel translation system to allow a locale to be based upon another. Also adds functionality to take base & fallback locales into account when fetching an array of translations. Related to work done in #1159	2018-12-12 20:46:27 +00:00
Dan Brown	4c574c22a8	Implemented functionality to make books sort function ... Also changed public user settings to be stored in session rather than DB. Cleaned existing list view type logic.	2018-12-07 18:33:53 +00:00
Dan Brown	4a872012c5	Merge branch 'master' into 2019-design	2018-11-11 11:44:35 +00:00
Vinrobot	5e6c039b08	Added config to change Gravatar URL	2018-11-10 16:11:11 +01:00
Dan Brown	178b5af83a	Added google select_account test ... Also cleaned the function naming a little to be more descriptive of the work they do.	2018-11-10 14:52:43 +00:00
Dan Brown	4be0c567cc	Merge pull request #1063 from justein230/master ... Add select account parameter for google authorization	2018-11-10 14:32:28 +00:00
Dan Brown	038b2418f7	Fixed baseURL helper when no app url is set ... Also cleaned variable naming to be more obvious	2018-11-09 21:29:30 +00:00
Justin Stein	2ca8038df2	Removed return from documentation for function redirectToSocialProvider	2018-11-04 11:07:04 -08:00
Justin Stein	89de328439	Merge branch 'master' of https://github.com/BookStackApp/BookStack	2018-11-04 11:04:30 -08:00
Justin Stein	c37e73b626	Moved redirect functionality back to start register and log in functions	2018-11-04 10:48:55 -08:00
Justin Stein	0283ab11b5	Added function for redirect with parameters for Socialite	2018-11-04 10:40:06 -08:00
Dan Brown	ffc1aa873e	Merge branch 'v0.24-dev'	2018-11-04 15:36:40 +00:00
Dan Brown	19b7093438	Fixed redirect issue when custom app url in use ... Fixes #956 & #1048 Also added tests to cover this url logic. Also removed debugbar during tests to maybe improve test speed.	2018-11-04 15:18:27 +00:00
Christopher Tran	8e7f703af7	fix how the option is set, change handle to NULL	2018-10-27 16:58:10 -04:00
Christopher Tran	6c14c09880	Add ability to disable LDAP certificate validation	2018-10-27 16:14:19 -04:00
Dan Brown	89be30ff0e	Started on a design update ... - Added base of new grid system. - Added new margin/padding/visiblity helpers. - Made header collapse to overflow menu on mobile.	2018-10-16 18:49:56 +01:00
Justin Stein	216358c6e4	Added Google select account functionality to login	2018-10-13 15:14:06 -07:00
Justin Stein	57d99130ee	Added environment variable for google select account option.	2018-10-13 14:50:58 -07:00
Justin Stein	79afec9737	Revert "Added else clause" ... This reverts commit 77d7f764f1.	2018-10-13 14:31:29 -07:00
Dan Brown	85f330c79a	Extracted many page-specific repo methods into page-specific repo	2018-10-13 11:27:55 +01:00
justein230	77d7f764f1	Added else clause	2018-10-12 22:50:02 -07:00
Justin Stein	a76599bd2a	Add select account parameter for google authorization ... Useful for choosing an account if a default account is outside the scope of a G Suite organization.	2018-10-12 11:52:13 -07:00
Dan Brown	495d18814a	Updated various classes to take EntityProvider instead of separate entities	2018-09-25 18:00:40 +01:00
Dan Brown	257a5a23ec	Fleshed out entity provided and optimized imports	2018-09-25 16:58:03 +01:00
Dan Brown	919660678b	Re-structured the app code to be feature based rather than code type based	2018-09-25 12:30:50 +01:00
Dan Brown	7b32aa163f	Added Bookshelves to search system. ... Also cleaned up and made search indexing system a little more efficient. Closes #1023	2018-09-23 12:34:30 +01:00
Dan Brown	be4f3d62cd	Merge branch 'fix/ru-locale' of git://github.com/mullinsmikey/BookStack into mullinsmikey-fix/ru-locale	2018-09-22 22:29:03 +01:00
Dan Brown	da58c41ab6	Prevented attachDefaultRole from trying to re-attach if already existing ... Fixes #1003 Added test to cover	2018-09-22 22:09:34 +01:00
Dan Brown	3f58800ed1	Added ability to configure revision limit	2018-09-22 17:30:42 +01:00
Dan Brown	1cb6ae39c8	Added base RTL support ... For #939 - Adds way to check if current language is RTL via config system. - Made TinyMCE default direction be based on current language text direction. - Fixed bullet points to be RTL compatible. - Set page content body to have direction based on content.	2018-09-22 13:18:26 +01:00
Dan Brown	5c2e3f4e56	Extracted download response logic into controller method ... Fixes incorrect 'Content-Disposition' header value. Fixes #581	2018-09-22 11:34:09 +01:00
Dan Brown	c47b578599	Fixed formatting via phpcbf	2018-09-21 18:48:47 +01:00
Dan Brown	e60d11ee04	Altered social auto-reg to be configurable per service ... - Added {$service}_AUTO_REGISTER and {$service}_AUTO_CONFIRM_EMAIL env options for each social auth system. - Auto-register will allow registration from login, even if registration is disabled. - Auto-confirm-email indicates trust and will mark new registrants as 'email_confirmed' and skip 'confirmation email' flow. - Also added covering tests.	2018-09-21 18:05:06 +01:00
Dan Brown	7ad8314bd7	Merge branch 'feature/autoregistration_social_login' of git://github.com/ibrahimennafaa/BookStack into ibrahimennafaa-feature/autoregistration_social_login	2018-09-21 16:14:52 +01:00
Dan Brown	131fcae4c7	Merge pull request #947 from BookStackApp/bookshelves ... Bookshelves	2018-09-21 15:29:52 +01:00
Dan Brown	b59e5942c8	Added testing coverage for Bookshelves ... Created modified TestResponse so we can use DOM operations in new Testcases as we move away from the BrowserKit tests.	2018-09-21 15:15:16 +01:00
Dan Brown	8ff969dd17	Updated so permission effect admins more ... Asset permissions can now be configured for admins. joint_permissions will now effect admins more often. Made so shelves header link will hide if you have no bookshelves view permission.	2018-09-20 19:48:08 +01:00
Dan Brown	6eead437d8	Added bookshelf permission control UI and copy-down ability	2018-09-20 19:16:11 +01:00
Dan Brown	81eb642f75	Added bookshelves homepage options ... - Updated homepage selection UI to be more scalable - Cleaned homepage selection logic in code - Added seed test data for bookshelves - Added bookshelves to permission system	2018-09-20 15:27:30 +01:00
Dan Brown	47b08888ba	Added bookshelf view, update, delete ... - Enabled proper ordering of Books in a shelf. - Improved related item destroy for all entities.	2018-09-16 19:34:09 +01:00
Abijeet	08b967607f	Changes as per code review, and fixes failing test cases. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-16 20:44:09 +05:30
Abijeet	0c8b6b7324	Final tweaks after code review and fixing failing test cases.	2018-09-16 01:12:36 +05:30
Abijeet	81d3bdc168	Removes the BadRequestException class added earlier. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 21:08:00 +05:30
Abijeet	54ca4487fa	Adds tests and few fixes. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 21:05:51 +05:30
Abijeet	25da4d9a8b	Added a success message on deletion of revision. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 16:08:20 +05:30
Abijeet	714c7bbd3a	Adds code to delete the revision. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 15:15:42 +05:30
Michael Mullins	e0b479efef	UTF-8 slugs & UI fixes	2018-09-11 22:42:25 +04:00
Dan Brown	b89411c108	Copied book content, Added create routes ... Added view control Added pivot table for books relation Added control to assign books	2018-08-27 14:18:09 +01:00