Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								2ebbc6b658
								
							
						 | 
						
							
							
								
								Merge branch 'master' into 129-page-templates
							
							
							
							
							
						 | 
						
							2019-08-04 16:26:38 +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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								71167426bb
								
							
						 | 
						
							
							
								
								Started implementation of page template
							
							
							
							
							
						 | 
						
							2019-07-07 13:45:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Brian Jubelirer
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e7508689de
								
							
						 | 
						
							
							
								
								fix missing word
							
							
							
							
							
						 | 
						
							2019-07-02 09:14:42 -04: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 | 
						
					
				
					
						
							
							
								 
								Luca Guindani
							
						 | 
						
							
							
							
							
							
								
							
							
								239b3c8c2b
								
							
						 | 
						
							
							
								
								Updated french translation files
							
							
							
							
							
						 | 
						
							2019-06-07 17:06:54 +02:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ff841cff2e
								
							
						 | 
						
							
							
								
								Removed "Toggle Header" option in page editor
							
							
							
							
							
							
							
							Somewhat overlaps with the editor fullscreen button and is using jQuery 
							
						 | 
						
							2019-06-06 14:14:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								dbfe63ccf6
								
							
						 | 
						
							
							
								
								Fixed missing comma in RU translation array
							
							
							
							
							
						 | 
						
							2019-05-19 15:42:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								114f10d5ca
								
							
						 | 
						
							
							
								
								Merge branch 'patch-1' of git://github.com/kostefun/BookStack into kostefun-patch-1
							
							
							
							
							
						 | 
						
							2019-05-19 15:41:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								60013f776a
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-5
							
							
							
							
							
						 | 
						
							2019-05-19 15:40:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ac0a070fc8
								
							
						 | 
						
							
							
								
								Merge pull request #1445 from kostefun/patch-4
							
							
							
							
							
							
							
							Update entities.php 
							
						 | 
						
							2019-05-19 15:40:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b05659d7a3
								
							
						 | 
						
							
							
								
								Merge pull request #1443 from kostefun/patch-3
							
							
							
							
							
							
							
							Update common.php 
							
						 | 
						
							2019-05-19 15:39:48 +01:00 | 
						
					
				
					
						
							
							
								 
								kostefun
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								112f73c91c
								
							
						 | 
						
							
							
								
								Update settings.php
							
							
							
							
							
							
							
							Ru locale fix 
							
						 | 
						
							2019-05-14 17:50:23 +07:00 | 
						
					
				
					
						
							
							
								 
								kostefun
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b47dc046e0
								
							
						 | 
						
							
							
								
								Update common.php
							
							
							
							
							
						 | 
						
							2019-05-13 17:40:09 +07:00 | 
						
					
				
					
						
							
							
								 
								kostefun
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								215d84d705
								
							
						 | 
						
							
							
								
								Update entities.php
							
							
							
							
							
						 | 
						
							2019-05-13 17:31:19 +07:00 | 
						
					
				
					
						
							
							
								 
								kostefun
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c459d86b58
								
							
						 | 
						
							
							
								
								Update common.php
							
							
							
							
							
						 | 
						
							2019-05-13 17:21:05 +07:00 | 
						
					
				
					
						
							
							
								 
								kostefun
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								adf0d5fce2
								
							
						 | 
						
							
							
								
								Update settings.php
							
							
							
							
							
						 | 
						
							2019-05-13 17:09:50 +07:00 | 
						
					
				
					
						
							
							
								 
								Nooto
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								cb355c8aad
								
							
						 | 
						
							
							
								
								Modified Bookshelf texts
							
							
							
							
							
						 | 
						
							2019-05-08 23:57:44 +02:00 | 
						
					
				
					
						
							
							
								 
								Nooto
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								d0e351b942
								
							
						 | 
						
							
							
								
								Added translations for Bookshelves
							
							
							
							
							
						 | 
						
							2019-05-08 23:51:34 +02:00 | 
						
					
				
					
						
							
							
								 
								Nooto
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e3d570e928
								
							
						 | 
						
							
							
								
								Update activities.php
							
							
							
							
							
						 | 
						
							2019-05-08 23:25:13 +02:00 | 
						
					
				
					
						
							
							
								 
								Nooto
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e00c170d85
								
							
						 | 
						
							
							
								
								Update common.php
							
							
							
							
							
						 | 
						
							2019-05-08 23:24:22 +02:00 | 
						
					
				
					
						
							
							
								 
								Nooto
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e430dad38c
								
							
						 | 
						
							
							
								
								Added translations for View All, Copy, Reply, etc
							
							
							
							
							
						 | 
						
							2019-05-08 23:05:30 +02:00 | 
						
					
				
					
						
							
							
								 
								vagrant
							
						 | 
						
							
							
							
							
							
								
							
							
								8051558d3a
								
							
						 | 
						
							
							
								
								Updated the Swedish language files
							
							
							
							
							
						 | 
						
							2019-05-07 21:29:30 +00:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								224d9e7a7d
								
							
						 | 
						
							
							
								
								Merge pull request #1420 from moucho/master
							
							
							
							
							
							
							
							Spanish translation 
							
						 | 
						
							2019-05-07 21:52:02 +01:00 | 
						
					
				
					
						
							
							
								 
								moucho
							
						 | 
						
							
							
							
							
							
								
							
							
								ba36d36597
								
							
						 | 
						
							
							
								
								Spanish
							
							
							
							
							
						 | 
						
							2019-05-07 01:28:00 +02:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ac7d6b8737
								
							
						 | 
						
							
							
								
								Update validation.php
							
							
							
							
							
						 | 
						
							2019-05-06 23:11:23 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e52dab825a
								
							
						 | 
						
							
							
								
								Update settings.php
							
							
							
							
							
						 | 
						
							2019-05-06 23:05:48 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								33f51d5b78
								
							
						 | 
						
							
							
								
								Update passwords.php
							
							
							
							
							
						 | 
						
							2019-05-06 22:27:17 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ae7529376b
								
							
						 | 
						
							
							
								
								Update pagination.php
							
							
							
							
							
						 | 
						
							2019-05-06 22:26:43 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								aefd4d423c
								
							
						 | 
						
							
							
								
								Update errors.php
							
							
							
							
							
						 | 
						
							2019-05-06 22:25:40 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								bad44391d4
								
							
						 | 
						
							
							
								
								Update auth.php
							
							
							
							
							
						 | 
						
							2019-05-06 22:21:29 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								1880633be3
								
							
						 | 
						
							
							
								
								Update common.php
							
							
							
							
							
						 | 
						
							2019-05-06 22:21:15 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								8273f8b16e
								
							
						 | 
						
							
							
								
								Update entities.php
							
							
							
							
							
						 | 
						
							2019-05-06 22:20:31 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								0600f752eb
								
							
						 | 
						
							
							
								
								Update components.php
							
							
							
							
							
						 | 
						
							2019-05-06 21:57:22 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								342dc8948c
								
							
						 | 
						
							
							
								
								Update common.php
							
							
							
							
							
						 | 
						
							2019-05-06 21:56:10 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								3e24e44106
								
							
						 | 
						
							
							
								
								Update auth.php
							
							
							
							
							
						 | 
						
							2019-05-06 21:45:16 +03:00 | 
						
					
				
					
						
							
							
								 
								Mantikor
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								404d11d0eb
								
							
						 | 
						
							
							
								
								Update activities.php
							
							
							
							
							
						 | 
						
							2019-05-06 21:40:04 +03:00 | 
						
					
				
					
						
							
							
								 
								vagrant
							
						 | 
						
							
							
							
							
							
								
							
							
								989309fdff
								
							
						 | 
						
							
							
								
								Updated the swedish lang files
							
							
							
							
							
						 | 
						
							2019-05-06 17:19:51 +00: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
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e0c229114f
								
							
						 | 
						
							
							
								
								Updated register link text/placement on login card
							
							
							
							
							
							
							
							- Also extracted "Already have account?" text to translation files. 
							
						 | 
						
							2019-04-21 12:45:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								0bc5ccba32
								
							
						 | 
						
							
							
								
								Add revision restore confirm and changed http method
							
							
							
							
							
							
							
							Closes #1321 
							
						 | 
						
							2019-04-20 13:25:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								7f3f6e65b9
								
							
						 | 
						
							
							
								
								Aligned item creation wording and updated shelf-book-add logic
							
							
							
							
							
						 | 
						
							2019-04-15 20:45:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								8d358e4894
								
							
						 | 
						
							
							
								
								Updated tri-layout on mobile to be tab based
							
							
							
							
							
						 | 
						
							2019-04-13 17:36:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								07adfb2ff1
								
							
						 | 
						
							
							
								
								Added select-all helpers to permission tables
							
							
							
							
							
						 | 
						
							2019-04-13 12:07:27 +01:00 |