From 5c9e430a24188accd23dbc8e807cd8b6cea4700a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 12 Apr 2019 13:07:08 +0200 Subject: [PATCH] Merge feature list by @datenbrei --- .../assets/lets_get_together.png | Bin README.md | 23 ++++++++++-------- SUMMARY.md | 3 +-- concept/README.md | 2 -- concept/specification.md => features.md | 0 5 files changed, 14 insertions(+), 14 deletions(-) rename lets_get_together_2.png => .gitbook/assets/lets_get_together.png (100%) delete mode 100644 concept/README.md rename concept/specification.md => features.md (100%) diff --git a/lets_get_together_2.png b/.gitbook/assets/lets_get_together.png similarity index 100% rename from lets_get_together_2.png rename to .gitbook/assets/lets_get_together.png diff --git a/README.md b/README.md index 08a420cf5..cc214249e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ -# README +# Human-Connection - [![Human-Connection](https://github.com/Human-Connection/Human-Connection/blob/master/lets_get_together_2.png)](https://human-connection.org) + [![Human-Connection](.gitbook/assets/lets_get_together.png)](https://human-connection.org) -## Human-Connection +Human Connection is a nonprofit social, action and knowledge network that connects information to action and promotes positive local and global change in all areas of life. -[![Build Status](https://travis-ci.com/Human-Connection/Human-Connection.svg?branch=master)](https://travis-ci.com/Human-Connection/Human-Connection) +* **Social**: Interact with other people not just by commenting their posts, but by providing **Pro & Contra** arguments, give a **Versus** or ask them by integrated **Chat** or **Let's Talk** +* **Knowledge**: Read articles about interesting topics and find related posts in the **More Info** tab or by **Filtering** based on **Categories** and **Tagging** or by using the **Fulltext Search**. +* **Action**: Don't just read about how to make the world a better place, but come into **Action** by following provided suggestions on the **Action** tab provided by other people or **Organisations**. -Human Connection is a free and open-source social network for active citizenship. **Technology Stack** @@ -16,7 +17,9 @@ Human Connection is a free and open-source social network for active citizenship * [NodeJS](https://nodejs.org/en/) * [Neo4J](https://neo4j.com/) -### Live demo + +## Live demo +[![Build Status](https://travis-ci.com/Human-Connection/Human-Connection.svg?branch=master)](https://travis-ci.com/Human-Connection/Human-Connection) Try out our deployed [staging environment](https://nitro-staging.human-connection.org/). @@ -28,15 +31,15 @@ Logins: | `moderator@example.org` | 1234 | moderator | | `admin@example.org` | 1234 | admin | -### Documentation +## Documentation Learn how to set up a local development environment in our [Docs](https://docs.human-connection.org/nitro). -### Translations +## Translations -Contributre translations on [lokalise.co](https://lokalise.co/public/556252725c18dd752dd546.13222042/). +Contribute translations on [lokalise.co](https://lokalise.co/public/556252725c18dd752dd546.13222042/). -### Developer Chat +## Developer Chat Join the open-source community on [Discord](https://discord.gg/6ub73U3). diff --git a/SUMMARY.md b/SUMMARY.md index 376734a17..251f829d8 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -2,8 +2,7 @@ * [README](README.md) * [Edit this Documentation](edit-this-documentation.md) -* [concept](concept/README.md) - * [Network Specification](concept/specification.md) +* [Features](features.md) * [Installation](installation.md) * [Webapp](webapp/README.md) * [COMPONENTS](webapp/components.md) diff --git a/concept/README.md b/concept/README.md deleted file mode 100644 index c3b29e038..000000000 --- a/concept/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# concept - diff --git a/concept/specification.md b/features.md similarity index 100% rename from concept/specification.md rename to features.md