3083 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Brown	f696aa5eea	Added the ability to remove an MFA method ... Includes testing to cover	2021-07-14 21:27:21 +01:00
Dan Brown	7c86c26cd0	Added command to reset user MFA ... Includes tests to cover the command.	2021-07-14 20:50:36 +01:00
Dan Brown	cfc0c593db	Added MFA indicator to user list ... Also fixed issue with showing incorrect MFA method count on user edit page changes done in last commit	2021-07-14 20:19:05 +01:00
Dan Brown	bb43acef21	Added MFA setup link on user edit view	2021-07-14 20:06:41 +01:00
Dan Brown	09c2814dc7	Added role based MFA control ... - Added new DB column for control and role updated create/update actions. - Created new middleware as a start to actual enforcement logic. - Added indicator to role list of whether MFA is enforced.	2021-07-03 13:34:48 +01:00
Dan Brown	1c43602f4b	Merge branch 'v21.05.x'	2021-07-03 12:02:13 +01:00
Dan Brown	b1ee1a856f	Updated php dependancies for minor release	2021-07-03 11:57:32 +01:00
Dan Brown	4da72aa267	Fixed issue with translation loading without theme ... System was using the empty state return from theme_path, when no theme was configured, for loading in languages which would result in the root path being looked up upon. This changes the theme_path helper to return null in cases a theme is not configured instead of empty string to help prevent assumed return path will be legitimate, and to help enforce error case handling. For #2836	2021-07-03 11:53:46 +01:00
Dan Brown	529971c534	Added backup code setup flow ... - Includes testing to cover flow. - Moved TOTP logic to its own controller. - Added some extra totp tests.	2021-07-02 20:53:33 +01:00
Dan Brown	83c8f73142	Covered TOTP setup with testing	2021-07-02 19:51:30 +01:00
Dan Brown	916a82616f	Complete base flow for TOTP setup ... - Includes DB storage and code validation. - Extracted TOTP work to its own service file. - Still needs testing to cover this side of things.	2021-06-30 22:10:02 +01:00
Dan Brown	d25cd83d8e	Added TOTP generation view and started verification stage ... Also updated MFA setup view to have settings-like listed interface to make it possible to extend with extra options in the future.	2021-06-29 22:06:49 +01:00
Dan Brown	efb6a6b457	Started barebones work of MFA system	2021-06-28 22:02:45 +01:00
Dan Brown	f295ab87b4	Updated comments of theme event to match usage	2021-06-28 21:17:10 +01:00
Dan Brown	ca8be9af3c	Swapped PHPCS for StyleCI ... Trying out StyleCI as an automated easy way to ensure code style is consistent across the PHP codebase. PHPCS+PHPCBF was good but I wouldn't run it enough then I'd get paranoid about running it with pending PRs. Better to let the robots stay on top of things.	2021-06-26 16:40:29 +01:00
Dan Brown	0155525945	Merge pull request #2820 from BookStackApp/analysis-6470L9 ... Apply fixes from StyleCI	2021-06-26 16:28:09 +01:00
Dan Brown	934a833818	Apply fixes from StyleCI	2021-06-26 15:23:15 +00:00
Dan Brown	3a402f6adc	Review of #2682, Also added parent deletion link on restore ... On restore, added a link to the parent deletion restore if any exists on a cascading parent. Added a test to cover this case to ensure its shown. Also tweaked default empty state message on recycle bin item list to align with new column count. Also done a little existing code cleanup including a getUrl helper on the deletion items. Related to #2682 & #2594	2021-06-26 12:12:11 +01:00
Dan Brown	8a9505bf8c	Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master	2021-06-26 11:19:21 +01:00
Dan Brown	265f5db03f	Reviewed #2393, Removed image guessing and added testing ... For review of meta tag additions as per PR #2393. This commit removes any image guesswork and only uses images that have been set by the author for the specific content. This also adds tests to cover the expected OG tags.	2021-06-23 20:42:48 +01:00
Dan Brown	58fa7679bc	Merge branch 'create-content-meta-tags' of https://github.com/james-geiger/BookStack into james-geiger-create-content-meta-tags	2021-06-23 20:11:07 +01:00
Dan Brown	992f03a3c0	Added markdown export endpoints to API ... - Added tests to cover. - Added slight extra spaces at content joins.	2021-06-22 21:39:29 +01:00
Dan Brown	57ea2e92ec	Updated markdown export implementation ... - Removed ZIP system for now, until the idea can be fleshed out. - Added testing to cover. - Upgraded used library. - Added custom handling for BookStack callouts. - Added HTML cleanup to better produce output for things like code blocks.	2021-06-22 21:02:18 +01:00
Dan Brown	9af636bd48	Merge branch 'markdown-export' of https://github.com/nikhiljha/BookStack-1 into nikhiljha-markdown-export	2021-06-22 19:12:24 +01:00
Dan Brown	3dda622f0a	Added a "skip to content" link. ... Closes #2810	2021-06-15 20:58:45 +01:00
Dan Brown	7d951b842c	Made social account detach a POST request ... Closes #2808	2021-06-14 22:37:58 +01:00
Dan Brown	94bf5b8fbb	Added test for social account detach	2021-06-14 22:30:53 +01:00
Dan Brown	3d5899d28c	Fixed issue with using old non-existing reference in controller ... Also done a little code cleanup.	2021-06-13 14:16:09 +01:00
Dan Brown	917d7428d6	Updated composer.lock	2021-06-13 14:06:56 +01:00
Dan Brown	bcc01bd8ff	New Crowdin updates (#2790) ... * New translations common.php (Indonesian) * New translations entities.php (Indonesian) * New translations errors.php (Indonesian) * New translations auth.php (Chinese Simplified) * New translations auth.php (Chinese Simplified) * New translations errors.php (Indonesian) * New translations entities.php (Indonesian) * New translations errors.php (Indonesian) * New translations settings.php (Indonesian) * New translations validation.php (Indonesian) * New translations settings.php (Spanish, Argentina)	2021-06-13 14:04:23 +01:00
Dan Brown	2c34a99248	Merge pull request #2791 from BookStackApp/attachments_open_in_browser ... Attachment serving without forced download	2021-06-13 14:03:08 +01:00
Dan Brown	789d17ab3f	Updated platform deps and development version number	2021-06-13 13:57:29 +01:00
Dan Brown	58117bcf2d	Extracted not found text into its own simple blade file ... Related/intended for #2796	2021-06-13 13:53:59 +01:00
Dan Brown	b5caaa73b7	Fixed content parsing break with line html comment ... Fixes issues thrown in custom HMTL head & page content filtering when the content is comprised of only a single HTML comment. Adds tests to cover. For #2804	2021-06-13 12:53:04 +01:00
Dan Brown	7997300f96	Added front-end toggle and testing of inline attachments	2021-06-06 13:55:56 +01:00
Dan Brown	888f435651	Added back-end attachments-in-browser support ... A query string will cause attachments to be provided inline with an appropriate mime type. Remaining actions: - Tests - Front-end functionality - Config option?	2021-06-06 00:51:06 +01:00
Dan Brown	a8471b2c66	Updated translator attribution before release v21.05.1	2021-06-04 23:08:43 +01:00
Dan Brown	0627efe5e9	Updated base64 image extraction to use url instead of path ... To ensure it works with all storage types and follows the format of manually uploaded image content	2021-06-04 22:59:31 +01:00
Dan Brown	af7d62799c	New Crowdin updates (#2787) ... * New translations common.php (German) * New translations common.php (Dutch)	2021-06-04 22:50:48 +01:00
Dan Brown	bb00c331e4	Ordered entity permission roles by display name ... Closes #2782	2021-06-04 22:36:30 +01:00
Dan Brown	807f92b693	Updated homepage action button colors for consistency ... Were previously inconsistent with other homepage buttons for non-default homepage options.	2021-06-04 22:28:38 +01:00
Dan Brown	c5d31ea7b2	Merge branch 'master' of github.com:BookStackApp/BookStack	2021-06-04 22:21:06 +01:00
Dan Brown	ef1bde8bb1	Fixed wrong styles for homepage favourites ... When using a non-default homepage option. Fixes #2783	2021-06-04 22:20:11 +01:00
Dan Brown	8897945609	Roll-out and re-fix of croation via crowdin (#2785) ... * New translations auth.php (Croatian) * New translations activities.php (Croatian) * New translations activities.php (German Informal) * New translations common.php (Croatian) * New translations passwords.php (Croatian) * New translations settings.php (Czech) * New translations settings.php (Spanish) * New translations settings.php (Catalan) * New translations settings.php (Arabic) * New translations settings.php (French) * New translations pagination.php (Croatian) * New translations settings.php (German) * New translations settings.php (Danish) * New translations settings.php (Chinese Simplified) * New translations settings.php (Hebrew) * New translations validation.php (Korean) * New translations validation.php (Croatian) * New translations settings.php (Hungarian) * New translations settings.php (Chinese Traditional) * New translations settings.php (Japanese) * New translations settings.php (Korean) * New translations settings.php (Dutch) * New translations settings.php (Polish) * New translations settings.php (Portuguese) * New translations settings.php (Russian) * New translations settings.php (Slovak) * New translations settings.php (Slovenian) * New translations settings.php (Turkish) * New translations settings.php (Ukrainian) * New translations settings.php (Vietnamese) * New translations settings.php (Portuguese, Brazilian) * New translations settings.php (Indonesian) * New translations settings.php (Persian) * New translations settings.php (Spanish, Argentina) * New translations settings.php (Croatian) * New translations settings.php (Latvian) * New translations settings.php (Bosnian) * New translations settings.php (Norwegian Bokmal) * New translations settings.php (German Informal) * New translations entities.php (German Informal) * New translations settings.php (Italian) * New translations settings.php (Swedish) * New translations settings.php (Bulgarian) * New translations errors.php (German Informal) * New translations errors.php (Croatian) * New translations components.php (Croatian) * New translations entities.php (Croatian) * New translations pagination.php (Croatian) * New translations entities.php (Croatian) * New translations components.php (Croatian) * New translations errors.php (Croatian) * New translations settings.php (Croatian) * New translations validation.php (Croatian) * New translations passwords.php (Croatian) * New translations auth.php (Croatian) * New translations common.php (Croatian) * New translations activities.php (Croatian)	2021-06-02 22:15:58 +01:00
Dan Brown	9382d647d7	Merge branch 'ffranchina-master'	2021-06-02 21:57:23 +01:00
Dan Brown	0d17d18d07	New Crowdin updates (#2777) ... * New translations common.php (Latvian) * New translations entities.php (Latvian) * New translations activities.php (Italian) * New translations common.php (Italian) * New translations entities.php (Italian) * New translations errors.php (Italian) * New translations settings.php (Italian) * New translations common.php (Spanish, Argentina) * New translations entities.php (Spanish, Argentina) * New translations activities.php (Spanish, Argentina) * New translations common.php (Spanish, Argentina) * New translations common.php (French) * New translations common.php (Swedish) * New translations activities.php (Swedish) * New translations common.php (Swedish) * New translations entities.php (Swedish) * New translations errors.php (Swedish) * New translations settings.php (Swedish) * New translations validation.php (Bulgarian) * New translations validation.php (Bulgarian) * New translations common.php (Bulgarian) * New translations validation.php (Bulgarian) * New translations settings.php (Bulgarian) * New translations activities.php (Indonesian) * New translations settings.php (Bulgarian) * New translations common.php (Bulgarian) * New translations entities.php (Bulgarian) * New translations activities.php (Turkish) * New translations settings.php (Bulgarian) * New translations components.php (Bulgarian) * New translations activities.php (Russian) * New translations common.php (Russian) * New translations entities.php (Russian) * New translations common.php (Russian) * New translations entities.php (Russian)	2021-06-02 21:56:53 +01:00
Dan Brown	24eef03fb9	Added croatian to required arrays/lists	2021-06-02 21:55:30 +01:00
Dan Brown	e51352e1a4	Added back in commas, reset settings language array ... Related to #2784	2021-06-02 21:50:38 +01:00
Dan Brown	2dfb1ae3ee	Merge branch 'master' of https://github.com/ffranchina/BookStack into ffranchina-master	2021-06-02 21:44:39 +01:00
Dan Brown	39928e1c63	Reviewed base64 image upload support ... - Added test cases to cover. - Altered parsing logic to be a little less reliant on regex. - Added new iamge repo method for creating from data. - Added extension validation and additional type support. - Done some cleanup of common operations within PageContent. - Added message to API docs/method to mention image usage. For #2700 and #2631.	2021-06-02 21:34:34 +01:00