Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c5b58d8fd2 
								
							 
						 
						
							
							
								
								Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation  
							
							 
							
							
							
						 
						
							2017-07-02 16:09:12 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								4db2c274e2 
								
							 
						 
						
							
							
								
								Prevent empty-state actions visible without permission.  
							
							 
							
							... 
							
							
							
							Fixes  #411  
							
						 
						
							2017-07-02 15:59:40 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cbff801aec 
								
							 
						 
						
							
							
								
								Added test to cover  f99c8ff.  
							
							 
							
							... 
							
							
							
							Closes  #409  
							
						 
						
							2017-07-02 15:40:42 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d5d83da766 
								
							 
						 
						
							
							
								
								Added diff and sh code types  
							
							 
							
							... 
							
							
							
							Verified changes to ensure fixes  #296 . 
							
						 
						
							2017-07-01 16:10:52 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								de6d8a811c 
								
							 
						 
						
							
							
								
								Added quick lang-selection options to code editor  
							
							 
							
							
							
						 
						
							2017-07-01 15:50:28 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a94844b6b7 
								
							 
						 
						
							
							
								
								Fixed code block selection and drag/drop issues  
							
							 
							
							
							
						 
						
							2017-07-01 15:38:11 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								968e7b8b72 
								
							 
						 
						
							
							
								
								Finished off main functionality of custom tinymce code editor  
							
							 
							
							
							
						 
						
							2017-07-01 13:23:46 +01:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								5f461c9796 
								
							 
						 
						
							
							
								
								Add `ja` locale to config  
							
							 
							
							
							
						 
						
							2017-07-01 16:40:06 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								b2b8706d05 
								
							 
						 
						
							
							
								
								Translate errors.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:38:43 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								2d345fe454 
								
							 
						 
						
							
							
								
								Translate entities.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:38:20 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								7bec70d429 
								
							 
						 
						
							
							
								
								Translate common.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:37:07 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								60710e7fb4 
								
							 
						 
						
							
							
								
								Translate auth.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:33:54 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								f10d3a8564 
								
							 
						 
						
							
							
								
								Translate validation.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:32:36 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								b020520366 
								
							 
						 
						
							
							
								
								Translate passwords.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:32:02 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								52010e5820 
								
							 
						 
						
							
							
								
								Translate pagination.php  
							
							 
							
							
							
						 
						
							2017-07-01 16:31:32 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								75eca03b05 
								
							 
						 
						
							
							
								
								Translate settings.php  
							
							 
							
							
							
						 
						
							2017-06-24 20:49:24 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								b8ebefd803 
								
							 
						 
						
							
							
								
								Translate components.php  
							
							 
							
							
							
						 
						
							2017-06-24 20:48:34 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								168c66815e 
								
							 
						 
						
							
							
								
								add `ja` to settings  
							
							 
							
							
							
						 
						
							2017-06-24 20:46:38 +09:00  
						
					 
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 
						
							 
							
							
							
							
								
							
							
								26e703a1cd 
								
							 
						 
						
							
							
								
								translate activities.php  
							
							 
							
							
							
						 
						
							2017-06-19 00:02:09 +09:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c8be214ee0 
								
							 
						 
						
							
							
								
								Started tinymce code editor components  
							
							 
							
							
							
						 
						
							2017-06-17 15:07:55 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2060cdb931 
								
							 
						 
						
							
							
								
								Added code highlighting syntax modes  
							
							 
							
							
							
						 
						
							2017-06-17 12:41:18 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0528e98d9c 
								
							 
						 
						
							
							
								
								Merge branch 'v0.16'  
							
							 
							
							
							
						 
						
							2017-06-04 15:39:55 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f99c8ff99a 
								
							 
						 
						
							
							
								
								Fixed role permission removal bug  
							
							 
							
							
							
						 
						
							2017-06-04 15:37:10 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								88f93f76dd 
								
							 
						 
						
							
							
								
								Updated the markdown editor to use codemirror as editor  
							
							 
							
							... 
							
							
							
							Improved scroll sync system to be smarter 
							
						 
						
							2017-05-28 16:02:46 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e5fc6bf5fa 
								
							 
						 
						
							
							
								
								Moved from highlight.js to codemirror  
							
							 
							
							
							
						 
						
							2017-05-28 13:16:21 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8990a9817f 
								
							 
						 
						
							
							
								
								Updated tinymce to latest version  
							
							 
							
							
							
						 
						
							2017-05-28 11:57:58 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								75981c2412 
								
							 
						 
						
							
							
								
								Fixed chapter check for non-mysqlnd instances  
							
							 
							
							... 
							
							
							
							Fixes  #383  
							
						 
						
							2017-05-07 19:34:56 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f8ae4c335e 
								
							 
						 
						
							
							
								
								Made single entity updates more efficent  
							
							 
							
							
							
						 
						
							2017-04-30 19:44:59 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								5570e858e5 
								
							 
						 
						
							
							
								
								Made more efficiency improvements to permission system  
							
							 
							
							
							
						 
						
							2017-04-30 11:38:58 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1859a4d356 
								
							 
						 
						
							
							
								
								Refactored permission system components  
							
							 
							
							... 
							
							
							
							Split joint permission creation into chunks
Fixes  #374  
							
						 
						
							2017-04-29 22:01:43 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ad4642c2c4 
								
							 
						 
						
							
							
								
								Enabled translation when not logged in  
							
							 
							
							... 
							
							
							
							Reads from the Accept-Language HTTP header.
Also fixed some encoding for ES translations.
Fixes  #375  
							
						 
						
							2017-04-29 16:47:41 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								92108d710d 
								
							 
						 
						
							
							
								
								Re-enabled html in markdown editor  
							
							 
							
							... 
							
							
							
							Fixes  #378  
							
						 
						
							2017-04-29 16:10:38 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								44347ee353 
								
							 
						 
						
							
							
								
								Fixed search system id clash  
							
							 
							
							
							
						 
						
							2017-04-23 20:27:49 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9e704fcae4 
								
							 
						 
						
							
							
								
								Updated testing database connection issue  
							
							 
							
							
							
						 
						
							2017-04-23 17:51:01 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								fdd816b17d 
								
							 
						 
						
							
							
								
								Merge pull request  #362  from DaneEveritt/patch-1  
							
							 
							
							... 
							
							
							
							Queue confirmation emails. 
							
						 
						
							2017-04-23 17:15:06 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								82e2c523e6 
								
							 
						 
						
							
							
								
								Fixed chapter breadcrumbs and testing issues  
							
							 
							
							
							
						 
						
							2017-04-22 14:08:12 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a323b0d49c 
								
							 
						 
						
							
							
								
								Allowed child entity permissions to override parent permissions  
							
							 
							
							... 
							
							
							
							Updated elements of a page display and sidebar render to allow
child permissions to work even when parent entitites have permission
set. This allows a page with a 'view' permission to be viewable even
when the parent book or chapter is not viewable.
Fixes  #366  
							
						 
						
							2017-04-22 13:39:34 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								4c985aac7e 
								
							 
						 
						
							
							
								
								Added page revision counting  
							
							 
							
							... 
							
							
							
							Adds stored revision counts to pages and the revisions themselves.
Closes  #321  
							
						 
						
							2017-04-20 20:58:54 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								87e18b8068 
								
							 
						 
						
							
							
								
								Merge pull request  #357  from diegoseso/master  
							
							 
							
							... 
							
							
							
							Spanish translation completed 
							
						 
						
							2017-04-19 06:40:00 +01:00  
						
					 
				
					
						
							
							
								 
								Diego Jose Sosa Diaz
							
						 
						
							 
							
							
							
							
								
							
							
								607a2c91fc 
								
							 
						 
						
							
							
								
								Fixing encoding of files affecting accents.  
							
							 
							
							
							
						 
						
							2017-04-18 23:41:19 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fde970ba59 
								
							 
						 
						
							
							
								
								Switched out markdown render  
							
							 
							
							... 
							
							
							
							Fixes  #304 .
Fixes  #359 . 
							
						 
						
							2017-04-17 12:21:10 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								ec7be1b08b 
								
							 
						 
						
							
							
								
								Merge pull request  #363  from solidnerd/add-env-for-logging  
							
							 
							
							... 
							
							
							
							Add APP_LOGGING 
							
						 
						
							2017-04-17 11:46:32 +01:00  
						
					 
				
					
						
							
							
								 
								solidnerd
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								746a760a23 
								
							 
						 
						
							
							
								
								Add APP_LOGGING  
							
							 
							
							... 
							
							
							
							This will add an variable for logging types to make it easier to define outside via .env.
Signed-off-by: solidnerd <niclas@mietz.io> 
							
						 
						
							2017-04-17 09:55:11 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1a09d88891 
								
							 
						 
						
							
							
								
								Added fade effect to page content highlighting  
							
							 
							
							... 
							
							
							
							Closes  #314  
							
						 
						
							2017-04-16 16:46:55 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								46c01ecba2 
								
							 
						 
						
							
							
								
								Merge pull request  #358  from jendrol/master  
							
							 
							
							... 
							
							
							
							Add Slovak translation 
							
						 
						
							2017-04-16 15:06:32 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								544ece03a5 
								
							 
						 
						
							
							
								
								Merge pull request  #360  from Abijeet/spellcheck-fix  
							
							 
							
							... 
							
							
							
							Fixes  #354 , Adds the spellchecker option 
							
						 
						
							2017-04-16 15:02:20 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								5fee7c4db1 
								
							 
						 
						
							
							
								
								Merge pull request  #340  from BookStackApp/search_system  
							
							 
							
							... 
							
							
							
							Implementation of new search system 
							
						 
						
							2017-04-16 11:01:00 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8ed9f75d57 
								
							 
						 
						
							
							
								
								Fixed model extending mis-use  
							
							 
							
							
							
						 
						
							2017-04-16 10:54:23 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a15b179676 
								
							 
						 
						
							
							
								
								Updated testcases for new search system.  
							
							 
							
							... 
							
							
							
							Finishes implementation of new search system.
Closes  #271 
Closes  #344 
Fixes  #285 
Fixes  #269 
Closes  #64  
							
						 
						
							2017-04-16 10:47:44 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								73844b9eeb 
								
							 
						 
						
							
							
								
								Enabled type search filter in book search  
							
							 
							
							
							
						 
						
							2017-04-15 19:31:11 +01:00