Merge branch '1.9' into 2.x

# Conflicts:
#	doc/10_GraphQL/10_Events.md

Author: fashxp

doc/10_GraphQL/04_Query/15_Add_Custom_Query_Datatype.md

@@ -15,7 +15,7 @@ To add a type definition, add a section similar to this one to your `services.ym
 ```
 
 For reference, have a look at a look at the 
-[`Link datatype`](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/DataObjectQueryFieldConfigGenerator/Link.php).
+[`Link datatype`](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/DataObjectQueryFieldConfigGenerator/Link.php).
 It also shows how specific attributes are resolved. 
 
 If you don't provide a resolver function then the getter method is called instead. 

doc/10_GraphQL/04_Query/16_Add_Custom_Query_Operator.md

@@ -16,14 +16,14 @@ Add a section similar to this one to your `services.yml` file.
 ```
 
 For reference, have a look at a look at the 
-[`Trimmer operator`](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/Query/Operator/Trimmer.php).
+[`Trimmer operator`](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/Query/Operator/Trimmer.php).
 
 ### Operator Implementation
 
 You have to provide both JavaScript code dealing with the UI configuration aspects specific to  your operator
 and the server-side PHP implementation doing the actual calculations. 
 
-A JS sample can be found [here](https://github.com/pimcore/data-hub/blob/master/src/Resources/public/js/queryoperator/Trimmer.js). 
+A JS sample can be found [here](https://github.com/pimcore/data-hub/blob/2.x/src/Resources/public/js/queryoperator/Trimmer.js). 
 
 :::info
 
@@ -35,7 +35,7 @@ Make sure, that your extension gets loaded. See [Pimcore Bundles](https://pimcor
 docs page for further details.
 
 Next thing is to provide the server-side implementation.
-A sample can be found [here](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/Query/Operator/Trimmer.php). 
+A sample can be found [here](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/Query/Operator/Trimmer.php). 
 
 Finally, we have to define how the operator instances get created.
 In most cases we use the `DefaultOperatorFactory` for that:

doc/10_GraphQL/07_Mutation/25_Add_Custom_Mutation_Datatype.md

@@ -14,12 +14,12 @@ Add a section similar to this one to your `services.yml` file.
 ```
 
 For reference, have a look at a look at the 
-[`Geopoint datatype`](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/DataObjectMutationFieldConfigGenerator/Geopoint.php).
+[`Geopoint datatype`](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/DataObjectMutationFieldConfigGenerator/Geopoint.php).
 
 You return a valid GraphQL input type (which is an `InputObjectType`) here and a `Processor` which processes the actual
 input data.
 
 For a rather simple example have a look at the 
-[`Date`](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/DataObjectMutationFieldConfigGenerator/Date.php) 
+[`Date`](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/DataObjectMutationFieldConfigGenerator/Date.php) 
 implementation (which both accepts integer and string input values).
 

doc/10_GraphQL/07_Mutation/26_Add_Custom_Mutation_Operator.md

@@ -15,7 +15,7 @@ Add a section similar to this one to your `services.yml` file.
 ```
 
 For reference have a look at:
-[`IfEmpty Operator`](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/DataObjectMutationOperatorConfigGenerator/IfEmpty.php).
+[`IfEmpty Operator`](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/DataObjectMutationOperatorConfigGenerator/IfEmpty.php).
 
 This will again define a processor (see the next subsection) and try to automatically determine the input type
 depending on its child element.
@@ -27,7 +27,7 @@ You have to provide both JavaScript code dealing with the UI configuration aspec
 and the server-side PHP implementation processing the input (the input processor according to your input schema).
 
 A JS sample can be found 
-[here](https://github.com/pimcore/data-hub/blob/master/src/Resources/public/js/mutationoperator/IfEmpty.js).
+[here](https://github.com/pimcore/data-hub/blob/2.x/src/Resources/public/js/mutationoperator/IfEmpty.js).
 
 :::info
 
@@ -40,7 +40,7 @@ docs page for further details.
 
 Next thing is to provide the input processor on the server side.
 A sample can be found 
-[here](https://github.com/pimcore/data-hub/blob/master/src/GraphQL/DataObjectInputProcessor/IfEmptyOperator.php).
+[here](https://github.com/pimcore/data-hub/blob/2.x/src/GraphQL/DataObjectInputProcessor/IfEmptyOperator.php).
 It will get the child value and only overwrite the current value if it is empty.
 
 

doc/10_GraphQL/10_Events.md

@@ -1,14 +1,14 @@
 # Events
 
 Datahub GraphQL events are based on the Symfony event dispatcher, and are triggered during execution of Query and Mutation requests.
-[Read more](https://github.com/pimcore/pimcore/blob/master/doc/Development_Documentation/20_Extending_Pimcore/11_Event_API_and_Event_Manager.md) about events on Pimcore documentation.
+[Read more](https://docs.pimcore.com/platform/Pimcore/Extending_Pimcore/Event_API_and_Event_Manager) about events on Pimcore documentation.
 
 All Datahub events are defined as a constant on component classes:
-- [Query](https://github.com/pimcore/data-hub/blob/master/src/Event/GraphQL/QueryEvents.php)
-- [Mutation](https://github.com/pimcore/data-hub/blob/master/src/Event/GraphQL/MutationEvents.php)
-- [Executor](https://github.com/pimcore/data-hub/blob/master/src/Event/GraphQL/ExecutorEvents.php)
-- [Listing](https://github.com/pimcore/data-hub/blob/master/src/Event/GraphQL/ListingEvents.php)
-- [Ouput cache](https://github.com/pimcore/data-hub/blob/master/src/Event/GraphQL/OutputCacheEvents.php)
+- [Query](https://github.com/pimcore/data-hub/blob/2.x/src/Event/GraphQL/QueryEvents.php)
+- [Mutation](https://github.com/pimcore/data-hub/blob/2.x/src/Event/GraphQL/MutationEvents.php)
+- [Executor](https://github.com/pimcore/data-hub/blob/2.x/src/Event/GraphQL/ExecutorEvents.php)
+- [Listing](https://github.com/pimcore/data-hub/blob/2.x/src/Event/GraphQL/ListingEvents.php)
+- [Ouput cache](https://github.com/pimcore/data-hub/blob/2.x/src/Event/GraphQL/OutputCacheEvents.php)
 
 ## Event Subscriber Examples
 
@@ -180,7 +180,7 @@ class GraphQlSubscriber implements EventSubscriberInterface
 
 #### Example 4: Add custom query conditions to object listing
 
-- For simple filter conditions also see [Filtering](https://github.com/pimcore/data-hub/blob/master/doc/graphl/Filtering.md#request)
+- For simple filter conditions also see [Filtering](./04_Query/10_Filtering.md)
 
 ```php
 <?php