UpdateHEADtrunk

7 files changed, 20 insertions, 72 deletions

diff --git a/.DS_Store b/.DS_Store
index 2da9c62..e7e1d8a 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/.gitignore b/.gitignore
index 94740f0..7b5b5ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ private/FamilineConfig.json
 private/userpics

 private/news/20*

 ukraine

+private/welcomed.json
\ No newline at end of file
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 9cf9b38..3970c9c 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project version="4">

-  <component name="PublishConfigData" serverName="Familine" remoteFilesAllowedToDisappearOnAutoupload="false">

+  <component name="PublishConfigData" autoUpload="Always" serverName="Familine" remoteFilesAllowedToDisappearOnAutoupload="false">

     <serverData>

       <paths name="Familine">

         <serverdata>

@@ -8,11 +8,12 @@
             <mapping deploy="/mnt/familine" local="$PROJECT_DIR$" web="/" />

           </mappings>

           <excludedPaths>

-            <excludedPath local="true" path="$PROJECT_DIR$/app/photos" />

+            <excludedPath local="true" path="$PROJECT_DIR$/app" />

             <excludedPath local="true" path="$PROJECT_DIR$/private/tokens" />

           </excludedPaths>

         </serverdata>

       </paths>

     </serverData>

+    <option name="myAutoUpload" value="ALWAYS" />

   </component>

 </project>
\ No newline at end of file
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index 2b18a8d..10d9afe 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -3,7 +3,7 @@
   <component name="WebServers">

     <option name="servers">

       <webServer id="9701def1-7401-42f4-8594-93ac16af0c57" name="Familine" url="http://familine.minteck.org">

-        <fileTransfer accessType="SFTP" host="ssh.minteck.org" port="22465" sshConfigId="17a6f0aa-4f80-4c21-8862-9cd09c8d61bf" sshConfig="root@ssh.minteck.org:22465 key" keyPair="true">

+        <fileTransfer accessType="SFTP" host="maretimebay.equestria.dev" port="22465" sshConfigId="76e6af14-64eb-4d92-9c7e-64d69a826a97" sshConfig="root@maretimebay.equestria.dev:22465 agent" authAgent="true">

           <advancedOptions>

             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />

           </advancedOptions>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c14badd..9a79836 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,67 +2,11 @@
 <project version="4">

   <component name="ChangeListManager">

     <list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">

+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />

+      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />

+      <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />

       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/cdn/statusbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/statusbar.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitignore" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/LICENSE" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/README.md" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/SatteliteGiteaData.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/SatteliteGiteaData.txt" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/.gitignore" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/LICENSE" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/README.md" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/bower.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/bower.json" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.css" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.js" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.css" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.flexdatalist.min.js.map" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/jquery.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/jquery.js" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/org.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/org.js" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/dllib/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/dllib/package.json" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-Italic-VariableFont_wght.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-Italic-VariableFont_wght.ttf" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-VariableFont_wght.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/fonts/Nunito-VariableFont_wght.ttf" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/lib/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/lib/LICENSE" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.css" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/lib/tree_maker-min.js" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/me/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/me/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/person/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/person/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/private/footer.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/private/footer.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/private/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/private/header.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/birth/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/birth/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/birth/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/birth/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/birth/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/birth/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/city/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/city/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/city/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/city/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/city/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/city/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/death/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/death/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/death/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/death/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/death/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/death/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/dept/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/dept/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/dept/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/dept/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/dept/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/dept/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/lastname/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/lastname/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/lastname/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/lastname/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/lastname/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/lastname/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/marriage/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/marriage/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/marriage/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/marriage/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/marriage/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/marriage/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/name/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/name/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/name/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/name/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/name/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/name/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/state/data.json/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/state/data.json/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/state/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/state/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/search/state/results/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/search/state/results/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/style/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/style/LICENSE" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/style/tree_maker.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/style/tree_maker.css" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/styles/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/common.css" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/styles/dark.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/dark.css" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/tree/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/index.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" afterDir="false" />

-      <change beforePath="$PROJECT_DIR$/app/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/session.php" afterDir="false" />

+      <change beforePath="$PROJECT_DIR$/private/welcomed.json" beforeDir="false" afterPath="$PROJECT_DIR$/private/welcomed.json" afterDir="false" />

       <change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />

     </list>

     <option name="SHOW_DIALOG" value="false" />

@@ -107,14 +51,16 @@
     <option name="hideEmptyMiddlePackages" value="true" />

     <option name="showLibraryContents" value="true" />

   </component>

-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/Scoots/Code/Familine/private/news&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "true",
+    "last_opened_file_path": "/Volumes/Unicorn/core",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>

+}]]></component>

   <component name="RecentsManager">

     <key name="CopyFile.RECENT_KEYS">

       <recent name="$PROJECT_DIR$/private/news" />

@@ -177,6 +123,7 @@
       <workItem from="1654708779061" duration="2539000" />

       <workItem from="1654712510961" duration="223000" />

       <workItem from="1654712950908" duration="115000" />

+      <workItem from="1658477038221" duration="361000" />

     </task>

     <servers />

   </component>

diff --git a/private/welcomed.json b/private/welcomed.json
deleted file mode 100644
index b77537e..0000000
--- a/private/welcomed.json
+++ /dev/null
@@ -1 +0,0 @@
-["patrick.murat","melanie.murat"]
\ No newline at end of file
diff --git a/version.txt b/version.txt
index 8481860..91f3b43 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-4.10.9 (%ea%)
\ No newline at end of file
+4.11.0
\ No newline at end of file