diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/deployment.xml | 3 | ||||
| -rw-r--r-- | .idea/workspace.xml | 25 |
2 files changed, 15 insertions, 13 deletions
diff --git a/.idea/deployment.xml b/.idea/deployment.xml index e190dc0..9cf9b38 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" autoUpload="Always" remoteFilesAllowedToDisappearOnAutoupload="false">
+ <component name="PublishConfigData" serverName="Familine" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="Familine">
<serverdata>
@@ -14,6 +14,5 @@ </serverdata>
</paths>
</serverData>
- <option name="myAutoUpload" value="ALWAYS" />
</component>
</project>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 751fa53..1e50a3b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ <project version="4">
<component name="ChangeListManager">
<list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.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" />
@@ -62,7 +63,9 @@ <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/intro/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/intro/session.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -82,7 +85,7 @@ </option>
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/intro" />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/cdn" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
@@ -106,18 +109,18 @@ <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">{ - "keyToString": { - "WebServerToolWindowFactoryState": "true", - "last_opened_file_path": "/Users/Scoots/Code/Familine", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" + <component name="PropertiesComponent"><![CDATA[{ + "keyToString": { + "WebServerToolWindowFactoryState": "true", + "last_opened_file_path": "/Users/Scoots/Code/Familine/private/news", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" } -}</component>
+}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/app/intro" />
<recent name="$PROJECT_DIR$/private/news" />
+ <recent name="$PROJECT_DIR$/app/intro" />
<recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/app/media" />
<recent name="$PROJECT_DIR$/login/embed" />
@@ -167,7 +170,7 @@ <workItem from="1650805734182" duration="1344000" />
<workItem from="1653663350526" duration="616000" />
<workItem from="1654000587101" duration="441000" />
- <workItem from="1654345612131" duration="2127000" />
+ <workItem from="1654345612131" duration="4147000" />
</task>
<servers />
</component>
|