4b9618cd21 
								
							 
						 
						
							
							
								
								Update book form so cancel URL is explicitly passed in  
							
							... 
							
							
							
							- Added to prevent future possibility of 'shelf' var being introduced in
scope and therefore causing a side-effect of redirect logic. 
							
						 
						
							2019-10-27 16:55:05 +00:00  
				
					
						
							
							
								 
						
							
								28184c6bfc 
								
							 
						 
						
							
							
								
								Merge branch 'fix/#1662' of git://github.com/cw1998/BookStack into cw1998-fix/#1662  
							
							
							
						 
						
							2019-10-27 16:44:41 +00:00  
				
					
						
							
							
								 
						
							
								99ce3067c7 
								
							 
						 
						
							
							
								
								Added test to check custom theme lang items  
							
							
							
						 
						
							2019-10-26 18:07:14 +01:00  
				
					
						
							
							
								 
						
							
								4763b899b6 
								
							 
						 
						
							
							
								
								Made it possible to override translations via theme system  
							
							
							
						 
						
							2019-10-26 18:07:14 +01:00  
				
					
						
							
							
								 
						
							
								1366fc45ce 
								
							 
						 
						
							
							
								
								Added tests to cover test email sends  
							
							... 
							
							
							
							- Also tweaked wording of 'E-mail' to 'Email' to remain consistent with
the rest of the app.
Related to #1696  and #1719  
							
						 
						
							2019-10-23 20:25:51 +01:00  
				
					
						
							
							
								 
						
							
								a2370f7c9d 
								
							 
						 
						
							
							
								
								Merge branch 'feature-send-test-email' of git://github.com/timoschwarzer/BookStack into timoschwarzer-feature-send-test-email  
							
							
							
						 
						
							2019-10-23 19:53:51 +01:00  
				
					
						
							
							
								 
						
							
								bc38fd3ac4 
								
							 
						 
						
							
							
								
								entity needs to be saved after image upload and associate  
							
							
							
						 
						
							2019-10-22 11:18:08 +02:00  
				
					
						
							
							
								 
						
							
								5ae0e127df 
								
							 
						 
						
							
							
								
								Update auth.php  
							
							... 
							
							
							
							Edit for  'Must be over 7 characters'. 
							
						 
						
							2019-10-21 04:17:52 +09:00  
				
					
						
							
							
								 
						
							
								2eb6f178c2 
								
							 
						 
						
							
							
								
								Banish .DS_Store  
							
							
							
						 
						
							2019-10-21 03:51:55 +09:00  
				
					
						
							
							
								 
						
							
								19ce6da0d3 
								
							 
						 
						
							
							
								
								Update Korean translation  
							
							
							
						 
						
							2019-10-21 03:44:38 +09:00  
				
					
						
							
							
								 
						
							
								99ae592ae9 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #1732 )  
							
							... 
							
							
							
							* New translations auth.php (Ukrainian)
* New translations common.php (Ukrainian)
* New translations entities.php (Ukrainian)
* New translations entities.php (Ukrainian)
* New translations settings.php (Ukrainian)
* New translations validation.php (Ukrainian)
* New translations settings.php (French)
* New translations settings.php (Russian)
* New translations settings.php (Spanish, Argentina)
* New translations settings.php (Portuguese, Brazilian)
* 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 (Slovak)
* New translations settings.php (Polish)
* New translations settings.php (Spanish)
* 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 (German)
* New translations settings.php (Czech)
* New translations settings.php (Arabic)
* New translations settings.php (German Informal) 
							
						 
						
							2019-10-19 00:13:00 +01:00  
				
					
						
							
							
								 
						
							
								f37131a5bf 
								
							 
						 
						
							
							
								
								Removed old Translation Service + Provider  
							
							... 
							
							
							
							Was no longer needed due to only being there to perform
language extension for de_informal but now this is done by crowdin
instead so it's redundant. Same goes for checking and formatting
scripts.
Also removed comment advising deletion form settings.php language list
since this is now auto-copied to languages anyway.
Related to #1261  
							
						 
						
							2019-10-19 00:04:49 +01:00  
				
					
						
							
							
								 
						
							
								f3a7d58816 
								
							 
						 
						
							
							
								
								Initial Crowdin Translation Integration Merge ( #1731 )  
							
							... 
							
							
							
							* New translations activities.php (French)
* New translations entities.php (Turkish)
* New translations entities.php (Swedish)
* New translations errors.php (Swedish)
* New translations pagination.php (Swedish)
* New translations passwords.php (Swedish)
* New translations settings.php (Swedish)
* New translations validation.php (Swedish)
* New translations auth.php (Turkish)
* New translations common.php (Turkish)
* New translations errors.php (Turkish)
* New translations common.php (Swedish)
* New translations settings.php (Turkish)
* New translations validation.php (Turkish)
* New translations activities.php (Ukrainian)
* New translations auth.php (Ukrainian)
* New translations common.php (Ukrainian)
* New translations components.php (Ukrainian)
* New translations entities.php (Ukrainian)
* New translations errors.php (Ukrainian)
* New translations components.php (Swedish)
* New translations auth.php (Swedish)
* New translations passwords.php (Ukrainian)
* New translations settings.php (Russian)
* New translations settings.php (Polish)
* New translations validation.php (Polish)
* New translations activities.php (Russian)
* New translations auth.php (Russian)
* New translations common.php (Russian)
* New translations components.php (Russian)
* New translations entities.php (Russian)
* New translations errors.php (Russian)
* New translations passwords.php (Russian)
* New translations validation.php (Russian)
* New translations activities.php (Swedish)
* New translations activities.php (Slovak)
* New translations auth.php (Slovak)
* New translations common.php (Slovak)
* New translations components.php (Slovak)
* New translations entities.php (Slovak)
* New translations errors.php (Slovak)
* New translations pagination.php (Slovak)
* New translations passwords.php (Slovak)
* New translations settings.php (Slovak)
* New translations validation.php (Slovak)
* New translations pagination.php (Ukrainian)
* New translations settings.php (Ukrainian)
* New translations pagination.php (Polish)
* New translations passwords.php (Spanish, Argentina)
* New translations settings.php (Portuguese, Brazilian)
* New translations validation.php (Portuguese, Brazilian)
* New translations activities.php (Spanish, Argentina)
* New translations auth.php (Spanish, Argentina)
* New translations common.php (Spanish, Argentina)
* New translations components.php (Spanish, Argentina)
* New translations entities.php (Spanish, Argentina)
* New translations errors.php (Spanish, Argentina)
* New translations pagination.php (Spanish, Argentina)
* New translations settings.php (Spanish, Argentina)
* New translations errors.php (Portuguese, Brazilian)
* New translations validation.php (Spanish, Argentina)
* New translations activities.php (German Informal)
* New translations auth.php (German Informal)
* New translations common.php (German Informal)
* New translations components.php (German Informal)
* New translations entities.php (German Informal)
* New translations errors.php (German Informal)
* New translations pagination.php (German Informal)
* New translations passwords.php (German Informal)
* New translations settings.php (German Informal)
* New translations entities.php (Portuguese, Brazilian)
* New translations validation.php (Ukrainian)
* New translations activities.php (Chinese Traditional)
* New translations activities.php (Chinese Simplified)
* New translations auth.php (Chinese Simplified)
* New translations common.php (Chinese Simplified)
* New translations components.php (Chinese Simplified)
* New translations entities.php (Chinese Simplified)
* New translations errors.php (Chinese Simplified)
* New translations pagination.php (Chinese Simplified)
* New translations passwords.php (Chinese Simplified)
* New translations settings.php (Chinese Simplified)
* New translations validation.php (Chinese Simplified)
* New translations auth.php (Chinese Traditional)
* New translations components.php (Portuguese, Brazilian)
* New translations common.php (Chinese Traditional)
* New translations components.php (Chinese Traditional)
* New translations entities.php (Chinese Traditional)
* New translations errors.php (Chinese Traditional)
* New translations pagination.php (Chinese Traditional)
* New translations passwords.php (Chinese Traditional)
* New translations settings.php (Chinese Traditional)
* New translations validation.php (Chinese Traditional)
* New translations activities.php (Portuguese, Brazilian)
* New translations auth.php (Portuguese, Brazilian)
* New translations common.php (Portuguese, Brazilian)
* New translations passwords.php (Polish)
* New translations errors.php (Polish)
* New translations auth.php (French)
* New translations validation.php (Czech)
* New translations validation.php (Arabic)
* New translations auth.php (Czech)
* New translations common.php (Czech)
* New translations entities.php (Czech)
* New translations errors.php (Czech)
* New translations pagination.php (Czech)
* New translations settings.php (Czech)
* New translations activities.php (German)
* New translations passwords.php (Arabic)
* New translations auth.php (German)
* New translations common.php (German)
* New translations components.php (German)
* New translations entities.php (German)
* New translations errors.php (German)
* New translations pagination.php (German)
* New translations passwords.php (German)
* New translations settings.php (German)
* New translations validation.php (German)
* New translations settings.php (Arabic)
* New translations pagination.php (Arabic)
* New translations common.php (Hungarian)
* New translations common.php (Spanish)
* New translations common.php (French)
* New translations components.php (French)
* New translations entities.php (French)
* New translations errors.php (French)
* New translations pagination.php (French)
* New translations passwords.php (French)
* New translations settings.php (French)
* New translations validation.php (French)
* New translations errors.php (Arabic)
* New translations settings.php (Spanish)
* New translations validation.php (Spanish)
* New translations activities.php (Arabic)
* New translations auth.php (Arabic)
* New translations common.php (Arabic)
* New translations components.php (Arabic)
* New translations entities.php (Arabic)
* New translations auth.php (Hungarian)
* New translations entities.php (Polish)
* New translations common.php (Dutch)
* New translations common.php (Korean)
* New translations components.php (Korean)
* New translations entities.php (Korean)
* New translations errors.php (Korean)
* New translations pagination.php (Korean)
* New translations passwords.php (Korean)
* New translations settings.php (Korean)
* New translations validation.php (Korean)
* New translations activities.php (Dutch)
* New translations auth.php (Dutch)
* New translations components.php (Dutch)
* New translations activities.php (Korean)
* New translations entities.php (Dutch)
* New translations errors.php (Dutch)
* New translations pagination.php (Dutch)
* New translations passwords.php (Dutch)
* New translations settings.php (Dutch)
* New translations validation.php (Dutch)
* New translations activities.php (Polish)
* New translations auth.php (Polish)
* New translations common.php (Polish)
* New translations components.php (Polish)
* New translations auth.php (Korean)
* New translations validation.php (Japanese)
* New translations entities.php (Hungarian)
* New translations errors.php (Italian)
* New translations errors.php (Hungarian)
* New translations settings.php (Hungarian)
* New translations validation.php (Hungarian)
* New translations activities.php (Italian)
* New translations auth.php (Italian)
* New translations common.php (Italian)
* New translations components.php (Italian)
* New translations entities.php (Italian)
* New translations pagination.php (Italian)
* New translations settings.php (Japanese)
* New translations passwords.php (Italian)
* New translations settings.php (Italian)
* New translations validation.php (Italian)
* New translations activities.php (Japanese)
* New translations auth.php (Japanese)
* New translations common.php (Japanese)
* New translations components.php (Japanese)
* New translations entities.php (Japanese)
* New translations errors.php (Japanese)
* New translations pagination.php (Japanese)
* New translations passwords.php (Japanese)
* New translations validation.php (German Informal) 
							
						 
						
							2019-10-18 17:08:22 +01:00  
				
					
						
							
							
								 
						
							
								48c44958f5 
								
							 
						 
						
							
							
								
								Added support for Pascal language  
							
							
							
						 
						
							2019-10-18 16:34:38 +02:00  
				
					
						
							
							
								 
						
							
								f1d7699df5 
								
							 
						 
						
							
							
								
								Updated Korean to be correct country code  
							
							
							
						 
						
							2019-10-18 14:27:41 +01:00  
				
					
						
							
							
								 
						
							
								37560a3f8c 
								
							 
						 
						
							
							
								
								Fixed crowdin translation path  
							
							
							
						 
						
							2019-10-18 02:09:12 +01:00  
				
					
						
							
							
								 
						
							
								5f3caf3643 
								
							 
						 
						
							
							
								
								Update Crowdin configuration file  
							
							
							
						 
						
							2019-10-18 01:46:30 +01:00  
				
					
						
							
							
								 
						
							
								c8d90791ff 
								
							 
						 
						
							
							
								
								Moved crownin config file  
							
							
							
						 
						
							2019-10-18 01:45:25 +01:00  
				
					
						
							
							
								 
						
							
								c108c16419 
								
							 
						 
						
							
							
								
								Added crowdin config file  
							
							
							
						 
						
							2019-10-18 01:40:50 +01:00  
				
					
						
							
							
								 
						
							
								b09ea76b8d 
								
							 
						 
						
							
							
								
								Renamed properties input option as INI  
							
							... 
							
							
							
							- Also made INI be recognised as the codemirror "Properties" format. 
							
						 
						
							2019-10-17 21:16:55 +01:00  
				
					
						
							
							
								 
						
							
								8b4bfa4d78 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/c0shea/BookStack into c0shea-master  
							
							
							
						 
						
							2019-10-17 21:09:05 +01:00  
				
					
						
							
							
								 
						
							
								e6fe299c4f 
								
							 
						 
						
							
							
								
								added additional color settings into UI  
							
							... 
							
							
							
							Adds new options in the customization section of the settings to change the shelf, book, chapter, page, and draft colors. 
							
						 
						
							2019-10-17 13:46:18 -05:00  
				
					
						
							
							
								 
						
							
								ae19658b50 
								
							 
						 
						
							
							
								
								Placeholder for allowing colors to be changed in settings UI.  
							
							
							
						 
						
							2019-10-17 09:44:20 -05:00  
				
					
						
							
							
								 
						
							
								d7557befe2 
								
							 
						 
						
							
							
								
								Copied release page link to normal settings page  
							
							... 
							
							
							
							- Also updated link to not leak referrer info 
							
						 
						
							2019-10-17 15:06:55 +01:00  
				
					
						
							
							
								 
						
							
								5c7262673a 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of git://github.com/DeftNerd/BookStack into DeftNerd-patch-1  
							
							
							
						 
						
							2019-10-17 14:58:20 +01:00  
				
					
						
							
							
								 
						
							
								ef762e851a 
								
							 
						 
						
							
							
								
								Reverted changes to codemirror line wrapping  
							
							
							
						 
						
							2019-10-17 14:41:39 +01:00  
				
					
						
							
							
								 
						
							
								e91ef54cc9 
								
							 
						 
						
							
							
								
								Merge branch 'fix-1575' of git://github.com/james-geiger/BookStack into james-geiger-fix-1575  
							
							
							
						 
						
							2019-10-17 14:32:39 +01:00  
				
					
						
							
							
								 
						
							
								3959841dbc 
								
							 
						 
						
							
							
								
								Added back in some tabindex that shouldn't have been removed  
							
							
							
						 
						
							2019-10-17 14:21:13 +01:00  
				
					
						
							
							
								 
						
							
								e48d7d59cc 
								
							 
						 
						
							
							
								
								Removed tabindexes where found to be not required  
							
							
							
						 
						
							2019-10-17 14:19:35 +01:00  
				
					
						
							
							
								 
						
							
								5a887e31da 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/almandin/BookStack into almandin-master  
							
							
							
						 
						
							2019-10-17 14:09:07 +01:00  
				
					
						
							
							
								 
						
							
								df98deb59d 
								
							 
						 
						
							
							
								
								Added Turkish to locale system  
							
							
							
						 
						
							2019-10-17 14:01:19 +01:00  
				
					
						
							
							
								 
						
							
								ddb7f33868 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/oykenfurkan/BookStack into oykenfurkan-master  
							
							
							
						 
						
							2019-10-17 13:56:53 +01:00  
				
					
						
							
							
								 
						
							
								076cf59a41 
								
							 
						 
						
							
							
								
								Merge pull request  #1695  from qligier/master  
							
							... 
							
							
							
							French translation update 
							
						 
						
							2019-10-17 13:46:33 +01:00  
				
					
						
							
							
								 
						
							
								4ab6a25893 
								
							 
						 
						
							
							
								
								Merge pull request  #1681  from leomartinez/master  
							
							... 
							
							
							
							Updated 'Spanish Argentina' translation. 
							
						 
						
							2019-10-17 13:44:28 +01:00  
				
					
						
							
							
								 
						
							
								f413fc528a 
								
							 
						 
						
							
							
								
								Merge pull request  #1646  from kostefun/patch-15  
							
							... 
							
							
							
							Update settings.php 
							
						 
						
							2019-10-17 13:43:27 +01:00  
				
					
						
							
							
								 
						
							
								76bd0fdfa6 
								
							 
						 
						
							
							
								
								Added editor instance event hooks  
							
							... 
							
							
							
							As per #1721  
							
						 
						
							2019-10-16 18:01:35 +01:00  
				
					
						
							
							
								 
						
							
								b24279cc12 
								
							 
						 
						
							
							
								
								Merge branch 'patching-v0.27'  
							
							
							
						 
						
							2019-10-16 16:37:29 +01:00  
				
					
						
							
							
								 
						
							
								61a9139bf0 
								
							 
						 
						
							
							
								
								Add feature to send test e-mails  
							
							
							
						 
						
							2019-10-16 08:24:33 +02:00  
				
					
						
							
							
								 
						
							
								d6456e961a 
								
							 
						 
						
							
							
								
								Fixed issue causing text overlap in sort select box  
							
							... 
							
							
							
							Updated grid columns to be more adaptable to content, with a min-width
of the old value.
Fixes  #1654  
							
						 
						
							2019-10-07 21:06:15 +01:00  
				
					
						
							
							
								 
						
							
								d4c62265ca 
								
							 
						 
						
							
							
								
								Made JS animation cleanup process more reliable  
							
							... 
							
							
							
							Fixes  #1643  
						
							2019-10-07 20:57:25 +01:00  
				
					
						
							
							
								 
						
							
								b6c0baf44d 
								
							 
						 
						
							
							
								
								Updated comment delete action to be a button  
							
							... 
							
							
							
							Fixes issue that causes code error when an anchor tag.
Closes  #1650  
							
						 
						
							2019-10-07 20:21:04 +01:00  
				
					
						
							
							
								 
						
							
								ccec991f6c 
								
							 
						 
						
							
							
								
								Added zip/unzip to docker dev setup for composer to use  
							
							
							
						 
						
							2019-10-05 13:21:38 +01:00  
				
					
						
							
							
								 
						
							
								6736779eff 
								
							 
						 
						
							
							
								
								Merge pull request  #1698  from 3mmarg97/master  
							
							... 
							
							
							
							Fixing composer install inside docker `app` container 
							
						 
						
							2019-10-05 13:13:29 +01:00  
				
					
						
							
							
								 
						
							
								31f5786e01 
								
							 
						 
						
							
							
								
								Entity Repo & Controller Refactor ( #1690 )  
							
							... 
							
							
							
							* Started mass-refactoring of the current entity repos
* Rewrote book tree logic
- Now does two simple queries instead of one really complex one.
- Extracted logic into its own class.
- Remove model-level akward union field listing.
- Logic now more readable than being large separate query and
compilation functions.
* Extracted and split book sort logic
* Finished up Book controller/repo organisation
* Refactored bookshelves controllers and repo parts
* Fixed issues found via phpunit
* Refactored Chapter controller
* Updated Chapter export controller
* Started Page controller/repo refactor
* Refactored another chunk of PageController
* Completed initial pagecontroller refactor pass
* Fixed tests and continued reduction of old repos
* Removed old page remove and further reduced entity repo
* Removed old entity repo, split out page controller
* Ran phpcbf and split out some page content methods
* Tidied up some EntityProvider elements
* Fixed issued caused by viewservice change 
							
						 
						
							2019-10-05 12:55:01 +01:00  
				
					
						
							
							
								 
						
							
								3f025f69cf 
								
							 
						 
						
							
							
								
								Add git to the apt-get install packages.  
							
							
							
						 
						
							2019-10-03 20:46:49 +03:00  
				
					
						
							
							
								 
						
							
								593933c84e 
								
							 
						 
						
							
							
								
								French translation update  
							
							
							
						 
						
							2019-10-01 20:34:54 +02:00  
				
					
						
							
							
								 
						
							
								4ad4dfa55a 
								
							 
						 
						
							
							
								
								Show bookshelves that a book belongs to on a book view  
							
							... 
							
							
							
							Closes  #1598  
						
							2019-09-27 00:45:22 +01:00  
				
					
						
							
							
								 
						
							
								2f94f078e3 
								
							 
						 
						
							
							
								
								Fix Book form (create) returning to the full books list on cancel  
							
							... 
							
							
							
							Fixes  #1662 
Added a small block of logic to determine the correct URL to attribute to the cancel button on a given page create form.
If adding a book from a bookshelf, return to the bookshelf. If editing a book, return to the book. In all other cases, return to the full books list. 
						
							2019-09-26 22:51:24 +01:00  
				
					
						
							
							
								 
						
							
								0fa4ef072f 
								
							 
						 
						
							
							
								
								Updated 'Spanish Argentina' translation.  
							
							
							
						 
						
							2019-09-24 22:36:08 -03:00  
				
					
						
							
							
								 
						
							
								7cd956b24b 
								
							 
						 
						
							
							
								
								Removed some unused parameters and fixed env test logic  
							
							
							
						 
						
							2019-09-20 01:18:59 +01:00