diff options
| -rw-r--r-- | .idea/workspace.xml | 10 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | version.txt | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index baae3dc..d51a2be 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,7 @@ <component name="ChangeListManager">
<list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
<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" />
@@ -61,8 +62,8 @@ <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/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" 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 +83,7 @@ </option>
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/cdn" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
@@ -169,7 +170,8 @@ <workItem from="1654000587101" duration="441000" />
<workItem from="1654345612131" duration="4286000" />
<workItem from="1654352190298" duration="166000" />
- <workItem from="1654352378304" duration="38000" />
+ <workItem from="1654352378304" duration="53000" />
+ <workItem from="1654352763363" duration="104000" />
</task>
<servers />
</component>
@@ -75,7 +75,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; <span><?= l("Média", "Media") ?></span> <span class="explore-description"><?= l("Musique, photos et vidéos de la famille au même endroit", "Music, photos and videos from the family all in the same place") ?></span> </a> -<!-- <a href="https://planning.--><?= $_CONFIG["Global"]["domain"] ?><!--" class="explore-btn">--> +<!-- <a href="https://planning.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn">--> <!-- <img src="/icns/familine-planning.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;">--> <!-- <span>Planning</span>--> <!-- <span class="explore-description">Gérez vos présences et absences aux événements de Familine</span>--> diff --git a/version.txt b/version.txt index 99a0db0..dd134ed 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -4.10.O (%ea%)
\ No newline at end of file +4.10.3 (%ea%)
\ No newline at end of file |