Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8df9dab80a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/615  
							
							 
							
							
							
						 
						
							2018-05-20 09:51:45 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								93147f4340 
								
							 
						 
						
							
							
								
								Prevented back-to-top showing on flexbox-body pages  
							
							 
							
							... 
							
							
							
							Fixes  #824  
							
						 
						
							2018-05-20 09:48:11 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								77727e7e50 
								
							 
						 
						
							
							
								
								Update session config to match laravel  
							
							 
							
							... 
							
							
							
							Includes option to set secure cookies via env.
Closes  #817  
							
						 
						
							2018-05-20 09:38:27 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9f4c64a676 
								
							 
						 
						
							
							
								
								Codemirror mode now correct for c-like langs  
							
							 
							
							... 
							
							
							
							Fixes  #849  
							
						 
						
							2018-05-20 09:32:15 +01:00  
						
					 
				
					
						
							
							
								 
								Nikolai Nikolajevic
							
						 
						
							 
							
							
							
							
								
							
							
								e0ebae19aa 
								
							 
						 
						
							
							
								
								Update: Übersetzung  
							
							 
							
							
							
						 
						
							2018-05-20 03:00:55 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6cdb943916 
								
							 
						 
						
							
							
								
								Started work on revisions in image manager  
							
							 
							
							
							
						 
						
							2018-05-19 18:44:40 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d3d8ddbe52 
								
							 
						 
						
							
							
								
								Improved 404 handling and fixed editor error  
							
							 
							
							... 
							
							
							
							404 handling now not a hack-around and uses Laravel 'fallback' routes
instead. Prevents errors with the session when you have mulitple errors
on a page where a post/put/delete is made. 
							
						 
						
							2018-05-19 17:01:33 +01:00  
						
					 
				
					
						
							
							
								 
								Marcos
							
						 
						
							 
							
							
							
							
								
							
							
								57c312ec3f 
								
							 
						 
						
							
							
								
								Updated Spanish translation  
							
							 
							
							
							
						 
						
							2018-05-18 03:10:49 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								13ad0031d6 
								
							 
						 
						
							
							
								
								Drawings now generate revisions, not replace  
							
							 
							
							... 
							
							
							
							Updated drawing update test to accomodate.
Image deletion system now takes revisions into account. 
							
						 
						
							2018-05-13 17:41:35 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d5b922aa50 
								
							 
						 
						
							
							
								
								Started work on drawing revisions  
							
							 
							
							... 
							
							
							
							Improved sidebar and selection styling of image manager.
Allowed image manager imageType to be changed on open.
Created models for image revisions. 
							
						 
						
							2018-05-13 12:07:38 +01:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								28823c4fae 
								
							 
						 
						
							
							
								
								Changed the location of the "view-toggle" to be under the books views.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-12 18:26:35 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								b6bb078e0a 
								
							 
						 
						
							
							
								
								removed some added CSS as it was causing unintended sideffects.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-12 17:28:10 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								8254c3be8d 
								
							 
						 
						
							
							
								
								Added the book view toggle option on the homepage.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-12 14:16:05 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								47cb99a2d6 
								
							 
						 
						
							
							
								
								Added test cases.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-12 13:07:28 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								86b2ddbd28 
								
							 
						 
						
							
							
								
								Implemented displaying of the books list on home page.  
							
							 
							
							
							
						 
						
							2018-05-10 09:05:18 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								2e4863edb1 
								
							 
						 
						
							
							
								
								Added an option to set books as the default homepage.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-09 08:26:49 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b0d027a4a9 
								
							 
						 
						
							
							
								
								Repaired other uses of entity-meta view  
							
							 
							
							
							
						 
						
							2018-04-30 15:12:10 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0c3c8fc9c3 
								
							 
						 
						
							
							
								
								Updated npm dependancies  
							
							 
							
							
							
						 
						
							2018-04-30 14:54:54 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								624c568008 
								
							 
						 
						
							
							
								
								Revamped tag styling  
							
							 
							
							
							
						 
						
							2018-04-30 14:35:15 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								58a0a59d7e 
								
							 
						 
						
							
							
								
								Cleaned details sidebar box and merged with permissions  
							
							 
							
							
							
						 
						
							2018-04-30 13:53:04 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								3d0d7f8be2 
								
							 
						 
						
							
							
								
								Updated version for next block of development  
							
							 
							
							
							
						 
						
							2018-04-30 13:52:22 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								eb5069ca66 
								
							 
						 
						
							
							
								
								Attempted to fix failing time-based test  
							
							 
							
							
							
						 
						
							2018-04-22 20:06:46 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0306253c45 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:BookStackApp/BookStack  
							
							 
							
							
							
						 
						
							2018-04-22 12:26:21 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								71b6f09128 
								
							 
						 
						
							
							
								
								Applied phpcs findings  
							
							 
							
							
							
						 
						
							2018-04-22 12:25:32 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								67e0c3d2a5 
								
							 
						 
						
							
							
								
								Improved export base64 encoding of images  
							
							 
							
							... 
							
							
							
							Now will use set storage mechanism to find image files.
Fixes  #786 
Added test to cover 
							
						 
						
							2018-04-22 12:23:43 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6aeb1387aa 
								
							 
						 
						
							
							
								
								Fixed licence badge  
							
							 
							
							
							
						 
						
							2018-04-22 11:26:11 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fa83e6bda4 
								
							 
						 
						
							
							
								
								Merge pull request  #806  from leomartinez/master  
							
							 
							
							... 
							
							
							
							Updated 'Spanish Argentina' translation. 
							
						 
						
							2018-04-21 13:46:07 +01:00  
						
					 
				
					
						
							
							
								 
								Leonardo Martinez
							
						 
						
							 
							
							
							
							
								
							
							
								ae89e05a25 
								
							 
						 
						
							
							
								
								Updated 'Spanish Argentina' translation.  
							
							 
							
							
							
						 
						
							2018-04-17 09:45:57 -03:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a50153d221 
								
							 
						 
						
							
							
								
								Slimmed down testing DB sized and improved permission caching  
							
							 
							
							
							
						 
						
							2018-04-14 22:17:47 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cdb1c7ef88 
								
							 
						 
						
							
							
								
								Added destination permission checking to entity move  
							
							 
							
							
							
						 
						
							2018-04-14 18:47:13 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0f7b0ad45a 
								
							 
						 
						
							
							
								
								Added ability to copy a page  
							
							 
							
							... 
							
							
							
							In 'More' menu alongside move.
Allows you to move if you have permission to create within the new
target parent.
Closes  #673  
							
						 
						
							2018-04-14 18:00:16 +01:00  
						
					 
				
					
						
							
							
								 
								marcusforsberg
							
						 
						
							 
							
							
							
							
								
							
							
								6c5304a3de 
								
							 
						 
						
							
							
								
								Updated Swedish translation  
							
							 
							
							
							
						 
						
							2018-04-14 18:09:09 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d34b91f2c9 
								
							 
						 
						
							
							
								
								Updated move card width and made sidebar order more consistent  
							
							 
							
							
							
						 
						
							2018-04-14 16:23:16 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								dfadaa28f6 
								
							 
						 
						
							
							
								
								Updated reset-password flow design  
							
							 
							
							... 
							
							
							
							Fixes  #800  
							
						 
						
							2018-04-14 16:16:29 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fae564ff32 
								
							 
						 
						
							
							
								
								Merge pull request  #798  from abno85/loc-de_DE  
							
							 
							
							... 
							
							
							
							Update German localization 
							
						 
						
							2018-04-14 16:02:48 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								502b22a0f2 
								
							 
						 
						
							
							
								
								Merge pull request  #783  from moucho/master  
							
							 
							
							... 
							
							
							
							Completely overhaul of the Spanish translation,  added missing strings 
							
						 
						
							2018-04-14 16:01:25 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f9feeef5c9 
								
							 
						 
						
							
							
								
								Merge pull request  #780  from jasoncheng7115/master  
							
							 
							
							... 
							
							
							
							Add Language zh_TW 
							
						 
						
							2018-04-14 16:00:03 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a6674a5a5e 
								
							 
						 
						
							
							
								
								Merge pull request  #767  from msaus/update_japanese_translation  
							
							 
							
							... 
							
							
							
							update japanese translation 
							
						 
						
							2018-04-14 15:58:35 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fb18576259 
								
							 
						 
						
							
							
								
								Merge pull request  #768  from BookStackApp/feature/tinymce-insert-video  
							
							 
							
							... 
							
							
							
							Adds the media plugin to TinyMCE to allow insertion of videos. 
							
						 
						
							2018-04-14 15:57:08 +01:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								7238a01f89 
								
							 
						 
						
							
							
								
								Moved the code to the wysiwyg-editor file.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-04-14 18:41:35 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								93f92e9e16 
								
							 
						 
						
							
							
								
								Updated the TinyMCE to version 4.7.9.  
							
							 
							
							... 
							
							
							
							Added some code to remove the box-shadow around the TinyMCE toolbar.
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-04-14 18:30:34 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								d92efd4edc 
								
							 
						 
						
							
							
								
								Adds the media plugin to TinyMCE to allow insertion of videos.  
							
							 
							
							... 
							
							
							
							Fixes  #266 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-04-14 18:30:28 +05:30  
						
					 
				
					
						
							
							
								 
								abno85
							
						 
						
							 
							
							
							
							
								
							
							
								448f7d091b 
								
							 
						 
						
							
							
								
								Add comment_add  
							
							 
							
							... 
							
							
							
							Missed 'comment_add' the last time 
							
						 
						
							2018-04-13 08:44:54 +02:00  
						
					 
				
					
						
							
							
								 
								abno85
							
						 
						
							 
							
							
							
							
								
							
							
								11470b85f9 
								
							 
						 
						
							
							
								
								Update German localization  
							
							 
							
							... 
							
							
							
							Added a few missing strings and (hopefully) fixed my borked first commit. 
							
						 
						
							2018-04-12 13:48:07 +02:00  
						
					 
				
					
						
							
							
								 
								Marcos
							
						 
						
							 
							
							
							
							
								
							
							
								9c07619099 
								
							 
						 
						
							
							
								
								orthography  
							
							 
							
							
							
						 
						
							2018-04-05 03:57:35 +02:00  
						
					 
				
					
						
							
							
								 
								Marcos
							
						 
						
							 
							
							
							
							
								
							
							
								60a224f7a1 
								
							 
						 
						
							
							
								
								Missing comma  
							
							 
							
							
							
						 
						
							2018-04-05 02:58:32 +02:00  
						
					 
				
					
						
							
							
								 
								Marcos
							
						 
						
							 
							
							
							
							
								
							
							
								e392e1fd8b 
								
							 
						 
						
							
							
								
								Completely overhaul of the Spanish translation,  added missing strings  
							
							 
							
							
							
						 
						
							2018-04-03 15:58:04 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Cheng
							
						 
						
							 
							
							
							
							
								
							
							
								64d5763d08 
								
							 
						 
						
							
							
								
								Add zh_TW Locales.  
							
							 
							
							... 
							
							
							
							Add zh_TW Locales. 
							
						 
						
							2018-04-02 16:09:23 +08:00  
						
					 
				
					
						
							
							
								 
								Jason Cheng
							
						 
						
							 
							
							
							
							
								
							
							
								007059273e 
								
							 
						 
						
							
							
								
								Add translate.  
							
							 
							
							... 
							
							
							
							Add translate. 
							
						 
						
							2018-04-02 15:54:06 +08:00  
						
					 
				
					
						
							
							
								 
								Jason Cheng
							
						 
						
							 
							
							
							
							
								
							
							
								106432ee4e 
								
							 
						 
						
							
							
								
								Added Language zh_TW  
							
							 
							
							... 
							
							
							
							Added Language zh_TW 
							
						 
						
							2018-04-02 15:03:07 +08:00