soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							61a3740c06 
							
						 
					 
					
						
						
							
							Fix conflicts  
						
						... 
						
						
						
						Signed-off-by: soupette <cyril.lpz@gmail.com> 
						
						
					 
					
						2020-11-23 14:43:07 +01:00 
						 
				 
			
				
					
						
							
							
								Jean-Sébastien Herbaux 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a33829f11 
							
						 
					 
					
						
						
							
							Sanitize /upload/search/:q route ( #8658 )  
						
						... 
						
						
						
						Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu> 
						
						
					 
					
						2020-11-16 12:55:35 +01:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							0e61698ef5 
							
						 
					 
					
						
						
							
							Fix upload w/ permissions bugs  
						
						... 
						
						
						
						Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu> 
						
						
					 
					
						2020-07-08 11:48:43 +02:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							5f01d9ebe1 
							
						 
					 
					
						
						
							
							Add permissions on upload controller  
						
						... 
						
						
						
						Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu> 
						
						
					 
					
						2020-07-08 11:48:42 +02:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							56d583e49e 
							
						 
					 
					
						
						
							
							Add basis for upload controllers permissions  
						
						... 
						
						
						
						Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu> 
						
						
					 
					
						2020-07-08 11:48:41 +02:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							b5fb5f8509 
							
						 
					 
					
						
						
							
							Add permissions to the content-manager routes  
						
						... 
						
						
						
						Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu> 
						
						
					 
					
						2020-07-08 11:48:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							4edad86029 
							
						 
					 
					
						
						
							
							Add basic created_by updated_by  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-07-08 11:48:16 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							ceb113a865 
							
						 
					 
					
						
						
							
							Add count search on files  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-25 19:17:46 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							cfdbf5423a 
							
						 
					 
					
						
						
							
							Add file search and create simple sqlite search  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-25 17:34:39 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a17770293d 
							
						 
					 
					
						
						
							
							Allow file info edit whitout re upload  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-24 12:21:51 +01:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							f99f83af02 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:strapi/strapi into features/media-lib  
						
						
						
						
					 
					
						2020-03-13 11:04:45 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							2b5c332e09 
							
						 
					 
					
						
						
							
							Clean up  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-09 22:11:56 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							2d12f88394 
							
						 
					 
					
						
						
							
							Optimize file  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-09 09:05:43 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8d025b89f3 
							
						 
					 
					
						
						
							
							Init optimization func and clean up code  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-09 09:05:42 +01:00 
						 
				 
			
				
					
						
							
							
								Pierre Noël 
							
						 
					 
					
						
						
						
						
							
						
						
							b5ec9cb1c8 
							
						 
					 
					
						
						
							
							handle unexpected params from koa-router  
						
						... 
						
						
						
						Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
Signed-off-by: Pierre Noël <pierre.noel@strapi.io> 
						
						
					 
					
						2020-03-06 19:16:51 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							c722b0db00 
							
						 
					 
					
						
						
							
							Implement file replace  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-05 13:51:15 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd34b725a 
							
						 
					 
					
						
						
							
							wip  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-05 10:29:08 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							b084cb1c65 
							
						 
					 
					
						
						
							
							Return type list and mimeTypes for filters  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-05 10:29:08 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							196160dc1c 
							
						 
					 
					
						
						
							
							Add allowedType in ctb and init getMediaTypes api  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-05 10:29:07 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b319d81e 
							
						 
					 
					
						
						
							
							Update file creation process with fileInfo  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-03 16:33:48 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							fd3511b511 
							
						 
					 
					
						
						
							
							Use strapi.plugins.upload.config for provider config  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-02 16:46:44 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							7a8c865051 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into features/media-lib  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-03-02 15:18:08 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							68fbf77b30 
							
						 
					 
					
						
						
							
							Add new media lib settings. Remove db provider config  
						
						... 
						
						
						
						Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com> 
						
						
					 
					
						2020-02-27 20:26:05 +01:00 
						 
				 
			
				
					
						
							
							
								HichamELBSI 
							
						 
					 
					
						
						
						
						
							
						
						
							e8b9017219 
							
						 
					 
					
						
						
							
							Merge branch 'features/single-types' into single-types/uid-ctm  
						
						
						
						
					 
					
						2020-02-26 14:56:27 +01:00 
						 
				 
			
				
					
						
							
							
								Edaly Ahmed 
							
						 
					 
					
						
						
						
						
							
						
						
							129edd66ee 
							
						 
					 
					
						
						
							
							Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr>  
						
						... 
						
						
						
						adding getConfig service and casting params before updating database 
						
						
					 
					
						2020-02-24 17:51:39 +01:00 
						 
				 
			
				
					
						
							
							
								Edaly Ahmed 
							
						 
					 
					
						
						
						
						
							
						
						
							67f4712fa7 
							
						 
					 
					
						
						
							
							Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr>  
						
						... 
						
						
						
						signing off 
						
						
					 
					
						2020-02-13 12:38:55 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							81b35ee412 
							
						 
					 
					
						
						
							
							Leave file url as realtive  
						
						
						
						
					 
					
						2019-12-24 17:49:17 +01:00 
						 
				 
			
				
					
						
							
							
								Samuel Durkin 
							
						 
					 
					
						
						
						
						
							
						
						
							ffdde168c5 
							
						 
					 
					
						
						
							
							only add backend host as prefix if local server upload when getting singular upload  
						
						
						
						
					 
					
						2019-10-04 19:06:01 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a22f2cefef 
							
						 
					 
					
						
						
							
							Remove x-forwarded-host.  
						
						... 
						
						
						
						- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds 
						
						
					 
					
						2019-09-06 14:33:24 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							bb036333a2 
							
						 
					 
					
						
						
							
							Init upload plugin e2e tests  
						
						
						
						
					 
					
						2019-08-06 10:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							184490a07d 
							
						 
					 
					
						
						
							
							Upgrade koa-body version to latest  
						
						
						
						
					 
					
						2019-08-01 07:50:06 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							59c7ef9651 
							
						 
					 
					
						
						
							
							Finish upload plugin refactoring and add custom queries  
						
						
						
						
					 
					
						2019-07-16 17:23:26 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a41641bfe4 
							
						 
					 
					
						
						
							
							Add a queries interface to the plugins  
						
						
						
						
					 
					
						2019-04-26 13:40:23 +02:00 
						 
				 
			
				
					
						
							
							
								Jim LAURIE 
							
						 
					 
					
						
						
						
						
							
						
						
							0071d28f22 
							
						 
					 
					
						
						
							
							Move error message to translation  
						
						
						
						
					 
					
						2019-03-08 14:56:09 +01:00 
						 
				 
			
				
					
						
							
							
								Jim LAURIE 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							28506035cf 
							
						 
					 
					
						
						
							
							Remove logs  
						
						
						
						
					 
					
						2019-03-02 14:02:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sinelle Richard 
							
						 
					 
					
						
						
						
						
							
						
						
							d87616e716 
							
						 
					 
					
						
						
							
							2827: Return bad request in case of empty files attribut  
						
						
						
						
					 
					
						2019-02-19 10:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Yilin Gan 
							
						 
					 
					
						
						
						
						
							
						
						
							2ede104be5 
							
						 
					 
					
						
						
							
							update s3 delete & upload controller  
						
						
						
						
					 
					
						2018-08-23 11:43:05 -07:00 
						 
				 
			
				
					
						
							
							
								Yilin Gan 
							
						 
					 
					
						
						
						
						
							
						
						
							1cf971950a 
							
						 
					 
					
						
						
							
							add file path for aws upload  
						
						
						
						
					 
					
						2018-07-13 11:30:38 -07:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							e439333b42 
							
						 
					 
					
						
						
							
							Add eslint to plugin-upload backend  
						
						
						
						
					 
					
						2018-04-30 18:00:01 +02:00 
						 
				 
			
				
					
						
							
							
								Luca Perret 
							
						 
					 
					
						
						
						
						
							
						
						
							19f0494650 
							
						 
					 
					
						
						
							
							feat(plugin-upload): adding findOne endpoint  
						
						
						
						
					 
					
						2018-04-09 19:31:49 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
						
						
							
						
						
							e848b3a091 
							
						 
					 
					
						
						
							
							Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload  
						
						
						
						
					 
					
						2018-03-07 18:01:21 +01:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
						
						
							
						
						
							bb65ff70da 
							
						 
					 
					
						
						
							
							Fix upload update  
						
						... 
						
						
						
						Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com> 
						
						
					 
					
						2018-03-07 17:48:40 +01:00 
						 
				 
			
				
					
						
							
							
								Jim Laurie 
							
						 
					 
					
						
						
						
						
							
						
						
							8b6a52dbff 
							
						 
					 
					
						
						
							
							Replace index action name  
						
						
						
						
					 
					
						2018-03-07 16:25:56 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelsicoko 
							
						 
					 
					
						
						
						
						
							
						
						
							b89a8a5abc 
							
						 
					 
					
						
						
							
							Display better logs  
						
						
						
						
					 
					
						2018-03-06 16:51:00 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelsicoko 
							
						 
					 
					
						
						
						
						
							
						
						
							cc1ec5c1ea 
							
						 
					 
					
						
						
							
							Make CSS improvements on upload plugin  
						
						
						
						
					 
					
						2018-03-06 15:49:11 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelsicoko 
							
						 
					 
					
						
						
						
						
							
						
						
							d7aa3eef7e 
							
						 
					 
					
						
						
							
							Resolve conflicts  
						
						
						
						
					 
					
						2018-03-02 14:21:51 +01:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
						
						
							
						
						
							da7382292c 
							
						 
					 
					
						
						
							
							Add redux to admin page so we can get the app environments required for the upload config settings  
						
						
						
						
					 
					
						2018-02-27 17:45:12 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelsicoko 
							
						 
					 
					
						
						
						
						
							
						
						
							dac8931676 
							
						 
					 
					
						
						
							
							Handle association on upload route  
						
						
						
						
					 
					
						2018-02-27 16:53:06 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelsicoko 
							
						 
					 
					
						
						
						
						
							
						
						
							ab108a6f93 
							
						 
					 
					
						
						
							
							Create & handle association between File upload and others models  
						
						
						
						
					 
					
						2018-02-27 11:52:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jim Laurie 
							
						 
					 
					
						
						
						
						
							
						
						
							543f21cdb1 
							
						 
					 
					
						
						
							
							Fix PR feedback  
						
						
						
						
					 
					
						2018-02-23 14:57:58 +01:00