James Geiger
							
						 
						
							 
							
							
							
							
								
							
							
								a0bfdf0e5c 
								
							 
						 
						
							
							
								
								Code cleanup, bug squashing  
							
							 
							
							
							
						 
						
							2021-02-09 01:27:27 -06:00  
						
					 
				
					
						
							
							
								 
								James Geiger
							
						 
						
							 
							
							
							
							
								
							
							
								7ef17bb394 
								
							 
						 
						
							
							
								
								PageContent return null issue  
							
							 
							
							
							
						 
						
							2021-02-09 00:21:07 -06:00  
						
					 
				
					
						
							
							
								 
								James Geiger
							
						 
						
							 
							
							
							
							
								
							
							
								48587d2c38 
								
							 
						 
						
							
							
								
								Code cleanup, refactor  
							
							 
							
							... 
							
							
							
							Updated to use Str::length for entity descriptions.
Moved function to get first image in page to PageContent class. 
							
						 
						
							2021-02-09 00:16:24 -06:00  
						
					 
				
					
						
							
							
								 
								James Geiger
							
						 
						
							 
							
							
							
							
								
							
							
								e458411f91 
								
							 
						 
						
							
							
								
								Create Open Graph meta tags for book/page/chapter/shelf  
							
							 
							
							
							
						 
						
							2020-12-21 23:20:13 -06:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0b01a77c16 
								
							 
						 
						
							
							
								
								Swapped out HTML diff implementation for own, removes tidy depdendancy  
							
							 
							
							
							
						 
						
							2020-11-29 19:08:13 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								bf8716bb22 
								
							 
						 
						
							
							
								
								Fixed bad collection/array mixing causing error on seed  
							
							 
							
							
							
						 
						
							2020-11-28 16:42:12 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8aedba14a3 
								
							 
						 
						
							
							
								
								Added page export API controller  
							
							 
							
							
							
						 
						
							2020-11-28 15:39:40 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								53bcfe528d 
								
							 
						 
						
							
							
								
								Added pages API doc examples  
							
							 
							
							... 
							
							
							
							Made some tweaks to related content and other examples while there. 
							
						 
						
							2020-11-28 15:21:54 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1c8102bb89 
								
							 
						 
						
							
							
								
								Started pages API  
							
							 
							
							
							
						 
						
							2020-11-22 14:56:19 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ebeca256f0 
								
							 
						 
						
							
							
								
								Updated old exportService name in controllers  
							
							 
							
							
							
						 
						
							2020-11-22 01:26:14 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a042e22481 
								
							 
						 
						
							
							
								
								Focused base Entity class cleanup  
							
							 
							
							... 
							
							
							
							Removed some common functions from other entities.
Aligned implementation of getUrl()
Cleaned phpdocs and added typehinting.
Also extracted sibling search logic out of controller. 
							
						 
						
							2020-11-22 01:20:38 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ef1b98019a 
								
							 
						 
						
							
							
								
								Fixed some mis-refactoring and split search service  
							
							 
							
							... 
							
							
							
							Search service broken into index and runner tools. 
							
						 
						
							2020-11-22 00:17:45 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c7a2d568bf 
								
							 
						 
						
							
							
								
								Moved models to folder, renamed managers to tools  
							
							 
							
							... 
							
							
							
							Tools seems to fit better since the classes were a bit of a mixed bunch
and did not always manage.
Also simplified the structure of the SlugGenerator class.
Also focused EntityContext on shelves and simplified to use session
helper. 
							
						 
						
							2020-11-21 23:20:54 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								66917520cb 
								
							 
						 
						
							
							
								
								Service provider and other cleanup  
							
							 
							
							... 
							
							
							
							- Removed old 'exposeTranslations' system to instead use new component
 option system.
- Extracted validation rules into their own service provider.
- Cleaned up some formatting/comments in the repos. 
							
						 
						
							2020-11-21 17:52:49 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								5e01c30882 
								
							 
						 
						
							
							
								
								Aligned constructors across controller classes  
							
							 
							
							... 
							
							
							
							Since they no longer needed to run the parent contructor
since the parent constructor was no longer needed. 
							
						 
						
							2020-11-21 17:08:37 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f76a2a69f7 
								
							 
						 
						
							
							
								
								Cleaned up api docs implementation, added missing titles  
							
							 
							
							
							
						 
						
							2020-11-21 17:03:24 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c0680d5717 
								
							 
						 
						
							
							
								
								Added latest activity into users list view  
							
							 
							
							
							
						 
						
							2020-11-20 20:10:18 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								bd6a1a66d1 
								
							 
						 
						
							
							
								
								Implemented remainder of activity types  
							
							 
							
							... 
							
							
							
							Also fixed audit log to work for non-entity items. 
							
						 
						
							2020-11-20 19:33:11 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								da37700ac2 
								
							 
						 
						
							
							
								
								Implemented user, api_tokem & role activity logging  
							
							 
							
							... 
							
							
							
							Also refactored some role content, primarily updating the permission
controller to be RoleController since it only dealt with roles. 
							
						 
						
							2020-11-20 18:53:01 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								3f7180fa99 
								
							 
						 
						
							
							
								
								Started widening of activity logging  
							
							 
							
							... 
							
							
							
							In progress, Need to implement much of the logging in controllers.
Also cleaned up base controller along the way. 
							
						 
						
							2020-11-18 23:40:39 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								712ccd23c4 
								
							 
						 
						
							
							
								
								Updated activities table format  
							
							 
							
							... 
							
							
							
							Renamed some columns to be more generic and applicable.
Removed now redundant book_id column.
Allowed nullable entity morph columns for non-entity activity.
Ran tests and made required changes. 
							
						 
						
							2020-11-08 00:03:19 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ee7e1122d3 
								
							 
						 
						
							
							
								
								Removed use of book_id in activity  
							
							 
							
							
							
						 
						
							2020-11-07 23:15:13 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c157dc3490 
								
							 
						 
						
							
							
								
								Organised activity types and moved most to repos  
							
							 
							
							... 
							
							
							
							Repos are generally better since otherwise we end up duplicating
things between front-end and API.
Types moved to by CONST values within a class for better visibilty
of usage and listing of types. 
							
						 
						
							2020-11-07 22:37:27 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								4824ef2760 
								
							 
						 
						
							
							
								
								Merge pull request  #2283  from BookStackApp/recycle_bin  
							
							 
							
							... 
							
							
							
							Recycle Bin Implementation 
							
						 
						
							2020-11-07 15:10:17 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b4da081552 
								
							 
						 
						
							
							
								
								Checked over recycle bin parent/child flows  
							
							 
							
							
							
						 
						
							2020-11-07 15:05:13 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								df10b508d8 
								
							 
						 
						
							
							
								
								Enhanced how activities are shown on items in recycle bin  
							
							 
							
							
							
						 
						
							2020-11-07 14:28:50 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ec3aeb3315 
								
							 
						 
						
							
							
								
								Added recycle bin auto-clear lifetime functionality  
							
							 
							
							
							
						 
						
							2020-11-07 13:58:23 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								483cb41665 
								
							 
						 
						
							
							
								
								Started testing work for recycle bin implementation  
							
							 
							
							
							
						 
						
							2020-11-06 12:54:39 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								3e70c661a1 
								
							 
						 
						
							
							
								
								Cleaned up duplicate code in recycle-bin restore  
							
							 
							
							
							
						 
						
							2020-11-02 22:54:00 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9e033709a7 
								
							 
						 
						
							
							
								
								Added per-item recycle-bin delete and restore  
							
							 
							
							
							
						 
						
							2020-11-02 22:47:48 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								82e671a06d 
								
							 
						 
						
							
							
								
								Re-aligned init files with Laravel default  
							
							 
							
							... 
							
							
							
							Removed the custom init elements that we added in 2017 to
custom load the helpers file and instead load via composer.
Also removed laravel-microscope package due to not running due to
helpers file. 
							
						 
						
							2020-10-31 23:05:48 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								474770af51 
								
							 
						 
						
							
							
								
								Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1-fixes  
							
							 
							
							
							
						 
						
							2020-10-31 22:11:27 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6d8b0605a0 
								
							 
						 
						
							
							
								
								Merge branch 'xss_and_redir_patch' of git://github.com/PercussiveElbow/BookStack into xss_and_redirect  
							
							 
							
							
							
						 
						
							2020-10-31 15:19:33 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								349162ea13 
								
							 
						 
						
							
							
								
								Prevented possible XSS via link attachments  
							
							 
							
							... 
							
							
							
							This filters out potentially malicious javascript: or data: uri's coming
through to be attached to attachments.
Added tests to cover.
Thanks to Yassine ABOUKIR (@yassineaboukir on twitter) for reporting this
vulnerability. 
							
						 
						
							2020-10-31 15:01:52 +00:00  
						
					 
				
					
						
							
							
								 
								PercussiveElbow
							
						 
						
							 
							
							
							
							
								
							
							
								bbd1384acb 
								
							 
						 
						
							
							
								
								XSS and redirect fixes with test cases  
							
							 
							
							
							
						 
						
							2020-10-27 01:34:51 +00:00  
						
					 
				
					
						
							
							
								 
								imanghafoori
							
						 
						
							 
							
							
							
							
								
							
							
								704b808e9e 
								
							 
						 
						
							
							
								
								fixes from laravel-microscope  
							
							 
							
							
							
						 
						
							2020-10-16 18:40:10 +03:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ff7cbd14fc 
								
							 
						 
						
							
							
								
								Added recycle bin empty notification response with count  
							
							 
							
							
							
						 
						
							2020-10-03 18:53:09 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								04197e393a 
								
							 
						 
						
							
							
								
								Started work on the recycle bin interface  
							
							 
							
							
							
						 
						
							2020-10-03 18:44:12 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								465d405926 
								
							 
						 
						
							
							
								
								Updated page content related links on content id changes  
							
							 
							
							... 
							
							
							
							For #2278  
							
						 
						
							2020-09-28 22:26:50 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								691027a522 
								
							 
						 
						
							
							
								
								Started implementation of recycle bin functionality  
							
							 
							
							
							
						 
						
							2020-09-27 23:24:33 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								68489e5b44 
								
							 
						 
						
							
							
								
								Updated PR code to use isA and updated that function definition  
							
							 
							
							... 
							
							
							
							Related to #2227  
							
						 
						
							2020-09-26 17:00:17 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fe0e307313 
								
							 
						 
						
							
							
								
								Merge branch 'renderpages' of git://github.com/mr-vinn/BookStack into mr-vinn-renderpages  
							
							 
							
							
							
						 
						
							2020-09-26 16:55:05 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								53ec794e53 
								
							 
						 
						
							
							
								
								Fixed issue where SAML login not notifiy on existing user  
							
							 
							
							... 
							
							
							
							Added testing to cover
Fixes  #2263  
							
						 
						
							2020-09-26 16:43:06 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1f202f6dbc 
								
							 
						 
						
							
							
								
								Updated locale lists for Bulgarian  
							
							 
							
							
							
						 
						
							2020-09-19 15:36:17 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								31eec34b5d 
								
							 
						 
						
							
							
								
								Moved decode and updated page plaintext decode test  
							
							 
							
							
							
						 
						
							2020-09-19 15:13:18 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								44f3508171 
								
							 
						 
						
							
							
								
								Merge branch 'preview-entities' of git://github.com/mr-vinn/BookStack into mr-vinn-preview-entities  
							
							 
							
							
							
						 
						
							2020-09-19 14:58:56 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								78bf044a7a 
								
							 
						 
						
							
							
								
								Added audit log interface  
							
							 
							
							... 
							
							
							
							- Displays the currently tracked activities in the system.
Related to #2173  and #1167  
							
						 
						
							2020-09-19 12:06:45 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e5f0b4dd85 
								
							 
						 
						
							
							
								
								Split out Maintenance to separate controller  
							
							 
							
							
							
						 
						
							2020-09-19 09:24:58 +01:00  
						
					 
				
					
						
							
							
								 
								Vinnie Okada
							
						 
						
							 
							
							
							
							
								
							
							
								311a12b7ef 
								
							 
						 
						
							
							
								
								Decode HTML entities  
							
							 
							
							... 
							
							
							
							Decode HTML entities in page text before saving it to the database. 
							
						 
						
							2020-09-18 06:54:30 -06:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ad48cd3e48 
								
							 
						 
						
							
							
								
								Continued implementation of attachment drag+drop  
							
							 
							
							... 
							
							
							
							Cannot get working in chrome reliably due to conflicting handling of
events and drag+drop API. Getting attachment drop working breaks other
parts of TinyMCE.
Implementing current work as should still work for MD editor and within
FireFox.
Related to #1460  
							
						 
						
							2020-09-13 18:31:14 +01:00