diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/vcs.xml | 5 | ||||
| -rw-r--r-- | .idea/workspace.xml | 210 |
2 files changed, 29 insertions, 186 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml index fa2ad59..c8686e3 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,8 +2,13 @@ <project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/app/cdn" vcs="Git" />
<mapping directory="$PROJECT_DIR$/app/console" vcs="Git" />
<mapping directory="$PROJECT_DIR$/app/genealogy" vcs="Git" />
<mapping directory="$PROJECT_DIR$/app/help" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/app/intro" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/app/media" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/app/planning" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/app/session" vcs="Git" />
</component>
</project>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 67b9fc4..3b73656 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,69 +2,32 @@ <project version="4">
<component name="ChangeListManager">
<list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
- <change afterPath="$PROJECT_DIR$/app/cdn/icons/familine-docs.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/icons/familine-help.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/icons/familine-media.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/icons/familine-music.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/icons/familine-recall.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/icons/familine-share.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/intro.jpg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/js/home.js" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/js/loading.js" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/js/statusbar.js" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/cdn/me/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/help/chat/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/help/review/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/conditions/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/intro.svg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/main.js" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/session.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/statusbar.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-Black.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-BlackItalic.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-Bold.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-BoldItalic.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-Italic.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-Light.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-LightItalic.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-Regular.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-Thin.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/intro/webfonts/Lato-ThinItalic.ttf" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/media/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/planning/.gitlab-ci.yml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/planning/LICENSE" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/planning/README.md" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/planning/SatteliteGiteaData.txt" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/planning/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/session/login/embed/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/session/login/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/session/oauth/embed/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/login/embed/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/news_internal/index.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/private/welcomed.json" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/ukraine/index.php" afterDir="false" />
<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/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/sshConfigs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sshConfigs.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/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.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/console/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/console/README.md" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/console/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/console/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/css/bootstrap-grid.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/css/bootstrap-grid.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/css/bootstrap-reboot.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/css/bootstrap-reboot.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/css/bootstrap.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/css/bootstrap.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/css/theme.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/css/theme.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/js/bootstrap.bundle.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/js/bootstrap.bundle.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/js/bootstrap.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/js/bootstrap.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/private/footer.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/private/footer.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/galaxy/private/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/galaxy/private/header.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" />
@@ -81,6 +44,7 @@ <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" />
@@ -93,139 +57,12 @@ <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/help/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/.gitlab-ci.yml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/LICENSE" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/README.md" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/account/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/account/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/genealogy/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/genealogy/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/legal/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/legal/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/media/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/media/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/planning/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/planning/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/share/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/share/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/help/wiki/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/help/wiki/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/session.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/dark.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/dark.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/debug/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/debug/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/favicon.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/favicon.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/fonts/Nunito-Italic-VariableFont_wght.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/fonts/Nunito-Italic-VariableFont_wght.ttf" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/fonts/Nunito-VariableFont_wght.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/fonts/Nunito-VariableFont_wght.ttf" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/badge-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/badge-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/badge-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/badge-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/badge.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/badge.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/bucks.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/bucks.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/cinema-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/cinema-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/cinema-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/cinema-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/cinema.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/cinema.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/cloud-link.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/cloud-link.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/contacts-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/contacts-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/contacts-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/contacts-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/contacts.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/contacts.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/famidata.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/famidata.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-camera-wrapper.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-camera-wrapper.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-camera.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-camera.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-console.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-docs.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-docs.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-galaxy.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-galaxy.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-help.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-help.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-money.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-money.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-movies.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-movies.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/familine-movies.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-photos.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-photos.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/familine-photos.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-planning.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-planning.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/familine-planning.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-recall.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-recall.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-review.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-review.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-share.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-share.svg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-you.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine-you.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/familine-you.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine.png" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/familine.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/familine.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/help-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/help-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/help-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/help-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/help.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/help.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/home-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/home-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/home-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/home-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/home.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/home.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/money-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/money-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/money-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/money-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/money.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/money.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/music.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/music.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/open-book-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/open-book-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/open-book-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/open-book-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/open-book.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/open-book.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/opus.svg" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/opus.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/pause-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/pause-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/pause-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/pause-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/pip.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/pip.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/play-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/play-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/play-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/play-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/radio-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/radio-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/radio-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/radio-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/radio.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/radio.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/settings-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/settings-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/settings-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/settings-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/settings.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/settings.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/share-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/share-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/share-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/share-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/share.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/share.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/solve-filled.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/solve-filled.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/solve-symbolic.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/solve-symbolic.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/solve.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/solve.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/speaker.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/speaker.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/window-close.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/window-close.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/window-maximize.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/window-maximize.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/window-minimize.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/window-minimize.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/icns/window-reduce.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/icons/window-reduce.png" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/intro.jpg" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/js/iframe.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/js/iframe.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/js/loading.js" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/js/navigation.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/js/navigation.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/js/statusbar.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/intro/stylesheet.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/known/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/known/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/loader.svg" beforeDir="false" afterPath="$PROJECT_DIR$/loader.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/login/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/login/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/me/index.php" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/native.css" beforeDir="false" afterPath="$PROJECT_DIR$/native.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/oauth/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/session/oauth/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/private/FamilineConfig.demo.json" beforeDir="false" afterPath="$PROJECT_DIR$/private/FamilineConfig.demo.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/private/session-noconf.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session-noconf.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/private/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/radio.css" beforeDir="false" afterPath="$PROJECT_DIR$/radio.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/radio.embed.css" beforeDir="false" afterPath="$PROJECT_DIR$/radio.embed.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/sample.html" beforeDir="false" afterPath="$PROJECT_DIR$/sample.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/statusbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/statusbar.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/styles.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/styles.css" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/test/cookie/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/test/cookie/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/test/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/index.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/test/value/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/test/value/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/test/value/no/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/value/no/index.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/test/value/yes/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/test/value/yes/index.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/01-account-dark.svg" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/01-account-dark.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/01-account-light.svg" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/01-account-light.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/02-privacy-dark.svg" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/02-privacy-dark.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/02-privacy-light.svg" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/02-privacy-light.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/03-devices-dark.svg" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/03-devices-dark.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/03-devices-light.svg" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/03-devices-light.svg" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/confirm/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/confirm/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/welcome/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/welcome/index.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/yt.php" beforeDir="false" afterPath="$PROJECT_DIR$/yt.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -328,6 +165,7 @@ <workItem from="1648307994490" duration="186000" />
<workItem from="1648313486025" duration="15000" />
<workItem from="1648368805859" duration="116000" />
+ <workItem from="1649756752182" duration="1083000" />
</task>
<servers />
</component>
|