Merge pull request #283 from threefoldfoundation/development

merge to master

.github/workflows/tf_update_dev.yml

@@ -18,8 +18,8 @@ jobs:
         script: |
           cd /opt/www_threefold_io/
           git log -1
-          git restore .
-          git pull
+          git fetch
+          git reset --hard origin/development
           sed -i "s/https:\/\/www.threefold.io/https:\/\/www2.threefold.io/g" config.toml
           ./build.sh
           

.github/workflows/tf_update_prod.yml

@@ -18,8 +18,8 @@ jobs:
         script: |
           cd /opt/www_threefold_io/
           git log -1
-          git restore .
-          git pull
+          git fetch
+          git reset --hard origin/master
           sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml
           ./build.sh
           

content/people/ali_chaddad/index.md

@@ -1,21 +0,0 @@
----
-title: Ali Chaddad
-weight: 4
-description: Software Engineer with a passion for the finer details and finding the best tools for every job.
-taxonomies:
-    people: [ali_chaddad]
-    memberships: [tech]
-    categories: [foundation]
-extra:
-    imgPath: ali_chaddad.jpg
-    organizations: [threefold_tech]
-    countries: [Egypt]
-    cities: [Cairo]
-    private: 0
-    socialLinks: {
-        LinkedIn: https://www.linkedin.com/in/ali-chaddad-4a5b56b8/,
-        websites: https://threefold.tech,
-    }
----
-
-Software Engineer with a passion for the finer details and finding the best tools for every job.

content/people/gloria_anne/index.md

@@ -1,21 +0,0 @@
----
-title: Gloria Anne
-weight: 3
-description: The relentlessly helpful office administrator in Mazraa.
-taxonomies:
-    people: [gloria_anne]
-    memberships: [foundation]
-    categories: [foundation]
-extra:
-    imgPath: gloria_anne.png
-    organizations: [threefold_foundation, mazraa]
-    countries: [Philippines]
-    cities: []
-    private: 0
-    socialLinks: {
-        LinkedIn: https://www.linkedin.com/in/gloria-anne-c/,
-        websites: https://threefold.io/, https://www.mazraa.io/,
-    }
----
-
-A relentlessly helpful office administrator in Mazraa as well as a bookkeeper. ThreeFold gives me feeling of contributing to something larger than myself that I find very significant.

templates/shortcodes/team_sec.html

@@ -385,7 +385,7 @@
                     </a>
                 </div>
             </div>
-            <div class="inline-block px-3">
+            {# <div class="inline-block px-3">
                 <div class="
                 box
                 max-w-xs
@@ -402,7 +402,7 @@
                             class="rounded-full mx-auto mt-3" alt="Gloria Anne" />
                     </a>
                 </div>
-            </div>
+            </div> #}
             <div class="inline-block px-3">
                 <div class="
                 box