Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								78f8a51664
								
							
						 | 
						
							
							
								
								Merge branch 'kostasdizas-unicode'
							
							
							
							
							
						 | 
						
							2019-08-18 18:58:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								666213a4d4
								
							
						 | 
						
							
							
								
								Removed html dir tag for now, Updated lang format
							
							
							
							
							
						 | 
						
							2019-08-18 18:57:35 +01:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Lior Broshi
							
						 | 
						
							
							
							
							
							
								
							
							
								019085071a
								
							
						 | 
						
							
							
								
								entities, not done yet
							
							
							
							
							
						 | 
						
							2019-08-15 23:24:45 +03:00 | 
						
					
				
					
						
							
							
								 
								James Geiger
							
						 | 
						
							
							
							
							
							
								
							
							
								c14611d14b
								
							
						 | 
						
							
							
								
								Fixed inline code overflowing off of page in issue #1575.
							
							
							
							
							
						 | 
						
							2019-08-14 23:45:48 -05:00 | 
						
					
				
					
						
							
							
								 
								James Geiger
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								fccc112cc1
								
							
						 | 
						
							
							
								
								Merge pull request #1 from BookStackApp/master
							
							
							
							
							
							
							
							merge aug. 11 commits 
							
						 | 
						
							2019-08-14 06:10:43 +00:00 | 
						
					
				
					
						
							
							
								 
								Virgile
							
						 | 
						
							
							
							
							
							
								
							
							
								3bcfe2a460
								
							
						 | 
						
							
							
								
								Adds autofocus on the email field of the standard login page.
							
							
							
							
							
						 | 
						
							2019-08-13 17:30:29 +02:00 | 
						
					
				
					
						
							
							
								 
								Timo Schwarzer
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c6b1f36412
								
							
						 | 
						
							
							
								
								Alter docker paths
							
							
							
							
							
						 | 
						
							2019-08-12 22:19:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Timo Schwarzer
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b608bb8859
								
							
						 | 
						
							
							
								
								Remove additional database connections and seeders in docker env
							
							
							
							
							
						 | 
						
							2019-08-12 16:59:51 +02:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								4de719b325
								
							
						 | 
						
							
							
								
								Prevented potential apache image dir listing
							
							
							
							
							
							
							
							Closes #1545 
							
						 | 
						
							2019-08-06 20:35:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Seiler
							
						 | 
						
							
							
							
							
							
								
							
							
								3c41b15be6
								
							
						 | 
						
							
							
								
								Initial work on SAML integration
							
							
							
							
							
						 | 
						
							2019-08-05 20:06:39 +02:00 | 
						
					
				
					
						
							
							
								 
								miles
							
						 | 
						
							
							
							
							
							
								
							
							
								518d9df961
								
							
						 | 
						
							
							
								
								Typo fix
							
							
							
							
							
						 | 
						
							2019-08-05 10:43:48 +02: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 | 
						
					
				
					
						
							
							
								 
								Lior Broshi
							
						 | 
						
							
							
							
							
							
								
							
							
								6c7e74f475
								
							
						 | 
						
							
							
								
								components
							
							
							
							
							
						 | 
						
							2019-07-22 22:57:00 +03:00 | 
						
					
				
					
						
							
							
								 
								Lior Broshi
							
						 | 
						
							
							
							
							
							
								
							
							
								b153ffd019
								
							
						 | 
						
							
							
								
								common
							
							
							
							
							
						 | 
						
							2019-07-22 22:35:29 +03:00 | 
						
					
				
					
						
							
							
								 
								Lior Broshi
							
						 | 
						
							
							
							
							
							
								
							
							
								9cfa391ab6
								
							
						 | 
						
							
							
								
								auth
							
							
							
							
							
						 | 
						
							2019-07-22 22:31:01 +03: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 | 
						
					
				
					
						
							
							
								 
								Lior Broshi
							
						 | 
						
							
							
							
							
							
								
							
							
								de140ab5a5
								
							
						 | 
						
							
							
								
								started Hebrew translation, not done yet
							
							
							
							
							
						 | 
						
							2019-07-09 22:40:35 +03: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 |