Merge branch '2.0.x' into 2.1.x # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

Author: AntoineRelief

apps/front-office/src/app/graphql.module.ts

@@ -11,6 +11,8 @@ import { setContext } from '@apollo/client/link/context';
 import { WebSocketLink } from '@apollo/client/link/ws';
 import { getMainDefinition } from '@apollo/client/utilities';
 import { environment } from '../environments/environment';
+import extractFiles from 'extract-files/extractFiles.mjs';
+import isExtractableFile from 'extract-files/isExtractableFile.mjs';
 
 /**
  * Configuration of the Apollo client.
@@ -28,6 +30,7 @@ export const createApollo = (httpLink: HttpLink): ApolloClientOptions<any> => {
 
   const http = httpLink.create({
     uri: `${environment.apiUrl}/graphql`,
+    extractFiles: (body) => extractFiles(body, isExtractableFile),
   });
 
   const ws = new WebSocketLink({

libs/safe/src/lib/const/tinymce.const.ts

@@ -144,6 +144,7 @@ export const EMAIL_EDITOR_CONFIG: RawEditorSettings = {
     'shortcuts', // the default shortcuts tab
     'keyboardnav', // the default keyboard navigation tab
   ],
+  convert_urls: false,
 };
 
 /** Field Editor tinymce configuration. */