From 84d7a73da07180e580ea166ac0de0eee593d4f4f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 20 Feb 2023 20:56:11 +0100 Subject: [PATCH 1/7] Update docs/history.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- docs/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index 7a9ecd5..92901e1 100644 --- a/docs/history.md +++ b/docs/history.md @@ -6,7 +6,7 @@ It all began ~2017, when [Alex](people/alexander-friedland.md), who made the ini ## Human Connection -Most of us met again 2019 at Human Connection. This time all as developers to implement the envisioned social network. [Wolle](people/wolfgang-huss.md) was first, followed by [Alex](people/alexander-friedland.md) and [Ulf](people/ulf-gebhardt.md). While Ulf left for DEMOCRACY again, Hannes volunteered and Moriz joined the Team, till the project ended 2020 as Human Connection and was transformed into Ocelot.social. +Most of us met again 2019 at Human Connection. This time all as developers to implement the envisioned social network. [Wolle](people/wolfgang-huss.md) was first, followed by [Alex](people/alexander-friedland.md) and [Ulf](people/ulf-gebhardt.md). While Ulf left for DEMOCRACY again, Hannes volunteered and Moriz joined the Team, till the project ended 2020 as Human Connection and was transformed into *ocelot.social*. ## Ocelot.social - end of Human Connection From bdef0d3e3bb7e97bd3c14bc3f1cdfda403950713 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 20 Feb 2023 20:56:18 +0100 Subject: [PATCH 2/7] Update docs/history.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- docs/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index 92901e1..d2b819c 100644 --- a/docs/history.md +++ b/docs/history.md @@ -8,7 +8,7 @@ It all began ~2017, when [Alex](people/alexander-friedland.md), who made the ini Most of us met again 2019 at Human Connection. This time all as developers to implement the envisioned social network. [Wolle](people/wolfgang-huss.md) was first, followed by [Alex](people/alexander-friedland.md) and [Ulf](people/ulf-gebhardt.md). While Ulf left for DEMOCRACY again, Hannes volunteered and Moriz joined the Team, till the project ended 2020 as Human Connection and was transformed into *ocelot.social*. -## Ocelot.social - end of Human Connection +## Ocelot.Social - end of Human Connection In the last quater of 2020 Human Connection was ended as a project and the source code was republished under the name Ocelot.social. [Wolle](people/wolfgang-huss.md), [Alex](people/alexander-friedland.md), [Ulf](people/ulf-gebhardt.md) and Moriz continued on the project and released wir.social to keep ocelot alive. From 6389678ae51a5d7c299e1c6447e8a61b8b13bcc6 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 21 Feb 2023 01:02:23 +0100 Subject: [PATCH 3/7] Update docs/history.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- docs/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index d2b819c..63074d4 100644 --- a/docs/history.md +++ b/docs/history.md @@ -27,4 +27,4 @@ With the end of the year 2022 the financial situation within the Gradido project ## IT4C -With the start of 2023 the IT4C brand name and [website](https://www.it4c.dev) was established to allow the whole team to present themselves and the team as a whole. \ No newline at end of file +With the start of 2023 the IT4C brand name and [website](https://www.it4c.dev) was established to allow the team members to present themselves and the team as a whole. From 5253c4f0906093e1c43c18941024f7da0e15df3f Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 3 Oct 2023 10:23:25 +0200 Subject: [PATCH 4/7] remove unappropriate text from history doc --- docs/history.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/history.md b/docs/history.md index 63074d4..591402e 100644 --- a/docs/history.md +++ b/docs/history.md @@ -19,11 +19,7 @@ When Ulf went on a trip to Italy [Wolle](people/wolfgang-huss.md) could finally be convinced to join, soon followed by [Mathias](people/mathias-lenz.md). ## Yunite.me From 0c83945a63af5593aae98a17a4c801da2bd5c954 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 3 Oct 2023 10:35:03 +0200 Subject: [PATCH 6/7] fix typo --- docs/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history.md b/docs/history.md index 99fd07a..00b0791 100644 --- a/docs/history.md +++ b/docs/history.md @@ -10,7 +10,7 @@ Most of us met again 2019 at Human Connection. This time all as developers to Date: Tue, 3 Oct 2023 10:38:05 +0200 Subject: [PATCH 7/7] add links to hannes and moriz pages to history doc --- docs/history.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/history.md b/docs/history.md index 00b0791..277ca9c 100644 --- a/docs/history.md +++ b/docs/history.md @@ -6,15 +6,15 @@ It all began ~2017, when [Alex](people/alexander-friedland.md), who made the ini ## Human Connection -Most of us met again 2019 at Human Connection. This time all as developers to implement the envisioned social network. [Wolle](people/wolfgang-huss.md) was first, followed by [Alex](people/alexander-friedland.md) and [Ulf](people/ulf-gebhardt.md). While Ulf left for DEMOCRACY again, Hannes volunteered and Moriz joined the Team, till the project ended 2020 as Human Connection and was transformed into *ocelot.social*. +Most of us met again 2019 at Human Connection. This time all as developers to implement the envisioned social network. [Wolle](people/wolfgang-huss.md) was first, followed by [Alex](people/alexander-friedland.md) and [Ulf](people/ulf-gebhardt.md). While Ulf left for DEMOCRACY again, [Hannes](people/hannes-heine.html) volunteered and [Moriz](people/moriz-wahl.html) joined the Team, till the project ended 2020 as Human Connection and was transformed into *ocelot.social*. ## Ocelot.Social - end of Human Connection -In the last quarter of 2020 Human Connection was ended as a project and the source code was republished under the name Ocelot.social. [Wolle](people/wolfgang-huss.md), [Alex](people/alexander-friedland.md), [Ulf](people/ulf-gebhardt.md) and Moriz continued on the project and released wir.social to keep ocelot alive. +In the last quarter of 2020 Human Connection was ended as a project and the source code was republished under the name Ocelot.social. [Wolle](people/wolfgang-huss.md), [Alex](people/alexander-friedland.md), [Ulf](people/ulf-gebhardt.md) and [Moriz](people/moriz-wahl.html) continued on the project and released wir.social to keep ocelot alive. ## Gradido -In 2021 most of the team joined the [Gradido](https://github.com/gradido/gradido) project. As always our scout [Alex](people/alexander-friedland.md) was first, followed by [Ulf](people/ulf-gebhardt.md), who was residing in Norway at the time. Soon after Moriz joined up and Hannes came on board in Summer 2021. +In 2021 most of the team joined the [Gradido](https://github.com/gradido/gradido) project. As always our scout [Alex](people/alexander-friedland.md) was first, followed by [Ulf](people/ulf-gebhardt.md), who was residing in Norway at the time. Soon after [Moriz](people/moriz-wahl.html) joined up and [Hannes](people/hannes-heine.html) came on board in Summer 2021. When Ulf went on a trip to Italy [Wolle](people/wolfgang-huss.md) could finally be convinced to join, soon followed by [Mathias](people/mathias-lenz.md). ## Yunite.me