From c2a2b3bf728bc65c17c32cdff4c687802d21a695 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 7 Feb 2024 10:31:58 +0100 Subject: [PATCH 01/11] feat(content): add Ocelot.Social project. --- docs/index.md | 2 +- docs/projects/ocelot.social.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 docs/projects/ocelot.social.md diff --git a/docs/index.md b/docs/index.md index ac0a946..759df30 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,7 +15,7 @@ In the following we list some projects we are proud of: - Yunite.me - Gradido - wir.social -- Ocelot.social +- [Ocelot.social](./projects/ocelot.social.md) - Human-Connection - Democracy-Deutschland diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md new file mode 100644 index 0000000..6f60952 --- /dev/null +++ b/docs/projects/ocelot.social.md @@ -0,0 +1,21 @@ +# Ocelot.Social + +After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. So we created an not branded project so that it can be deployed for different networks with their own brand. + +Ocelot.Social has the following functions: + +- User Accounts +- User Roles +- news feed (Posts) + - Filter +- posts + - as articles + - as events + - comments +- Search +- Groups +- Map + +## Demo + +Try out the application under the following link [Ocelot.Social](https://stage.ocelot.social/) From ce691017c3ea4abac24c546fcb7b64ee283a267b Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 7 Feb 2024 10:33:37 +0100 Subject: [PATCH 02/11] Fix gramar. --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index 6f60952..02bd693 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -1,6 +1,6 @@ # Ocelot.Social -After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. So we created an not branded project so that it can be deployed for different networks with their own brand. +After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. We created an not branded project so that it can be deployed for different networks with their own brand. Ocelot.Social has the following functions: From 5e8dbcc0f5bc61eb70ff603f00a1ccedac26dba6 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 4 Mar 2024 10:20:12 +0100 Subject: [PATCH 03/11] Update docs/projects/ocelot.social.md Co-authored-by: Ulf Gebhardt --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index 02bd693..4353304 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -1,6 +1,6 @@ # Ocelot.Social -After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. We created an not branded project so that it can be deployed for different networks with their own brand. +After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. We created a not branded project so that it can be deployed for different networks with their own brand. Ocelot.Social has the following functions: From 9918ca20dc8b925d47e92e22d374534f0d06dca2 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 4 Mar 2024 10:33:46 +0100 Subject: [PATCH 04/11] Describe the idea behind human-connection. --- docs/projects/ocelot.social.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index 4353304..cf27453 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -1,5 +1,9 @@ # Ocelot.Social +This project started under the name Human-Connection. The idea of human-connection was to create an alternative social media platform where the user is not the product. So in contradiction to social media platorms like Facebook, Instagram, and so on... The user should have the possibility to have constructive discussion (Pro-Contra), have a possibility to take action if a post made them angry, sad, etc... + +For this to work the user should pay for the infrastructure the platform is working on. + After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. We created a not branded project so that it can be deployed for different networks with their own brand. Ocelot.Social has the following functions: From b7b3da2c1c22cf21b42533331cbf63cb1c00926e Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 4 Mar 2024 10:34:28 +0100 Subject: [PATCH 05/11] Add credentials to the demo application. --- docs/projects/ocelot.social.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index cf27453..d01b628 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -22,4 +22,10 @@ Ocelot.Social has the following functions: ## Demo -Try out the application under the following link [Ocelot.Social](https://stage.ocelot.social/) +Try out the application under the following link [Ocelot.Social](https://stage.ocelot.social/). +You can login with the following credentials: +| email | password | role | +| :--- | :--- | :--- | +| `user@example.org` | 1234 | user | +| `moderator@example.org` | 1234 | moderator | +| `admin@example.org` | 1234 | admin | \ No newline at end of file From b3c6517b6215ba47a4ce99a8f356a68e1e594104 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 4 Mar 2024 10:55:20 +0100 Subject: [PATCH 06/11] Remove so since removing sence of the sentence. --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index d01b628..9aa2ade 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -4,7 +4,7 @@ This project started under the name Human-Connection. The idea of human-connecti For this to work the user should pay for the infrastructure the platform is working on. -After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. We created a not branded project so that it can be deployed for different networks with their own brand. +After the closing of the Human-Connection network, the developer and the users wanted to continue to work on the idea. We created a not branded project that can be deployed for different networks with their own brand. Ocelot.Social has the following functions: From 1047abf93b99b53d32ff5c8bb963e8395df66570 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 4 Mar 2024 10:57:51 +0100 Subject: [PATCH 07/11] Remove 'so' since it adds no meaning. --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index 9aa2ade..bccacde 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -1,6 +1,6 @@ # Ocelot.Social -This project started under the name Human-Connection. The idea of human-connection was to create an alternative social media platform where the user is not the product. So in contradiction to social media platorms like Facebook, Instagram, and so on... The user should have the possibility to have constructive discussion (Pro-Contra), have a possibility to take action if a post made them angry, sad, etc... +This project started under the name Human-Connection. The idea of human-connection was to create an alternative social media platform where the user is not the product. In contradiction to social media platorms like Facebook, Instagram, etc... The user should have the possibility to have constructive discussion (Pro-Contra), have a possibility to take action if a post made them angry, sad, etc... For this to work the user should pay for the infrastructure the platform is working on. From d3d829c116e0fa916c555b6e95b84dbc993a7d74 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 4 Mar 2024 11:08:53 +0100 Subject: [PATCH 08/11] Update docs/projects/ocelot.social.md Co-authored-by: Moriz Wahl --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index bccacde..dde5fd8 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -16,7 +16,7 @@ Ocelot.Social has the following functions: - as articles - as events - comments -- Search +- Search (fulltext) - Groups - Map From ec6854593ee87daaf451445f006a2054f99516d0 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 4 Mar 2024 11:10:20 +0100 Subject: [PATCH 09/11] Update docs/projects/ocelot.social.md Co-authored-by: Moriz Wahl --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index dde5fd8..e11013b 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -1,6 +1,6 @@ # Ocelot.Social -This project started under the name Human-Connection. The idea of human-connection was to create an alternative social media platform where the user is not the product. In contradiction to social media platorms like Facebook, Instagram, etc... The user should have the possibility to have constructive discussion (Pro-Contra), have a possibility to take action if a post made them angry, sad, etc... +This project started under the name Human-Connection. The idea of human-connection was to create an alternative social media platform where the user is not the product. In contradiction to social media platforms like Facebook, Instagram, etc... The user should have the possibility to have constructive discussion (Pro-Contra), have a possibility to take action if a post made them angry, sad, etc... For this to work the user should pay for the infrastructure the platform is working on. From 5ede832cc4af96546a1677eab47af73ece446d7b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 4 Mar 2024 11:10:36 +0100 Subject: [PATCH 10/11] Update docs/projects/ocelot.social.md Co-authored-by: Moriz Wahl --- docs/projects/ocelot.social.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index e11013b..b1fcf10 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -19,7 +19,7 @@ Ocelot.Social has the following functions: - Search (fulltext) - Groups - Map - +- Moderation ## Demo Try out the application under the following link [Ocelot.Social](https://stage.ocelot.social/). From 9cae3cc560e468a6fc535c819ce0b363f09a216e Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 4 Mar 2024 11:11:29 +0100 Subject: [PATCH 11/11] Add free line to fix linting. --- docs/projects/ocelot.social.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/projects/ocelot.social.md b/docs/projects/ocelot.social.md index b1fcf10..c8db029 100644 --- a/docs/projects/ocelot.social.md +++ b/docs/projects/ocelot.social.md @@ -20,6 +20,7 @@ Ocelot.Social has the following functions: - Groups - Map - Moderation + ## Demo Try out the application under the following link [Ocelot.Social](https://stage.ocelot.social/).