Merge branch 'master' of gitlab.adito.de:xrm/basic

neonContext/Org_context/Org_context.aod

@@ -9,6 +9,7 @@
   <filterview>OrgFilter_view</filterview>
   <editview>OrgEdit_view</editview>
   <preview>OrgPreview_view</preview>
+  <lookupview>OrgFilter_view</lookupview>
   <entity>Org_entity</entity>
   <references>
     <neonViewReference>

neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.0.0">
   <name>Vertriebsdashboard</name>
-  <title>Salesdashboard</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>NEON:PUZZLE</icon>
+  <icon>NEON:LOGO_A</icon>
   <dashboardType>PUBLIC</dashboardType>
   <defaultDashlets>
     <neonDashlet>
-      <name>859bc9bc-17be-4ce9-91a0-0b3720bf31ea</name>
+      <name>Dashlet</name>
       <viewName>TwitterTimeline_view</viewName>
       <configName>AditoTwitterDashlet</configName>
+      <title>Aditonews</title>
       <uiConfiguration>
         <name>uiConfiguration</name>
-        <x v="0" />
-        <y v="0" />
+        <xPos v="0" />
+        <yPos v="0" />
         <colspan v="1" />
-        <rowspan v="8" />
+        <rowspan v="7" />
       </uiConfiguration>
     </neonDashlet>
     <neonDashlet>
-      <name>51770c1a-b470-4a60-ba70-8ab1eac69502</name>
+      <name>Dashlet3</name>
       <viewName>FacebookTimeline_view</viewName>
       <configName>AditoFacebookDashlet</configName>
+      <title>Adito FB</title>
       <uiConfiguration>
         <name>uiConfiguration</name>
-        <x v="1" />
-        <y v="0" />
-        <colspan v="1" />
-        <rowspan v="4" />
-      </uiConfiguration>
-    </neonDashlet>
-    <neonDashlet>
-      <name>3b610152-cd0b-47ba-8587-e190757e1916</name>
-      <viewName>TwitterTimeline_view</viewName>
-      <configName>TwitterDashletConfig</configName>
-      <title>Frank</title>
-      <requiresConfiguration v="false" />
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <x v="2" />
-        <y v="0" />
-        <colspan v="1" />
-        <rowspan v="4" />
-      </uiConfiguration>
-      <parameters>
-        <neonDashletParameter>
-          <name>Account_param</name>
-          <value>fkullm</value>
-        </neonDashletParameter>
-      </parameters>
-    </neonDashlet>
-    <neonDashlet>
-      <name>0fcb3a5b-192b-4f1d-9720-e3c993108ff1</name>
-      <viewName>FacebookTimeline_view</viewName>
-      <configName>FacebookDashletConfig</configName>
-      <title>Microsoft News</title>
-      <requiresConfiguration v="false" />
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <x v="2" />
-        <y v="8" />
-        <colspan v="1" />
-        <rowspan v="4" />
-      </uiConfiguration>
-      <parameters>
-        <neonDashletParameter>
-          <name>Account_param</name>
-          <value>microsoft</value>
-        </neonDashletParameter>
-      </parameters>
-    </neonDashlet>
-    <neonDashlet>
-      <name>e6354df0-189f-4f1f-960f-f15e66fe42df</name>
-      <viewName>PersFilter_view</viewName>
-      <configName>MyContactsDashlet</configName>
-      <title>Kontakte</title>
-      <requiresConfiguration v="false" />
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <x v="0" />
-        <y v="12" />
-        <colspan v="1" />
+        <xPos v="1" />
+        <yPos v="0" />
+        <colspan v="2" />
         <rowspan v="4" />
       </uiConfiguration>
     </neonDashlet>

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>xRM-Basic</projectName>
+  <projectName>xRM-Basic-5</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>