diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml index 6509a4952..786d85c30 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.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 diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 7210bd6e0..c327d2e22 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.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 diff --git a/content/people/ali_chaddad/ali_chaddad.jpg b/content/people/ali_chaddad/ali_chaddad.jpg deleted file mode 100644 index 6c985421a..000000000 Binary files a/content/people/ali_chaddad/ali_chaddad.jpg and /dev/null differ diff --git a/content/people/ali_chaddad/index.md b/content/people/ali_chaddad/index.md deleted file mode 100644 index b0f75710d..000000000 --- a/content/people/ali_chaddad/index.md +++ /dev/null @@ -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. \ No newline at end of file diff --git a/content/people/gloria_anne/gloria_anne.png b/content/people/gloria_anne/gloria_anne.png deleted file mode 100644 index 1510c31c7..000000000 Binary files a/content/people/gloria_anne/gloria_anne.png and /dev/null differ diff --git a/content/people/gloria_anne/index.md b/content/people/gloria_anne/index.md deleted file mode 100644 index b5796bb41..000000000 --- a/content/people/gloria_anne/index.md +++ /dev/null @@ -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. diff --git a/templates/shortcodes/team_sec.html b/templates/shortcodes/team_sec.html index 1a4dbfc36..4ab2c0bd0 100644 --- a/templates/shortcodes/team_sec.html +++ b/templates/shortcodes/team_sec.html @@ -385,7 +385,7 @@ -
+ {#
-
+
#}