53ec794e53 
								
							 
						 
						
							
							
								
								Fixed issue where SAML login not notifiy on existing user  
							
							... 
							
							
							
							Added testing to cover
Fixes  #2263  
							
						 
						
							2020-09-26 16:43:06 +01:00  
				
					
						
							
							
								 
						
							
								328d2514c4 
								
							 
						 
						
							
							
								
								Updated settings nav to be more flexible  
							
							... 
							
							
							
							Uses flexbox layout, flexed to content instead of rigid thirds like
before. Also extracted row into own file 
							
						 
						
							2020-09-26 16:26:30 +01:00  
				
					
						
							
							
								 
						
							
								de2756dd95 
								
							 
						 
						
							
							
								
								Updated callout links to be correct colors  
							
							... 
							
							
							
							- Also updated to be underlined instead of bold 
							
						 
						
							2020-09-26 15:40:51 +01:00  
				
					
						
							
							
								 
						
							
								1f97047799 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/alexmannuk/BookStack into alexmannuk-master  
							
							
							
						 
						
							2020-09-26 15:35:13 +01:00  
				
					
						
							
							
								 
						
							
								c870c10e38 
								
							 
						 
						
							
							
								
								Merge pull request  #2270  from gertjankrol/feature/test-migrations-workflow  
							
							... 
							
							
							
							Add `test-migrations` workflow 
							
						 
						
							2020-09-26 15:25:17 +01:00  
				
					
						
							
							
								 
						
							
								49fa21c1e2 
								
							 
						 
						
							
							
								
								Merge pull request  #2268  from gertjankrol/master  
							
							... 
							
							
							
							Fix the `AddActivityIndexes` migration's `down()` method 
							
						 
						
							2020-09-26 15:21:21 +01:00  
				
					
						
							
							
								 
						
							
								9f87423584 
								
							 
						 
						
							
							
								
								Merge pull request  #2274  from abulgatz/patch-1  
							
							... 
							
							
							
							Fixed "Ubunto Mono" $mono type misspelling 
							
						 
						
							2020-09-26 12:11:53 +01:00  
				
					
						
							
							
								 
						
							
								08fbd39fcb 
								
							 
						 
						
							
							
								
								Fixed markdown iframe loading and content alignment  
							
							... 
							
							
							
							Fixes  #2280  
						
							2020-09-26 12:01:01 +01:00  
				
					
						
							
							
								 
						
							
								5f75a9f32c 
								
							 
						 
						
							
							
								
								Fix "Ubunto Mono" $mono type misspelling  
							
							
							
						 
						
							2020-09-23 16:19:30 -05:00  
				
					
						
							
							
								 
						
							
								3750922c3e 
								
							 
						 
						
							
							
								
								Added the `test-migrations` workflow  
							
							
							
						 
						
							2020-09-22 19:53:45 +02:00  
				
					
						
							
							
								 
						
							
								4b0d1ddf39 
								
							 
						 
						
							
							
								
								Fixed the `AddActivityIndexes` migration's `down()` method  
							
							
							
						 
						
							2020-09-22 19:22:27 +02:00  
				
					
						
							
							
								 
						
							
								a6c20c321f 
								
							 
						 
						
							
							
								
								Merged latest translation changes  
							
							
							
						 
						
							2020-09-20 10:28:01 +01:00  
				
					
						
							
							
								 
						
							
								e12012a6fc 
								
							 
						 
						
							
							
								
								Updated translation contributors  
							
							
							
						 
						
							2020-09-20 09:15:02 +01:00  
				
					
						
							
							
								 
						
							
								73b4c6d947 
								
							 
						 
						
							
							
								
								Fixed some wording in example env  
							
							
							
						 
						
							2020-09-19 23:09:08 +01:00  
				
					
						
							
							
								 
						
							
								9e11fc33fa 
								
							 
						 
						
							
							
								
								Updated example env with helpful info  
							
							... 
							
							
							
							- Added comments to explain the use of the file.
- Added comments to advise that space/hash containing values would need
to be quoted.
Related to #2258  
							
						 
						
							2020-09-19 16:09:43 +01:00  
				
					
						
							
							
								 
						
							
								ff46d81681 
								
							 
						 
						
							
							
								
								Merge branch 'jb-l10n-fix-czech' of git://github.com/jakubboucek/BookStack into jakubboucek-jb-l10n-fix-czech  
							
							
							
						 
						
							2020-09-19 15:44:18 +01:00  
				
					
						
							
							
								 
						
							
								1f202f6dbc 
								
							 
						 
						
							
							
								
								Updated locale lists for Bulgarian  
							
							
							
						 
						
							2020-09-19 15:36:17 +01:00  
				
					
						
							
							
								 
						
							
								bccf4653cb 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2077 )  
							
							... 
							
							
							
							* New translations entities.php (Portuguese, Brazilian)
* New translations entities.php (Persian)
* New translations entities.php (Spanish, Argentina)
* New translations entities.php (Thai)
* New translations errors.php (German Informal)
* New translations entities.php (Spanish)
* New translations entities.php (French)
* New translations entities.php (Arabic)
* New translations entities.php (Arabic)
* New translations components.php (Portuguese, Brazilian)
* New translations entities.php (Portuguese, Brazilian)
* New translations auth.php (Italian)
* New translations common.php (Italian)
* New translations components.php (Italian)
* New translations entities.php (Italian)
* New translations settings.php (Italian)
* New translations components.php (Chinese Simplified)
* New translations entities.php (Chinese Simplified)
* New translations settings.php (Spanish)
* New translations components.php (German)
* New translations components.php (Japanese)
* New translations components.php (Dutch)
* New translations components.php (German Informal)
* New translations components.php (Portuguese, Brazilian)
* New translations common.php (Ukrainian)
* New translations components.php (Portuguese)
* New translations common.php (Russian)
* New translations components.php (Russian)
* New translations common.php (Slovak)
* New translations components.php (Slovak)
* New translations common.php (Slovenian)
* New translations components.php (Slovenian)
* New translations common.php (Swedish)
* New translations components.php (Swedish)
* New translations common.php (Turkish)
* New translations components.php (Turkish)
* New translations components.php (Ukrainian)
* New translations components.php (Polish)
* New translations common.php (Chinese Simplified)
* New translations common.php (Chinese Traditional)
* New translations components.php (Chinese Traditional)
* New translations common.php (Vietnamese)
* New translations components.php (Vietnamese)
* New translations common.php (Portuguese, Brazilian)
* New translations common.php (Persian)
* New translations components.php (Persian)
* New translations common.php (Spanish, Argentina)
* New translations components.php (Spanish, Argentina)
* New translations common.php (Thai)
* New translations components.php (Thai)
* New translations common.php (Portuguese)
* New translations common.php (Polish)
* New translations common.php (Italian)
* New translations common.php (Bulgarian)
* New translations components.php (Italian)
* New translations components.php (Chinese Simplified)
* New translations components.php (German)
* New translations components.php (Japanese)
* New translations components.php (Dutch)
* New translations components.php (German Informal)
* New translations common.php (French)
* New translations components.php (French)
* New translations common.php (Spanish)
* New translations components.php (Spanish)
* New translations common.php (Arabic)
* New translations components.php (Arabic)
* New translations components.php (Bulgarian)
* New translations common.php (Dutch)
* New translations common.php (Czech)
* New translations components.php (Czech)
* New translations common.php (Danish)
* New translations components.php (Danish)
* New translations common.php (German)
* New translations common.php (Hebrew)
* New translations components.php (Hebrew)
* New translations common.php (Hungarian)
* New translations components.php (Hungarian)
* New translations common.php (Japanese)
* New translations common.php (Korean)
* New translations components.php (Korean)
* New translations common.php (German Informal)
* New translations components.php (German)
* New translations common.php (German)
* New translations entities.php (German)
* New translations common.php (French)
* New translations components.php (French)
* New translations common.php (Spanish)
* New translations components.php (Spanish)
* New translations components.php (Chinese Simplified)
* New translations common.php (Chinese Simplified)
* New translations common.php (Polish)
* New translations components.php (Polish)
* New translations auth.php (Polish)
* New translations entities.php (Polish)
* New translations errors.php (Polish)
* New translations passwords.php (Polish)
* New translations settings.php (Polish)
* New translations settings.php (Polish)
* New translations common.php (Spanish, Argentina)
* New translations components.php (Spanish, Argentina)
* New translations auth.php (Spanish, Argentina)
* New translations entities.php (Spanish, Argentina)
* New translations passwords.php (Spanish, Argentina)
* New translations settings.php (Spanish, Argentina)
* New translations entities.php (German)
* New translations components.php (German Informal)
* New translations common.php (German Informal)
* New translations entities.php (German Informal)
* New translations settings.php (Italian)
* New translations settings.php (Dutch)
* New translations settings.php (Thai)
* New translations settings.php (Persian)
* New translations settings.php (Portuguese, Brazilian)
* New translations settings.php (Vietnamese)
* New translations settings.php (Chinese Traditional)
* New translations settings.php (Ukrainian)
* New translations settings.php (Turkish)
* New translations settings.php (Swedish)
* New translations settings.php (Slovenian)
* New translations settings.php (Slovak)
* New translations settings.php (Russian)
* New translations settings.php (Portuguese)
* New translations settings.php (Korean)
* New translations settings.php (Chinese Simplified)
* New translations settings.php (Japanese)
* New translations settings.php (Hungarian)
* New translations settings.php (Hebrew)
* New translations settings.php (German)
* New translations settings.php (Danish)
* New translations settings.php (Czech)
* New translations settings.php (Bulgarian)
* New translations settings.php (Arabic)
* New translations settings.php (French)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (Polish)
* New translations settings.php (Spanish)
* New translations settings.php (German Informal)
* New translations settings.php (Spanish)
* New translations settings.php (French)
* New translations components.php (Turkish)
* New translations settings.php (Turkish)
* New translations entities.php (Turkish)
* New translations common.php (Turkish)
* New translations components.php (Portuguese, Brazilian)
* New translations common.php (Portuguese, Brazilian)
* New translations settings.php (Portuguese, Brazilian)
* New translations settings.php (Chinese Simplified)
* New translations activities.php (Chinese Traditional)
* New translations settings.php (Chinese Traditional)
* New translations activities.php (Chinese Traditional)
* New translations auth.php (Chinese Traditional)
* New translations common.php (Chinese Traditional)
* New translations components.php (Chinese Traditional)
* New translations errors.php (Chinese Traditional)
* New translations passwords.php (Chinese Traditional)
* New translations settings.php (German)
* New translations settings.php (German Informal)
* New translations activities.php (Slovak)
* New translations auth.php (Slovak)
* New translations auth.php (Slovak)
* New translations common.php (Slovak)
* New translations components.php (Slovak)
* New translations components.php (Slovak)
* New translations entities.php (Slovak)
* New translations common.php (Slovak)
* New translations entities.php (Slovak)
* New translations passwords.php (Slovak)
* New translations settings.php (Dutch)
* New translations components.php (Dutch)
* New translations entities.php (Dutch)
* New translations passwords.php (Dutch)
* New translations activities.php (Arabic)
* New translations entities.php (French)
* New translations settings.php (Chinese Traditional)
* New translations settings.php (Chinese Traditional)
* New translations auth.php (Chinese Traditional)
* New translations errors.php (Chinese Traditional)
* New translations activities.php (Japanese)
* New translations auth.php (Japanese)
* New translations entities.php (Chinese Traditional)
* New translations validation.php (Chinese Traditional)
* New translations common.php (Russian)
* New translations components.php (Russian)
* New translations entities.php (Russian)
* New translations settings.php (Russian)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (Polish)
* New translations settings.php (Polish)
* New translations settings.php (Polish)
* New translations entities.php (Russian)
* New translations entities.php (Portuguese)
* New translations entities.php (Thai)
* New translations entities.php (Spanish, Argentina)
* New translations entities.php (Persian)
* New translations entities.php (Portuguese, Brazilian)
* New translations entities.php (Vietnamese)
* New translations entities.php (Chinese Traditional)
* New translations entities.php (Chinese Simplified)
* New translations entities.php (Ukrainian)
* New translations entities.php (Turkish)
* New translations entities.php (Swedish)
* New translations entities.php (Slovenian)
* New translations entities.php (Slovak)
* New translations entities.php (Polish)
* New translations entities.php (French)
* New translations entities.php (Dutch)
* New translations entities.php (Korean)
* New translations entities.php (Japanese)
* New translations entities.php (Italian)
* New translations entities.php (Hungarian)
* New translations entities.php (Hebrew)
* New translations entities.php (German)
* New translations entities.php (Danish)
* New translations entities.php (Czech)
* New translations entities.php (Bulgarian)
* New translations entities.php (Arabic)
* New translations entities.php (Spanish)
* New translations entities.php (German Informal)
* New translations entities.php (French)
* New translations settings.php (Russian)
* New translations settings.php (Portuguese)
* New translations settings.php (Thai)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (Persian)
* New translations settings.php (Portuguese, Brazilian)
* New translations settings.php (Vietnamese)
* New translations settings.php (Chinese Traditional)
* New translations settings.php (Chinese Simplified)
* New translations settings.php (Ukrainian)
* New translations settings.php (Turkish)
* New translations settings.php (Swedish)
* New translations settings.php (Slovenian)
* New translations settings.php (Slovak)
* New translations settings.php (Polish)
* New translations settings.php (French)
* New translations settings.php (Dutch)
* New translations settings.php (Korean)
* New translations settings.php (Japanese)
* New translations settings.php (Italian)
* New translations settings.php (Hungarian)
* New translations settings.php (Hebrew)
* New translations settings.php (German)
* New translations settings.php (Danish)
* New translations settings.php (Czech)
* New translations settings.php (Bulgarian)
* New translations settings.php (Arabic)
* New translations settings.php (Spanish)
* New translations settings.php (German Informal)
* New translations entities.php (Spanish)
* New translations settings.php (Spanish) 
							
						 
						
							2020-09-19 15:22:32 +01:00  
				
					
						
							
							
								 
						
							
								31eec34b5d 
								
							 
						 
						
							
							
								
								Moved decode and updated page plaintext decode test  
							
							
							
						 
						
							2020-09-19 15:13:18 +01:00  
				
					
						
							
							
								 
						
							
								44f3508171 
								
							 
						 
						
							
							
								
								Merge branch 'preview-entities' of git://github.com/mr-vinn/BookStack into mr-vinn-preview-entities  
							
							
							
						 
						
							2020-09-19 14:58:56 +01:00  
				
					
						
							
							
								 
						
							
								2e39e45886 
								
							 
						 
						
							
							
								
								Added test to check text gen decodes HTML entities  
							
							
							
						 
						
							2020-09-19 14:58:18 +01:00  
				
					
						
							
							
								 
						
							
								458aa72c2f 
								
							 
						 
						
							
							
								
								Updated composer deps  
							
							
							
						 
						
							2020-09-19 12:12:48 +01:00  
				
					
						
							
							
								 
						
							
								78bf044a7a 
								
							 
						 
						
							
							
								
								Added audit log interface  
							
							... 
							
							
							
							- Displays the currently tracked activities in the system.
Related to #2173  and #1167  
							
						 
						
							2020-09-19 12:06:45 +01:00  
				
					
						
							
							
								 
						
							
								e5f0b4dd85 
								
							 
						 
						
							
							
								
								Split out Maintenance to separate controller  
							
							
							
						 
						
							2020-09-19 09:24:58 +01:00  
				
					
						
							
							
								 
						
							
								311a12b7ef 
								
							 
						 
						
							
							
								
								Decode HTML entities  
							
							... 
							
							
							
							Decode HTML entities in page text before saving it to the database. 
							
						 
						
							2020-09-18 06:54:30 -06:00  
				
					
						
							
							
								 
						
							
								d9e2bddee4 
								
							 
						 
						
							
							
								
								Added some robustness to page draft saving  
							
							... 
							
							
							
							- Updated so that a warning is always shown on error, Not just on first
in chain.
- Added last-resort localStorage content saving. 
							
						 
						
							2020-09-13 19:32:45 +01:00  
				
					
						
							
							
								 
						
							
								6578ac0b4a 
								
							 
						 
						
							
							
								
								Fixed visible revision delete menu  
							
							
							
						 
						
							2020-09-13 19:12:15 +01:00  
				
					
						
							
							
								 
						
							
								09c6d6c722 
								
							 
						 
						
							
							
								
								Added button for inserting attachment link to a page  
							
							... 
							
							
							
							For #1460  
							
						 
						
							2020-09-13 18:58:05 +01:00  
				
					
						
							
							
								 
						
							
								ad48cd3e48 
								
							 
						 
						
							
							
								
								Continued implementation of attachment drag+drop  
							
							... 
							
							
							
							Cannot get working in chrome reliably due to conflicting handling of
events and drag+drop API. Getting attachment drop working breaks other
parts of TinyMCE.
Implementing current work as should still work for MD editor and within
FireFox.
Related to #1460  
							
						 
						
							2020-09-13 18:31:14 +01:00  
				
					
						
							
							
								 
						
							
								e305ba14d9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into attachment_drag_drop  
							
							
							
						 
						
							2020-09-13 16:33:31 +01:00  
				
					
						
							
							
								 
						
							
								2c3f453c1f 
								
							 
						 
						
							
							
								
								Implement the renderPages parameter  
							
							... 
							
							
							
							Render page content when getTree() is called with a true $renderPages
argument. 
							
						 
						
							2020-09-07 09:05:51 -06:00  
				
					
						
							
							
								 
						
							
								b87e97f99e 
								
							 
						 
						
							
							
								
								Added punnycode since its reuquired by markdownit  
							
							... 
							
							
							
							Is a native, although depricated, nodejs module. Have installed manually
since esbuild could not resolve the nodejs module 
							
						 
						
							2020-09-05 20:37:23 +01:00  
				
					
						
							
							
								 
						
							
								e5377d5f46 
								
							 
						 
						
							
							
								
								Updated saml2 slo config so url is used if no repsonse url  
							
							... 
							
							
							
							Updated config to change empty string to null since the empty string was
hitting an isset check which caused an empty string to be used instead
of the slo url as a backup option.
Closes  #2002  
							
						 
						
							2020-09-05 19:26:47 +01:00  
				
					
						
							
							
								 
						
							
								ff1ee2d71f 
								
							 
						 
						
							
							
								
								Updated flow to ensure /register/confirm route is used where needed  
							
							... 
							
							
							
							Was accidentally skipped during previous updates. Will now be used on
saml, ldap & standard registration where required.
Uses session to know if the email was just sent and, if so, show the
confirmation route. 
							
						 
						
							2020-09-05 17:26:48 +01:00  
				
					
						
							
							
								 
						
							
								c029741a17 
								
							 
						 
						
							
							
								
								Updated npm deps  
							
							
							
						 
						
							2020-09-05 16:54:25 +01:00  
				
					
						
							
							
								 
						
							
								ac83c349da 
								
							 
						 
						
							
							
								
								Migrated from webpack to esbuild  
							
							
							
						 
						
							2020-09-05 16:50:20 +01:00  
				
					
						
							
							
								 
						
							
								fefcaa21e7 
								
							 
						 
						
							
							
								
								Fix English translations  
							
							... 
							
							
							
							- Fix obvious bug
- Reunite capitalisation 
							
						 
						
							2020-08-31 20:45:09 +02:00  
				
					
						
							
							
								 
						
							
								6a36db3cde 
								
							 
						 
						
							
							
								
								Czech translations: Fix broken labels  
							
							
							
						 
						
							2020-08-31 20:45:09 +02:00  
				
					
						
							
							
								 
						
							
								c9352bfd42 
								
							 
						 
						
							
							
								
								Czech translations: Add new translations to cs, improve existing  
							
							
							
						 
						
							2020-08-31 20:45:09 +02:00  
				
					
						
							
							
								 
						
							
								9c457d9ffe 
								
							 
						 
						
							
							
								
								Fix Czech translations (email -> e-mail)  
							
							... 
							
							
							
							In Czech language "email" does not means "email" but "enamel paint", correct is "e-mail".
See in Wikipedia:
- https://cs.wikipedia.org/wiki/E-mail 
- https://cs.wikipedia.org/wiki/Email_(barva)  
							
						 
						
							2020-08-31 17:34:46 +02:00  
				
					
						
							
							
								 
						
							
								7837b8c4ee 
								
							 
						 
						
							
							
								
								Updated callout link formatting  
							
							... 
							
							
							
							Updated callout links to use font colouring based on type, with bold text to denote link, instead of using the theme link colour per issue #303 . 
							
						 
						
							2020-08-24 20:03:08 +01:00  
				
					
						
							
							
								 
						
							
								87a5340a05 
								
							 
						 
						
							
							
								
								Prevented email confirmation exception throw on registration  
							
							... 
							
							
							
							Was preventing any other registration actions from taking place such as
LDAP/SAML group sync. Email confirmation should be actioned by
middleware on post-registration redirect.
Added testing to cover.
Tested for LDAP, SAML and normal registration with email confirmation
required to ensure flows work as expected.
Fixes  #2082  
							
						 
						
							2020-08-04 17:54:50 +01:00  
				
					
						
							
							
								 
						
							
								c076ca408c 
								
							 
						 
						
							
							
								
								Fixed non-visible horizontal rules in dark mode  
							
							... 
							
							
							
							Fixes  #2209  
						
							2020-08-04 15:39:07 +01:00  
				
					
						
							
							
								 
						
							
								1ac11c1852 
								
							 
						 
						
							
							
								
								Added warning to role screen for important permissions  
							
							... 
							
							
							
							Warning related to permissions that could allow a person to promote
their own permissions to gain more privileges than expected.
For #2105 . 
							
						 
						
							2020-08-04 15:26:13 +01:00  
				
					
						
							
							
								 
						
							
								5f1ee5fb0e 
								
							 
						 
						
							
							
								
								Removed role 'name' field from database  
							
							... 
							
							
							
							The 'name' field was really redundant and caused confusion in the
codebase, since the 'Display' name is often used and we have a
'system_name' for the admin and public role.
This fixes  #2032 , Where external auth group matching has confusing
behaviour as matching was done against the display_name, if no
external_auth field is set, but only roles with a match 'name' field
would be considered.
This also fixes and error where the role users migration, on role
delete, would not actually fire due to mis-matching http body keys.
Looks like this has been an issue from the start. Added some testing to
cover. Fixes  #2211 .
Also converted phpdoc to typehints in many areas of the reviewed code
during the above. 
							
						 
						
							2020-08-04 14:55:01 +01:00  
				
					
						
							
							
								 
						
							
								a9f02550f0 
								
							 
						 
						
							
							
								
								Removed joint_permissions auto_increment id  
							
							... 
							
							
							
							Removed auto_incrementing id and set a primary key of the [role_id,
entity_type, entity_id, action] instead since this table could recieve a
lot of activity, especially when permission regeneration was automated,
leading to very high auto_increment counts which could max out the
integer limit.
Also updated some RolesTest comment endpoints to align with
recent route changes.
Should fix  #2091  
							
						 
						
							2020-08-04 13:02:31 +01:00  
				
					
						
							
							
								 
						
							
								7590ecd37c 
								
							 
						 
						
							
							
								
								Updated some comment elements and standardised more JS  
							
							... 
							
							
							
							- Updated comment routes to be simpler.
- Updated comments JS to align better with updated component system.
- Documented available global JS functions/services.
- Removed redundant controller method.
- Added window.$events helpers for validation messages and
success/error.
- Updated JS events system to not be class based for simplicity.
- Added window.trans_plural method to handle pluralisation/replacements
where you already have the translation string itself.
Fixes  #1836  
							
						 
						
							2020-07-28 18:19:18 +01:00  
				
					
						
							
							
								 
						
							
								2c0fdf83c1 
								
							 
						 
						
							
							
								
								Updated public-login redirect to check url  
							
							... 
							
							
							
							Direct links to the login pages for public instances could lead to a
redirect back to an external page upon login.
This adds a check to ensure the URL is a URL expected from the current
bookstack instance, or at least under the same domain.
Fixes  #2073  
							
						 
						
							2020-07-28 16:29:06 +01:00  
				
					
						
							
							
								 
						
							
								2ed0317129 
								
							 
						 
						
							
							
								
								Updated functionality for logging failed access  
							
							... 
							
							
							
							- Added testing to cover.
- Linked logging into Laravel's monolog logging system and made log
channel configurable.
- Updated env var names to be specific to login access.
- Added extra locations as to where failed logins would be captured.
Related to #1881  and #728  
							
						 
						
							2020-07-28 12:59:43 +01:00  
				
					
						
							
							
								 
						
							
								2f6ff07347 
								
							 
						 
						
							
							
								
								Merge branch 'auth' of git://github.com/benrubson/BookStack into benrubson-auth  
							
							
							
						 
						
							2020-07-28 10:46:40 +01:00