From 9c3c061149dba8bf9e47296d0a9b28a973c6423b Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Thu, 11 Jan 2024 15:49:19 +0400
Subject: [PATCH 1/8] move map links to approach info

---
 index.html | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index ff51b8a..e9a8a5a 100644
--- a/index.html
+++ b/index.html
@@ -105,6 +105,14 @@ <h1><img id="logo" src="icons/favicon-32x32.png"/> F0RTHSP4CE</h1>
         <header>
           <h2 id="howto">How to approach us</h2>
         </header>
+        <p>
+            Tbilisi, Janashia st, 11/18 (Vake) (<span class="copy-on-click">41.706632, 44.781503</span>)
+            <a target="_blank" href="https://yandex.com.ge/maps/-/CCUBYGSX9D">Yandex Maps</a>,
+            <a target="_blank" href="https://www.openstreetmap.org/node/9959433575">OpenStreetMap</a>
+        </p>
+        <p>
+          <img src="img/entrance.jpg" width="50%" />
+        </p>
         <p>
           Come and visit - to talk, to see the space for yourself or maybe
           even to ask for help. Different people find different modes of
@@ -183,12 +191,7 @@ <h2 id="principles">Principles</h2>
           <h2 id="location">Location & Links</h2>
         </header>
         <ul>
-          <li>
-            Tbilisi, Khorava st, 18 (Vake) (<span class="copy-on-click">41.706632, 44.781503</span>)
-            <a target="_blank" href="https://yandex.com.ge/maps/-/CCUBYGSX9D">Yandex Maps</a>,
-            <a target="_blank" href="https://www.openstreetmap.org/node/9959433575">OpenStreetMap</a>,
-            <a target="_blank" href="img/entrance.jpg">Entrance Photo</a>
-          </li>
+          
           <li>
             <span>Telegram: </span><a target="_blank" href="https://t.me/f0rthsp4ce">channel</a> / <a target="_blank" href="https://t.me/+w-yypPCNwH1kYTYy">chat</a>
           </li>

From 0573eade05403d4c54cbfd609a8060d410f1936e Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Thu, 11 Jan 2024 15:51:48 +0400
Subject: [PATCH 2/8] update visit politics

---
 index.html | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index e9a8a5a..ab0db68 100644
--- a/index.html
+++ b/index.html
@@ -120,15 +120,8 @@ <h2 id="howto">How to approach us</h2>
           your project uninterrupted or even just sit and read a book.
         </p>
         <p>
-          Residents are managing space in their free time on pure enthusiasm, we
-          have flat hierarchy and no administrators or managers. We like
-          guests, but we are ready to meet you only when we are ready. If
-          you want to plan a visit, please ping us in the
-          <a target="_blank" href="https://t.me/+w-yypPCNwH1kYTYy">chat</a>.
-        </p>
-        <p>
-          F0RTHSP4CE is not a secret club. If you share our
-          principles and want to do something - do it, become a resident.
+          You can visit all of our events: join <a href="https://t.me/f0rthsp4ce">telegram channel</a> to get the announcements.<br/>
+          If you wish to visit us at times when there are no events taking place, we kindly ask you to arrange your visit with a resident, who will guide you in the space. You can ask for visit in <a href="https://t.me/f0_public_chat/29469">special topic</a>, if there is anyone ready to meet you.
         </p>
       </article>
       <article>

From 382b581d9d52fa2eba54f4b86bc05da1e1f08fc3 Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Thu, 11 Jan 2024 15:56:40 +0400
Subject: [PATCH 3/8] update links

---
 index.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index ab0db68..5244867 100644
--- a/index.html
+++ b/index.html
@@ -186,7 +186,13 @@ <h2 id="location">Location & Links</h2>
         <ul>
           
           <li>
-            <span>Telegram: </span><a target="_blank" href="https://t.me/f0rthsp4ce">channel</a> / <a target="_blank" href="https://t.me/+w-yypPCNwH1kYTYy">chat</a>
+            <span>Telegram: </span><a target="_blank" href="https://t.me/f0rthsp4ce">channel</a> / <a target="_blank" href="https://t.me/f0_public_chat">chat</a> / <a target="_blank" href="https://t.me/f0rthsp4ce_l1ve">live channel</a>
+          </li>
+          <li>
+            <a target="_blank" href="https://www.instagram.com/f0rthsp4ce">Instagram</a>
+          </li>
+          <li>
+            <a target="_blank" href="https://lor.sh/@f0rthsp4ce">Fediverse/Mastodon</a>
           </li>
           <li>
             <a target="_blank" href="https://github.com/f0rthsp4ce">Github</a>

From f7399c77fea0cc9967b662ad78f25d94dd0a641b Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Thu, 11 Jan 2024 16:25:14 +0400
Subject: [PATCH 4/8] Create CNAME

---
 CNAME | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 CNAME

diff --git a/CNAME b/CNAME
new file mode 100644
index 0000000..b1cc327
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+f0rth.space
\ No newline at end of file

From d4fdaca9942cec26b7947e9c5b3cbf853446c930 Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Thu, 11 Jan 2024 16:30:06 +0400
Subject: [PATCH 5/8] remove actions

---
 .github/workflows/publish.yml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index afbc2bf..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./
-          publish_branch: pages

From ec33335b7f9ccffa8f44c2c6ef3532e270d8547e Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Thu, 11 Jan 2024 16:09:16 +0300
Subject: [PATCH 6/8] Update index.html

---
 index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 5244867..8c7fbc3 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
     <title>F0RTHSP4CE - Hackerspace in Tbilisi</title>
     <meta
       name="description"
-      content="A community of enthusiasts, focused on technology and art. We are trying to wrap our heads about things that are not easy to understand and to create events. But first and foremost we are having a good time."
+      content="A community of enthusiasts, focused on technology and art. We are trying to wrap our heads around things that are not easy to understand and to create events. But first and foremost we are having a good time."
       />
     <meta
       name="keywords"
@@ -91,7 +91,7 @@ <h1><img id="logo" src="icons/favicon-32x32.png"/> F0RTHSP4CE</h1>
             F0RTHSP4CE is a
             <a target="_blank" href="https://wiki.hackerspaces.org/Hackerspaces">hackerspace</a>.
             A community of enthusiasts, focused on technology and art. We are
-            trying to wrap our heads about things that are not easy to
+            trying to wrap our heads around things that are not easy to
             understand and to create events. But first and foremost we are
             having a good time.
           </p>
@@ -117,11 +117,11 @@ <h2 id="howto">How to approach us</h2>
           Come and visit - to talk, to see the space for yourself or maybe
           even to ask for help. Different people find different modes of
           communication preferrable, so you may also just visit and work on
-          your project uninterrupted or even just sit and read a book.
+          your project uninterrupted or just sit and read a book.
         </p>
         <p>
           You can visit all of our events: join <a href="https://t.me/f0rthsp4ce">telegram channel</a> to get the announcements.<br/>
-          If you wish to visit us at times when there are no events taking place, we kindly ask you to arrange your visit with a resident, who will guide you in the space. You can ask for visit in <a href="https://t.me/f0_public_chat/29469">special topic</a>, if there is anyone ready to meet you.
+          If you wish to visit us at times when there are no events taking place, we kindly ask you to arrange your visit with a resident, who will guide you in the space. You can ask for a visit in a <a href="https://t.me/f0_public_chat/29469">special Telegram topic</a>, to see if there is anyone ready to meet you.
         </p>
       </article>
       <article>
@@ -152,7 +152,7 @@ <h2 id="principles">Principles</h2>
             <b>Financial independence</b>
             <p>
               F0RTHSP4CE is not a start-up, resident is a resident and you
-              can&#x27;t by more voting power with donations.
+              can&#x27;t buy more voting power with donations.
             </p>
           </li>
           <li>

From 6bec789fa55ca49b4e7d097c0913f37c5acf8ea9 Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Fri, 12 Jan 2024 03:24:53 +0400
Subject: [PATCH 7/8] change principles format, add calendar

---
 index.html | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/index.html b/index.html
index 5244867..bd99425 100644
--- a/index.html
+++ b/index.html
@@ -128,43 +128,24 @@ <h2 id="howto">How to approach us</h2>
         <header>
           <h2 id="principles">Principles</h2>
         </header>
-        <p>Basic principles of our community are:</p>
         <ol>
           <li>
-            <b>Be brilliant to each other</b>
-            <p>Listen to each other's needs and opinions.</p>
+            <b>Be excellent to each other</b>. Listen to each other's needs and opinions.
           </li>
           <li>
-            <b>Do not oppress and do not bother</b>
-            <p>
-              Be wary of personal boundaries, be ready to make compromises.
-            </p>
+            <b>Do not oppress and do not bother</b>. Be wary of personal boundaries, be ready to make compromises.
           </li>
           <li>
-            <b>Give more than you take</b>
-            <p>
-              F0RTHSP4CE can grow only if the community makes it better. We
+            <b>Give more than you take</b>. F0RTHSP4CE can grow only if the community makes it better. We
               are not a co-working per se, so we are all the ones who make
               the workspaces for each other.
-            </p>
           </li>
           <li>
-            <b>Financial independence</b>
-            <p>
-              F0RTHSP4CE is not a start-up, resident is a resident and you
-              can&#x27;t by more voting power with donations.
-            </p>
-          </li>
-          <li>
-            <b>Do-ocracy</b>
-            <p>
-              If you want to change something, do it, but bear in mind the
+            <b>Do-ocracy</b>. If you want to change something, do it, but bear in mind the
               needs of the others.
-            </p>
           </li>
           <li>
-            <b>Dying is strictly forbidden</b>
-            <p>Safety first. Follow the rules and help the others.</p>
+            <b>Dying is strictly forbidden</b>. Safety first. Follow the rules and help the others.
           </li>
         </ol>
       </article>
@@ -181,10 +162,9 @@ <h2 id="principles">Principles</h2>
       </article>
       <article>
         <header>
-          <h2 id="location">Location & Links</h2>
+          <h2 id="location">Links</h2>
         </header>
         <ul>
-          
           <li>
             <span>Telegram: </span><a target="_blank" href="https://t.me/f0rthsp4ce">channel</a> / <a target="_blank" href="https://t.me/f0_public_chat">chat</a> / <a target="_blank" href="https://t.me/f0rthsp4ce_l1ve">live channel</a>
           </li>
@@ -202,6 +182,9 @@ <h2 id="location">Location & Links</h2>
           </li>
         </ul>
       </article>
+      <p>
+        <iframe src="https://calendar.google.com/calendar/embed?height=600&wkst=1&bgcolor=%23333333&ctz=Asia%2FTbilisi&hl=en&mode=AGENDA&showTitle=0&showNav=0&showDate=0&showPrint=0&showTabs=1&showCalendars=0&showTz=0&src=MjZiNGQyZjMyOGIyY2Q4MjdhODU1N2I3NzJkYzcwMTA2YmU4M2ZiYmQ2YTU0ZGYwY2M0MGI3MmIzYjgxYjZjZUBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%23D81B60" style="border-width:0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+      </p>
     </main>
   </body>
 </html>

From ea33c27c19685c7620a7e3256f7e22741d5c2446 Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Fri, 12 Jan 2024 08:15:48 +0400
Subject: [PATCH 8/8] change calendar layout

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 5356dae..fbe1795 100644
--- a/index.html
+++ b/index.html
@@ -183,7 +183,7 @@ <h2 id="location">Links</h2>
         </ul>
       </article>
       <p>
-        <iframe src="https://calendar.google.com/calendar/embed?height=600&wkst=1&bgcolor=%23333333&ctz=Asia%2FTbilisi&hl=en&mode=AGENDA&showTitle=0&showNav=0&showDate=0&showPrint=0&showTabs=1&showCalendars=0&showTz=0&src=MjZiNGQyZjMyOGIyY2Q4MjdhODU1N2I3NzJkYzcwMTA2YmU4M2ZiYmQ2YTU0ZGYwY2M0MGI3MmIzYjgxYjZjZUBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%23D81B60" style="border-width:0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+        <iframe src="https://calendar.google.com/calendar/embed?height=600&wkst=1&bgcolor=%23333333&ctz=Asia%2FTbilisi&hl=en&mode=MONTH&showTitle=0&showNav=0&showDate=0&showPrint=0&showTabs=1&showCalendars=0&showTz=0&src=MjZiNGQyZjMyOGIyY2Q4MjdhODU1N2I3NzJkYzcwMTA2YmU4M2ZiYmQ2YTU0ZGYwY2M0MGI3MmIzYjgxYjZjZUBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%23D81B60" style="border-width:0" width="650" height="400" frameborder="0" scrolling="no"></iframe>
       </p>
     </main>
   </body>