c0680d5717 
								
							 
						 
						
							
							
								
								Added latest activity into users list view  
							
							
							
						 
						
							2020-11-20 20:10:18 +00:00  
				
					
						
							
							
								 
						
							
								bd6a1a66d1 
								
							 
						 
						
							
							
								
								Implemented remainder of activity types  
							
							... 
							
							
							
							Also fixed audit log to work for non-entity items. 
							
						 
						
							2020-11-20 19:33:11 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								20f9a50cee 
								
							 
						 
						
							
							
								
								LDAP: Added TLS support  
							
							
							
						 
						
							2020-11-18 01:05:29 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ee7e1122d3 
								
							 
						 
						
							
							
								
								Removed use of book_id in activity  
							
							
							
						 
						
							2020-11-07 23:15:13 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4824ef2760 
								
							 
						 
						
							
							
								
								Merge pull request  #2283  from BookStackApp/recycle_bin  
							
							... 
							
							
							
							Recycle Bin Implementation 
							
						 
						
							2020-11-07 15:10:17 +00:00  
				
					
						
							
							
								 
						
							
								b4da081552 
								
							 
						 
						
							
							
								
								Checked over recycle bin parent/child flows  
							
							
							
						 
						
							2020-11-07 15:05:13 +00:00  
				
					
						
							
							
								 
						
							
								df10b508d8 
								
							 
						 
						
							
							
								
								Enhanced how activities are shown on items in recycle bin  
							
							
							
						 
						
							2020-11-07 14:28:50 +00:00  
				
					
						
							
							
								 
						
							
								ec3aeb3315 
								
							 
						 
						
							
							
								
								Added recycle bin auto-clear lifetime functionality  
							
							
							
						 
						
							2020-11-07 13:58:23 +00:00  
				
					
						
							
							
								 
						
							
								68b1d87ebe 
								
							 
						 
						
							
							
								
								Added test coverage of recycle bin actions  
							
							
							
						 
						
							2020-11-07 13:19:23 +00:00  
				
					
						
							
							
								 
						
							
								483cb41665 
								
							 
						 
						
							
							
								
								Started testing work for recycle bin implementation  
							
							
							
						 
						
							2020-11-06 12:54:39 +00:00  
				
					
						
							
							
								 
						
							
								34dc4a1b6d 
								
							 
						 
						
							
							
								
								Automatic Restored Revision Changelog Summary Text  
							
							
							
						 
						
							2020-11-03 20:46:47 -05:00  
				
					
						
							
							
								 
						
							
								3e70c661a1 
								
							 
						 
						
							
							
								
								Cleaned up duplicate code in recycle-bin restore  
							
							
							
						 
						
							2020-11-02 22:54:00 +00:00  
				
					
						
							
							
								 
						
							
								9e033709a7 
								
							 
						 
						
							
							
								
								Added per-item recycle-bin delete and restore  
							
							
							
						 
						
							2020-11-02 22:47:48 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								474770af51 
								
							 
						 
						
							
							
								
								Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1-fixes  
							
							
							
						 
						
							2020-10-31 22:11:27 +00:00  
				
					
						
							
							
								 
						
							
								78be644332 
								
							 
						 
						
							
							
								
								Merge pull request  #2298  from timoschwarzer/composer-install-in-entrypoint  
							
							... 
							
							
							
							Install composer dependencies in Docker entrypoint 
							
						 
						
							2020-10-31 21:56:48 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								bbd1384acb 
								
							 
						 
						
							
							
								
								XSS and redirect fixes with test cases  
							
							
							
						 
						
							2020-10-27 01:34:51 +00:00  
				
					
						
							
							
								 
						
							
								36daa09441 
								
							 
						 
						
							
							
								
								Update Localization.php in Middleware with "no" tag for estimate.  
							
							
							
						 
						
							2020-10-19 12:43:41 +02:00  
				
					
						
							
							
								 
						
							
								4c5566755f 
								
							 
						 
						
							
							
								
								updated config to also include Norwegian  
							
							
							
						 
						
							2020-10-19 12:35:05 +02:00  
				
					
						
							
							
								 
						
							
								461977cf9a 
								
							 
						 
						
							
							
								
								added missing comma that caused the testprocess to fail.  
							
							
							
						 
						
							2020-10-19 12:26:18 +02:00  
				
					
						
							
							
								 
						
							
								837cccd4d4 
								
							 
						 
						
							
							
								
								Added translation for Norwegian (Bokmål)  
							
							... 
							
							
							
							This will add translations for Norwegian to BookStack. It is identified by the langID no_NB 
							
						 
						
							2020-10-19 11:43:43 +02:00  
				
					
						
							
							
								 
						
							
								7a5442e81b 
								
							 
						 
						
							
							
								
								Adds laravel-microscope package  
							
							
							
						 
						
							2020-10-16 18:40:44 +03:30  
				
					
						
							
							
								 
						
							
								704b808e9e 
								
							 
						 
						
							
							
								
								fixes from laravel-microscope  
							
							
							
						 
						
							2020-10-16 18:40:10 +03:30  
				
					
						
							
							
								 
						
							
								6aa2bf9e27 
								
							 
						 
						
							
							
								
								Merge pull request  #2296  from timoschwarzer/esbuild-watch-first-time-fix  
							
							... 
							
							
							
							Fix build:js:watch not building at first launch in Docker 
							
						 
						
							2020-10-13 23:17:23 +01:00  
				
					
						
							
							
								 
						
							
								18bcafaee4 
								
							 
						 
						
							
							
								
								Updated translator attribution before release v0.30.3  
							
							
							
						 
						
							2020-10-13 22:49:55 +01:00  
				
					
						
							
							
								 
						
							
								8d07b7cf1c 
								
							 
						 
						
							
							
								
								Added alias for vbscript  
							
							
							
						 
						
							2020-10-13 22:44:33 +01:00  
				
					
						
							
							
								 
						
							
								080f9c3025 
								
							 
						 
						
							
							
								
								Merge pull request  #2302  from nutsflag/master  
							
							... 
							
							
							
							Add VBScript Codemirror 
							
						 
						
							2020-10-13 22:41:09 +01:00  
				
					
						
							
							
								 
						
							
								617fe6bc8c 
								
							 
						 
						
							
							
								
								Merge pull request  #2303  from BookStackApp/l10n_master  
							
							... 
							
							
							
							New Crowdin updates 
							
						 
						
							2020-10-13 22:39:52 +01:00  
				
					
						
							
							
								 
						
							
								bb1f1a9ecd 
								
							 
						 
						
							
							
								
								Fixed error on drawing edit on markdown editor  
							
							... 
							
							
							
							Was preventing save of drawings.
For #2313  
							
						 
						
							2020-10-13 22:36:07 +01:00  
				
					
						
							
							
								 
						
							
								a192b600fc 
								
							 
						 
						
							
							
								
								Missed a variable when updating LdapService.  
							
							
							
						 
						
							2020-10-12 12:47:36 -04:00  
				
					
						
							
							
								 
						
							
								b714652e10 
								
							 
						 
						
							
							
								
								Import thumbnail photos when LDAP users are created.  
							
							
							
						 
						
							2020-10-12 12:33:55 -04:00  
				
					
						
							
							
								 
						
							
								d688e43197 
								
							 
						 
						
							
							
								
								New translations settings.php (Chinese Simplified)  
							
							
							
						 
						
							2020-10-05 06:26:38 +01:00  
				
					
						
							
							
								 
						
							
								ff7cbd14fc 
								
							 
						 
						
							
							
								
								Added recycle bin empty notification response with count  
							
							
							
						 
						
							2020-10-03 18:53:09 +01:00  
				
					
						
							
							
								 
						
							
								04197e393a 
								
							 
						 
						
							
							
								
								Started work on the recycle bin interface  
							
							
							
						 
						
							2020-10-03 18:44:12 +01:00  
				
					
						
							
							
								 
						
							
								c82c3023c5 
								
							 
						 
						
							
							
								
								New translations settings.php (Spanish)  
							
							
							
						 
						
							2020-10-02 17:18:27 +01:00  
				
					
						
							
							
								 
						
							
								d0d75afc66 
								
							 
						 
						
							
							
								
								New translations settings.php (Chinese Simplified)  
							
							
							
						 
						
							2020-10-02 15:55:46 +01:00  
				
					
						
							
							
								 
						
							
								467176ee78 
								
							 
						 
						
							
							
								
								Update code.js  
							
							
							
						 
						
							2020-10-02 15:14:29 +02:00  
				
					
						
							
							
								 
						
							
								521a002001 
								
							 
						 
						
							
							
								
								Update code-editor.blade.php  
							
							
							
						 
						
							2020-10-02 15:13:31 +02:00  
				
					
						
							
							
								 
						
							
								a74d551bd6 
								
							 
						 
						
							
							
								
								Install composer dependencies in Docker entrypoint  
							
							
							
						 
						
							2020-10-01 11:34:56 +02:00  
				
					
						
							
							
								 
						
							
								aca37b8784 
								
							 
						 
						
							
							
								
								Fix build:js:watch not building at first launch in Docker  
							
							
							
						 
						
							2020-10-01 11:25:22 +02:00  
				
					
						
							
							
								 
						
							
								f3ee8f2d4c 
								
							 
						 
						
							
							
								
								Updated http service to not read 204 response data  
							
							
							
						 
						
							2020-09-30 22:32:03 +01:00  
				
					
						
							
							
								 
						
							
								ea406690f5 
								
							 
						 
						
							
							
								
								Updated esbuild options and version & updated npm deps  
							
							... 
							
							
							
							Had to change way sortable is imported due to changes, Still
seemed to have functioning multi-select. 
							
						 
						
							2020-09-30 22:28:53 +01:00  
				
					
						
							
							
								 
						
							
								465d405926 
								
							 
						 
						
							
							
								
								Updated page content related links on content id changes  
							
							... 
							
							
							
							For #2278  
							
						 
						
							2020-09-28 22:26:50 +01:00  
				
					
						
							
							
								 
						
							
								1097c61d6d 
								
							 
						 
						
							
							
								
								Fixed duplicate requests in attachment manager issue  
							
							... 
							
							
							
							Closes  #2286  
						
							2020-09-28 21:55:24 +01:00