Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								62a475e464 
								
							 
						 
						
							
							
								
								Merge branch 'qianmengnet-master'  
							
							 
							
							
							
						 
						
							2018-11-10 13:55:48 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cfc1a2f045 
								
							 
						 
						
							
							
								
								Removed settings that had been copied from en  
							
							 
							
							
							
						 
						
							2018-11-10 13:55:13 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b012f27ae3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master  
							
							 
							
							
							
						 
						
							2018-11-10 13:54:35 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								58bec7287f 
								
							 
						 
						
							
							
								
								Merge pull request  #1088  from kejjang/zh_TW_update  
							
							 
							
							... 
							
							
							
							Update zh_TW translation 
							
						 
						
							2018-11-10 13:52:23 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9341ae4910 
								
							 
						 
						
							
							
								
								Merge pull request  #1066  from limkukhyun/codev-kuk-master  
							
							 
							
							... 
							
							
							
							completed the Korean translation. Please accept the pull request 
							
						 
						
							2018-11-10 13:50:39 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1328755f95 
								
							 
						 
						
							
							
								
								Merge pull request  #1034  from DeehSlash/pt_br_translations  
							
							 
							
							... 
							
							
							
							Adds missing pt_BR translation 
							
						 
						
							2018-11-10 13:47:38 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								038b2418f7 
								
							 
						 
						
							
							
								
								Fixed baseURL helper when no app url is set  
							
							 
							
							... 
							
							
							
							Also cleaned variable naming to be more obvious 
							
						 
						
							2018-11-09 21:29:30 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e3230f8f21 
								
							 
						 
						
							
							
								
								Standardised module loading system & fixed build system  
							
							 
							
							... 
							
							
							
							Fixed broken build system in broken webpack version.
Also updates module system to standardise on ES6 import/exports,
Especially since babel has changed it's 'default' logic for the old
module system. 
							
						 
						
							2018-11-09 21:17:35 +00:00  
						
					 
				
					
						
							
							
								 
								qianmengnet
							
						 
						
							 
							
							
							
							
								
							
							
								fd37d95ffc 
								
							 
						 
						
							
							
								
								Chinese translation update for v0.24.1  
							
							 
							
							... 
							
							
							
							0.24.1 
							
						 
						
							2018-11-08 08:10:04 +08:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								5b36ddb12f 
								
							 
						 
						
							
							
								
								Updated npm dependancies  
							
							 
							
							
							
						 
						
							2018-11-04 15:40:10 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ffc1aa873e 
								
							 
						 
						
							
							
								
								Merge branch 'v0.24-dev'  
							
							 
							
							
							
						 
						
							2018-11-04 15:36:40 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								19b7093438 
								
							 
						 
						
							
							
								
								Fixed redirect issue when custom app url in use  
							
							 
							
							... 
							
							
							
							Fixes  #956  & #1048 
Also added tests to cover this url logic.
Also removed debugbar during tests to maybe improve test speed. 
							
						 
						
							2018-11-04 15:18:27 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7799ba5c79 
								
							 
						 
						
							
							
								
								Updated composer dependancies including laravel minor version  
							
							 
							
							... 
							
							
							
							Updated larvel 5.5 to latest version to bring in latest fixes.
Fixes  #1095  
							
						 
						
							2018-11-04 14:53:13 +00:00  
						
					 
				
					
						
							
							
								 
								Kej
							
						 
						
							 
							
							
							
							
								
							
							
								773ab9d7ff 
								
							 
						 
						
							
							
								
								Update zh_TW translation  
							
							 
							
							
							
						 
						
							2018-10-25 11:38:49 +08:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								e8ab4fd91f 
								
							 
						 
						
							
							
								
								change config/app.php to add korean  
							
							 
							
							
							
						 
						
							2018-10-15 16:39:16 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								5d1162fb64 
								
							 
						 
						
							
							
								
								translate complate  
							
							 
							
							
							
						 
						
							2018-10-15 16:36:11 +09:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								85f330c79a 
								
							 
						 
						
							
							
								
								Extracted many page-specific repo methods into page-specific repo  
							
							 
							
							
							
						 
						
							2018-10-13 11:27:55 +01:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								4afc67a962 
								
							 
						 
						
							
							
								
								settings - completed  
							
							 
							
							... 
							
							
							
							entities - Some edits done 
							
						 
						
							2018-10-12 17:22:29 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								042d8b3274 
								
							 
						 
						
							
							
								
								translate entities, setting  
							
							 
							
							
							
						 
						
							2018-10-12 16:06:08 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								1c0a196b9d 
								
							 
						 
						
							
							
								
								Include Korean in settings  
							
							 
							
							
							
						 
						
							2018-10-12 16:05:28 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								a1fda37896 
								
							 
						 
						
							
							
								
								done validation  
							
							 
							
							
							
						 
						
							2018-10-12 16:04:57 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								43758a7d60 
								
							 
						 
						
							
							
								
								3개 번역  
							
							 
							
							
							
						 
						
							2018-10-12 15:13:27 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								c7d3db9751 
								
							 
						 
						
							
							
								
								translate kr 50/100  
							
							 
							
							
							
						 
						
							2018-10-05 11:24:24 +09:00  
						
					 
				
					
						
							
							
								 
								codev-kuk-mac
							
						 
						
							 
							
							
							
							
								
							
							
								fca7689e1a 
								
							 
						 
						
							
							
								
								translate to kr 20/100  
							
							 
							
							
							
						 
						
							2018-10-05 10:24:37 +09:00  
						
					 
				
					
						
							
							
								 
								André Luiz da Silva
							
						 
						
							 
							
							
							
							
								
							
							
								18bac4e673 
								
							 
						 
						
							
							
								
								Fixes "bookshelf" pt_BR translation in "activities"  
							
							 
							
							
							
						 
						
							2018-09-28 16:27:26 -03:00  
						
					 
				
					
						
							
							
								 
								André Luiz da Silva
							
						 
						
							 
							
							
							
							
								
							
							
								ca2a9fbf1c 
								
							 
						 
						
							
							
								
								Adds missing "settings" pt_BR translations  
							
							 
							
							
							
						 
						
							2018-09-28 16:26:01 -03:00  
						
					 
				
					
						
							
							
								 
								André Luiz da Silva
							
						 
						
							 
							
							
							
							
								
							
							
								cbebe7c8de 
								
							 
						 
						
							
							
								
								Adds missing "errors" pt_BR translations  
							
							 
							
							
							
						 
						
							2018-09-28 16:19:06 -03:00  
						
					 
				
					
						
							
							
								 
								André Luiz da Silva
							
						 
						
							 
							
							
							
							
								
							
							
								0943221902 
								
							 
						 
						
							
							
								
								Adds missing "entities" pt_BR translations  
							
							 
							
							
							
						 
						
							2018-09-28 16:18:14 -03:00  
						
					 
				
					
						
							
							
								 
								André Luiz da Silva
							
						 
						
							 
							
							
							
							
								
							
							
								17ed1b7faf 
								
							 
						 
						
							
							
								
								Adds missing "common" pt_BR translations  
							
							 
							
							
							
						 
						
							2018-09-26 21:54:16 -03:00  
						
					 
				
					
						
							
							
								 
								André Luiz da Silva
							
						 
						
							 
							
							
							
							
								
							
							
								36d18f28ee 
								
							 
						 
						
							
							
								
								Adds missing "activities" pt_BR translations  
							
							 
							
							
							
						 
						
							2018-09-26 21:51:34 -03:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								495d18814a 
								
							 
						 
						
							
							
								
								Updated various classes to take EntityProvider instead of separate entities  
							
							 
							
							
							
						 
						
							2018-09-25 18:00:40 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								257a5a23ec 
								
							 
						 
						
							
							
								
								Fleshed out entity provided and optimized imports  
							
							 
							
							
							
						 
						
							2018-09-25 16:58:03 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								919660678b 
								
							 
						 
						
							
							
								
								Re-structured the app code to be feature based rather than code type based  
							
							 
							
							
							
						 
						
							2018-09-25 12:30:50 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								19751ed1cb 
								
							 
						 
						
							
							
								
								Incremented dev version  
							
							 
							
							
							
						 
						
							2018-09-25 10:00:09 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								818c02ed44 
								
							 
						 
						
							
							
								
								Added null role check to migrate path  
							
							 
							
							... 
							
							
							
							Also added check for existing bookshelf role_permissions
in the event the user got that for.
Also related to #1027  
							
						 
						
							2018-09-24 16:30:08 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9abdab3991 
								
							 
						 
						
							
							
								
								Updated migration to convert MyISAM tables to InnoDB  
							
							 
							
							... 
							
							
							
							New bookshelves_books tables requires foreign constraints which error on MyISAM.
For #1027  
							
						 
						
							2018-09-24 15:58:40 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								43122f86e8 
								
							 
						 
						
							
							
								
								Merge pull request  #1026  from vriic/master  
							
							 
							
							... 
							
							
							
							Update german translation 
							
						 
						
							2018-09-24 10:35:22 +01:00  
						
					 
				
					
						
							
							
								 
								Nikolai Nikolajevic
							
						 
						
							 
							
							
							
							
								
							
							
								935337862c 
								
							 
						 
						
							
							
								
								Update german translation  
							
							 
							
							
							
						 
						
							2018-09-24 09:55:37 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								dd671524f8 
								
							 
						 
						
							
							
								
								Merge pull request  #1025  from moucho/master  
							
							 
							
							... 
							
							
							
							Spanish translation 
							
						 
						
							2018-09-23 17:18:41 +01:00  
						
					 
				
					
						
							
							
								 
								Marcos
							
						 
						
							 
							
							
							
							
								
							
							
								1cac3d43d3 
								
							 
						 
						
							
							
								
								Spanish translation  
							
							 
							
							
							
						 
						
							2018-09-23 17:31:41 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9243c635f2 
								
							 
						 
						
							
							
								
								Made search test a little more consistent  
							
							 
							
							
							
						 
						
							2018-09-23 15:15:44 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								93f820d9da 
								
							 
						 
						
							
							
								
								Updated TinyMCE config to end containers on empty blocks  
							
							 
							
							... 
							
							
							
							Makes it easier to escape out of blockquote sections.
Fixes  #961  
							
						 
						
							2018-09-23 14:07:50 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								b62afcad1f 
								
							 
						 
						
							
							
								
								Removed search indexing from migration path to prevent Bookshelf issue  
							
							 
							
							
							
						 
						
							2018-09-23 13:25:12 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7b32aa163f 
								
							 
						 
						
							
							
								
								Added Bookshelves to search system.  
							
							 
							
							... 
							
							
							
							Also cleaned up and made search indexing system a little more efficient.
Closes  #1023  
							
						 
						
							2018-09-23 12:34:30 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								eebfd8904e 
								
							 
						 
						
							
							
								
								Removed old fulltext indexes from migrations  
							
							 
							
							... 
							
							
							
							Prevents forcing of MyISAM for some databases
Removed old code to add indexes and added checks for existing indexes before removal.
Should still allow upgrades, rollbacks to old bookstack versions may be funky but
should not be high use-case. 
							
						 
						
							2018-09-23 00:30:48 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0d84a0b976 
								
							 
						 
						
							
							
								
								Extracted search sidebar text to translation file  
							
							 
							
							... 
							
							
							
							Closes  #864  
							
						 
						
							2018-09-22 23:40:04 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								88ac636c00 
								
							 
						 
						
							
							
								
								Made it possible to scroll past the end of the markdown editor  
							
							 
							
							... 
							
							
							
							Closes  #1020  
							
						 
						
							2018-09-22 23:24:51 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9dc26a8c52 
								
							 
						 
						
							
							
								
								Prevented TinyMCE clear-color option having scrollbar  
							
							 
							
							... 
							
							
							
							Was covering the option if showing and prevented the option being pressed.
Fixes  #999  
							
						 
						
							2018-09-22 23:12:39 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6543020fd2 
								
							 
						 
						
							
							
								
								Updated tinymce to v4.8.3  
							
							 
							
							
							
						 
						
							2018-09-22 22:58:06 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								be4f3d62cd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/ru-locale' of git://github.com/mullinsmikey/BookStack into mullinsmikey-fix/ru-locale  
							
							 
							
							
							
						 
						
							2018-09-22 22:29:03 +01:00