Dan Brown 
							
						 
					 
					
						
						
							
						
						f122bebae7 
					 
					
						
						
							
							Prevented whitespace in codeblocks being trimmed  
						
						... 
						
						
						
						For #1771  
						
						
					 
					
						2019-12-16 11:44:28 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						cee4dccc55 
					 
					
						
						
							
							Compacted entity color options in settings view  
						
						... 
						
						
						
						- Also extracted the view code into it's own blade template
- Made smaller color input styles 
						
						
					 
					
						2019-12-07 21:23:15 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						615a050856 
					 
					
						
						
							
							Merge branch 'settings-color-selector' of git://github.com/james-geiger/BookStack into james-geiger-settings-color-selector  
						
						
						
						
					 
					
						2019-12-07 20:36:39 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						5a533fff8b 
					 
					
						
						
							
							Updated codeblock editor to work with fade animation  
						
						... 
						
						
						
						- Added fadeIn to animation JS service.
- Updated overlay to use anim service and to recieve a callback for
after-anim actions.
- Updated code editor popup to refresh Codemirror instance layout after
animation has completed.
Fixes  #1672  
						
						
					 
					
						2019-12-07 16:54:34 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						a6bbe46987 
					 
					
						
						
							
							Updated code system to dynamically set php codemirror mode  
						
						... 
						
						
						
						- Codemirror mode mapping value can now be a function to dynamically set
mode depending on actual code content.
- Used above system to set php mode type, depending on if '<?php' tags
exist in content.
Closes  #1557  
						
						
					 
					
						2019-12-07 16:23:44 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						8b4bfa4d78 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/c0shea/BookStack into c0shea-master  
						
						
						
						
					 
					
						2019-10-17 21:09:05 +01:00 
						 
				 
			
				
					
						
							
							
								James Geiger 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						ef762e851a 
					 
					
						
						
							
							Reverted changes to codemirror line wrapping  
						
						
						
						
					 
					
						2019-10-17 14:41:39 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						76bd0fdfa6 
					 
					
						
						
							
							Added editor instance event hooks  
						
						... 
						
						
						
						As per #1721  
						
						
					 
					
						2019-10-16 18:01:35 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						b24279cc12 
					 
					
						
						
							
							Merge branch 'patching-v0.27'  
						
						
						
						
					 
					
						2019-10-16 16:37:29 +01:00 
						 
				 
			
				
					
						
							
							
								Connor O'Shea 
							
						 
					 
					
						
						
							
						
						fca69643db 
					 
					
						
						
							
							Normalize ini and properties values  
						
						
						
						
					 
					
						2019-09-15 20:24:47 -04:00 
						 
				 
			
				
					
						
							
							
								Connor O'Shea 
							
						 
					 
					
						
						
							
						
						228aa4740b 
					 
					
						
						
							
							Add support for properties (INI)  
						
						
						
						
					 
					
						2019-09-15 20:20:11 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						6917ea088f 
					 
					
						
						
							
							Upgraded app to Laravel 5.7  
						
						
						
						
					 
					
						2019-09-06 23:36:16 +01:00