b5a2d3c1c4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into bookshelves  
							
							
							
						 
						
							2018-08-04 11:35:01 +01:00  
				
					
						
							
							
								 
						
							
								c83a51f7e2 
								
							 
						 
						
							
							
								
								Merge pull request  #904  from lommes/903-socialite-discord  
							
							... 
							
							
							
							add everything needed to use discord as social login provider 
							
						 
						
							2018-07-29 16:18:10 +01:00  
				
					
						
							
							
								 
						
							
								f421d83627 
								
							 
						 
						
							
							
								
								Added ability to set custom ldap group -> role mapping  
							
							... 
							
							
							
							Added input in role form to allow matching against custom names.
Changed default mapping to use role display name instead of the hidden
DB name. 
							
						 
						
							2018-07-15 19:34:42 +01:00  
				
					
						
							
							
								 
						
							
								be2ca9d4bb 
								
							 
						 
						
							
							
								
								Refactored out the LDAP repo  
							
							
							
						 
						
							2018-07-15 18:21:45 +01:00  
				
					
						
							
							
								 
						
							
								17bca662a7 
								
							 
						 
						
							
							
								
								Added tests to cover ldap group mapping  
							
							... 
							
							
							
							Also updated .env.example formatting.
Updated how LdapRepo uses Ldap so can be mocked by testing. 
							
						 
						
							2018-07-15 17:57:25 +01:00  
				
					
						
							
							
								 
						
							
								1776204870 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/brennanmurphy/BookStack into brennanmurphy-master  
							
							
							
						 
						
							2018-07-14 14:17:55 +01:00  
				
					
						
							
							
								 
						
							
								2bcc159fd6 
								
							 
						 
						
							
							
								
								Allowed creating pages in visible chapters in invisible books  
							
							... 
							
							
							
							Fixes permissions with test to cover in the event a page is created,
with permission, in a chapter but the user does not have permission to
see the parent book.
Fixes  #912  
							
						 
						
							2018-07-14 14:12:29 +01:00  
				
					
						
							
							
								 
						
							
								37aa8b05f8 
								
							 
						 
						
							
							
								
								Update files to PSR-2 standards  
							
							
							
						 
						
							2018-07-02 17:27:43 +00:00  
				
					
						
							
							
								 
						
							
								d640cc1eee 
								
							 
						 
						
							
							
								
								LDAP groups sync to Bookstack roles.  
							
							... 
							
							
							
							Closes  #75  
						
							2018-07-02 17:09:39 +00:00  
				
					
						
							
							
								 
						
							
								93795b6eda 
								
							 
						 
						
							
							
								
								add everything needed to use discord as social login provider  
							
							
							
						 
						
							2018-06-28 09:01:36 +02:00  
				
					
						
							
							
								 
						
							
								4948b443b6 
								
							 
						 
						
							
							
								
								Started work on bookshelves  
							
							
							
						 
						
							2018-06-24 13:38:19 +01:00  
				
					
						
							
							
								 
						
							
								6b84a76af1 
								
							 
						 
						
							
							
								
								Merge branch 'drawing_updates'  
							
							
							
						 
						
							2018-05-27 19:42:25 +01:00  
				
					
						
							
							
								 
						
							
								2bd6ba9895 
								
							 
						 
						
							
							
								
								Added maintenance view with image-cleanup  
							
							
							
						 
						
							2018-05-27 19:40:07 +01:00  
				
					
						
							
							
								 
						
							
								1df0bcaf85 
								
							 
						 
						
							
							
								
								Made image cleanup safer  
							
							... 
							
							
							
							Also fixed drawing update in markdown editor.
Added shortcut for MD editor to view drawing manager. 
							
						 
						
							2018-05-27 14:33:50 +01:00  
				
					
						
							
							
								 
						
							
								c31e6a03ce 
								
							 
						 
						
							
							
								
								Added command to clean-up old images, Unfinished  
							
							
							
						 
						
							2018-05-20 18:16:01 +01:00  
				
					
						
							
							
								 
						
							
								8c4c8cd95b 
								
							 
						 
						
							
							
								
								Updated secure-images option to not effect image name  
							
							... 
							
							
							
							Instead only the image path is altered.
Also fixed image manger mode not changing on button press. 
							
						 
						
							2018-05-20 16:47:53 +01:00  
				
					
						
							
							
								 
						
							
								0c9c1e4c6b 
								
							 
						 
						
							
							
								
								Reverted work on revisions  
							
							... 
							
							
							
							Improved linkage of drawings and image manager.
Updated image updates to create new versions. 
							
						 
						
							2018-05-20 16:41:14 +01:00  
				
					
						
							
							
								 
						
							
								6e7adcc095 
								
							 
						 
						
							
							
								
								Embedded SVG icons in css/js files  
							
							... 
							
							
							
							Allows removal of hacky /icon endpoint solution.
Fixes PDF exports with WKHTML and allows the icon to show in HTML
exports.
Fixes  #796  
							
						 
						
							2018-05-20 11:55:23 +01:00  
				
					
						
							
							
								 
						
							
								a1ecdcacba 
								
							 
						 
						
							
							
								
								Fixed attachment error handling, Allowed all link types  
							
							... 
							
							
							
							Related to #812  
							
						 
						
							2018-05-20 11:06:10 +01:00  
				
					
						
							
							
								 
						
							
								63f96c1c6f 
								
							 
						 
						
							
							
								
								Reorganised home and robots views  
							
							... 
							
							
							
							Extracted home view sidebar into own view.
Moved home and robot views into 'common' folder so that we only have
layouts in the top-level views folder. 
							
						 
						
							2018-05-20 10:11:56 +01:00  
				
					
						
							
							
								 
						
							
								8df9dab80a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/615  
							
							
							
						 
						
							2018-05-20 09:51:45 +01:00  
				
					
						
							
							
								 
						
							
								6cdb943916 
								
							 
						 
						
							
							
								
								Started work on revisions in image manager  
							
							
							
						 
						
							2018-05-19 18:44:40 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								86b2ddbd28 
								
							 
						 
						
							
							
								
								Implemented displaying of the books list on home page.  
							
							
							
						 
						
							2018-05-10 09:05:18 +05:30  
				
					
						
							
							
								 
						
							
								71b6f09128 
								
							 
						 
						
							
							
								
								Applied phpcs findings  
							
							
							
						 
						
							2018-04-22 12:25:32 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								a50153d221 
								
							 
						 
						
							
							
								
								Slimmed down testing DB sized and improved permission caching  
							
							
							
						 
						
							2018-04-14 22:17:47 +01:00  
				
					
						
							
							
								 
						
							
								cdb1c7ef88 
								
							 
						 
						
							
							
								
								Added destination permission checking to entity move  
							
							
							
						 
						
							2018-04-14 18:47:13 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0ade9b5b9b 
								
							 
						 
						
							
							
								
								Refactored moment.js out of app  
							
							... 
							
							
							
							Reduces bundle size by 25% 
							
						 
						
							2018-04-01 14:10:44 +01:00  
				
					
						
							
							
								 
						
							
								1a72208d27 
								
							 
						 
						
							
							
								
								Added configurable robots.txt file.  
							
							... 
							
							
							
							Deleted old static file.
Default output depends on app-public setting.
Otherwise can be overidden in `.env` file via `ALLOW_ROBOTS`
Otherwise view file can be customized.
Fixes  #779  
							
						 
						
							2018-03-31 12:41:40 +01:00  
				
					
						
							
							
								 
						
							
								58a6b2df7d 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:BookStackApp/BookStack  
							
							
							
						 
						
							2018-03-30 14:10:36 +01:00  
				
					
						
							
							
								 
						
							
								582158f70e 
								
							 
						 
						
							
							
								
								Added tags to chapters and books  
							
							... 
							
							
							
							Closes  #121  
						
							2018-03-30 14:09:51 +01:00  
				
					
						
							
							
								 
						
							
								2fc513984d 
								
							 
						 
						
							
							
								
								PSR2 fixes after running `./vendor/bin/phpcbf`  
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-03-28 01:07:01 +05:30  
				
					
						
							
							
								 
						
							
								23f90ed6b4 
								
							 
						 
						
							
							
								
								Ensured uploaded system images remain public  
							
							... 
							
							
							
							Also added tests to cover local_secure image storage.
Fixes  #725  
							
						 
						
							2018-03-25 12:41:52 +01:00  
				
					
						
							
							
								 
						
							
								1e015af3c9 
								
							 
						 
						
							
							
								
								Fixed incorrect search logic in last commit  
							
							... 
							
							
							
							Incorrect cross-entity pagination could lead to hidden entities. 
							
						 
						
							2018-03-24 19:05:56 +00:00  
				
					
						
							
							
								 
						
							
								f101c1a622 
								
							 
						 
						
							
							
								
								Made search more efficient and tweaked weighting  
							
							... 
							
							
							
							Added per-entity weighting changes.
Now Books score higher than chapters which score higher than pages.
Reduced queries required on search by only searching once but at a
higher count to see if there's another page. 
							
						 
						
							2018-03-24 18:46:31 +00:00  
				
					
						
							
							
								 
						
							
								3df7d828eb 
								
							 
						 
						
							
							
								
								Fixed failing tests  
							
							... 
							
							
							
							Fixed syntax error in french translations.
Removed 'required' on image validation which was breaking tests 
							
						 
						
							2018-03-24 15:25:13 +00:00  
				
					
						
							
							
								 
						
							
								5ad9c5d319 
								
							 
						 
						
							
							
								
								Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack  
							
							... 
							
							
							
							Also removed console.logs in dropzone.js 
							
						 
						
							2018-03-24 14:54:50 +00:00  
				
					
						
							
							
								 
						
							
								bf8dddd99c 
								
							 
						 
						
							
							
								
								Not resizing gif images.  
							
							... 
							
							
							
							See - https://github.com/Intervention/image/issues/176 
Fixes  #223 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-03-19 01:44:33 +05:30  
				
					
						
							
							
								 
						
							
								0335f58478 
								
							 
						 
						
							
							
								
								Merge branch 'master' into bug/image-upload  
							
							
							
						 
						
							2018-03-18 23:44:33 +05:30  
				
					
						
							
							
								 
						
							
								d2eec4fbce 
								
							 
						 
						
							
							
								
								Markdown editor image paste sets cursor correctly  
							
							... 
							
							
							
							Now sets cursor to alt text rather than end of placeholder image.
Fixed  #751  
							
						 
						
							2018-03-18 11:33:30 +00:00  
				
					
						
							
							
								 
						
							
								1ad6fe1cbd 
								
							 
						 
						
							
							
								
								Added togglable script escaping to page content  
							
							... 
							
							
							
							Configurable via 'ALLOW_CONTENT_SCRIPTS' env variable.
Fixes  #575  
							
						 
						
							2018-03-17 15:52:42 +00:00  
				
					
						
							
							
								 
						
							
								f42d355fd7 
								
							 
						 
						
							
							
								
								Fixes issue with the validation message not being translated.  
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-03-13 09:10:23 +05:30  
				
					
						
							
							
								 
						
							
								81fa021083 
								
							 
						 
						
							
							
								
								Finished migrated from icon-font to SVG  
							
							
							
						 
						
							2018-02-17 19:49:00 +00:00  
				
					
						
							
							
								 
						
							
								5ab39bfd5a 
								
							 
						 
						
							
							
								
								Started migration to SVG icons  
							
							
							
						 
						
							2018-02-17 13:30:52 +00:00  
				
					
						
							
							
								 
						
							
								dc1a16be4c 
								
							 
						 
						
							
							
								
								Made it possible to override icons via custom theme  
							
							
							
						 
						
							2018-02-17 12:36:24 +00:00  
				
					
						
							
							
								 
						
							
								548dcd4db1 
								
							 
						 
						
							
							
								
								Fixed error when accessing non-authed attachment  
							
							... 
							
							
							
							Also updated attachment tests to use standard test-case.
Fixes  #681  
							
						 
						
							2018-02-11 12:37:02 +00:00