From 4bcdfcf4b7fd411d549ca5efe7ad7c37ae3d8c53 Mon Sep 17 00:00:00 2001 From: Lulalaby Date: Fri, 8 Mar 2019 11:00:55 +0100 Subject: [PATCH 1/9] Removed old Repos --- .gitmodules | 6 ------ API | 1 - WebApp | 1 - 3 files changed, 8 deletions(-) delete mode 160000 API delete mode 160000 WebApp diff --git a/.gitmodules b/.gitmodules index cf0a2dfca..3540ac24e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "WebApp"] - path = WebApp - url = https://github.com/Human-Connection/WebApp.git -[submodule "API"] - path = API - url = https://github.com/Human-Connection/API.git [submodule "Nitro-Web"] path = Nitro-Web url = https://github.com/Human-Connection/Nitro-Web.git diff --git a/API b/API deleted file mode 160000 index 8f0edaff9..000000000 --- a/API +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f0edaff90da046bd0db34bd77f0ead7ef336d85 diff --git a/WebApp b/WebApp deleted file mode 160000 index d4917da33..000000000 --- a/WebApp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4917da335164f664837c9177c3bfb6e4a8d7432 From 51b2874d5d2da1687bb4ac5b7f0149f89e27cbf0 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 11:04:38 +0100 Subject: [PATCH 2/9] Update README.md --- README.md | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index efd61dd83..9c658e777 100644 --- a/README.md +++ b/README.md @@ -11,18 +11,6 @@ Human-Connection is beeing build to provide better Communication Tools for every We want to do more than comments and sharing! **Features** -- Post Builder/Editor -- Voting -- Best of Lists -- Pro & Contra Discussions -- Projects -- Event Management -- Organizations -- Chats & Group Chats -- Knowledge Sharing -- Let's Talk -- Versus Challenging -- Modular UI --- # BE AWARE: we are currently transitioning to our Nitro version @@ -55,5 +43,8 @@ We want to do more than comments and sharing! ### Backend [Backend](https://github.com/Human-Connection/Nitro-Backend) +## Documentation +[Nitro Docs](https://docs.human-connection.org/nitro) + ## Developer Discord [Discord](https://discord.gg/6ub73U3) From 3eaf95b90c2cc72b9bef459380d539e94dd3933a Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 11:05:04 +0100 Subject: [PATCH 3/9] Update README.md --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9c658e777..b8ece27a1 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,7 @@ Human-Connection is beeing build to provide better Communication Tools for every We want to do more than comments and sharing! **Features** - ---- -# BE AWARE: we are currently transitioning to our Nitro version -> Check out https://docs.human-connection.org/nitro for more information. ---- +- **REPO States** @@ -44,7 +40,7 @@ We want to do more than comments and sharing! [Backend](https://github.com/Human-Connection/Nitro-Backend) ## Documentation -[Nitro Docs](https://docs.human-connection.org/nitro) +[Docs](https://docs.human-connection.org/nitro) ## Developer Discord [Discord](https://discord.gg/6ub73U3) From 7aec9eabf15a825dcf16fb583ab1989249b40f47 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 11:13:24 +0100 Subject: [PATCH 4/9] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b8ece27a1..78c3b14ac 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,9 @@ We want to do more than comments and sharing! **Technology Stack** - vuejs - nuxtjs -- mongodb - feathersjs +- graphql +- neo4j ## Code From c2dd92200d940dcbdcf027011cf643398cca25dd Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 11:14:35 +0100 Subject: [PATCH 5/9] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 78c3b14ac..d654bbd45 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ # Human-Connection -[![Build Status](https://travis-ci.com/Human-Connection/Human-Connection.svg?branch=master)](https://travis-ci.com/Human-Connection/Human-Connection) - An Open Source Social Network for the positive change that we need in the World. Human-Connection is beeing build to provide better Communication Tools for everyone. We want to do more than comments and sharing! From 94f51c58e3ed4c750fc9f35cd90da6bc79fcf302 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 12:28:21 +0100 Subject: [PATCH 6/9] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index d654bbd45..3084b7820 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,8 @@ We want to do more than comments and sharing! **Technology Stack** - vuejs - nuxtjs -- feathersjs -- graphql - neo4j +- graphql ## Code From 7b7fb7ebb8b48867b3c6592d86f6d5cf4abb56a4 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 15:58:57 +0100 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3084b7820..fbd7f4829 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ We want to do more than comments and sharing! [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) | [Nitro Web](https://github.com/Human-Connection/Nitro-Web) - [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Embed.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Embed) | [Nitro Embed](https://github.com/Human-Connection/Nitro-Embed) + ![Always passing](https://camo.githubusercontent.com/14b2ac1fc61cf21f2022ff3ee5ad6feca559ee18/68747470733a2f2f7472617669732d63692e636f6d2f48756d616e2d436f6e6e656374696f6e2f4e6974726f2d5374796c6567756964652e7376673f6272616e63683d6d6173746572) | [Nitro Embed](https://github.com/Human-Connection/Nitro-Embed) [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) From 3d1b3ce4892658875eb220f797fa37181c603dc8 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Sat, 9 Mar 2019 20:32:40 +0100 Subject: [PATCH 8/9] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fbd7f4829..2480a7250 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,18 @@ Human-Connection is beeing build to provide better Communication Tools for every We want to do more than comments and sharing! **Features** -- +- Post Builder/Editor +- Voting +- Best of Lists +- Pro & Contra Discussions +- Projects +- Event Management +- Organizations +- Chats & Group Chats +- Knowledge Sharing +- Let's Talk +- Versus Challenging +- Modular UI **REPO States** From 9cb19e618006a50317cace7ed8cae15b7ac1032d Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Mon, 11 Mar 2019 09:43:35 +0100 Subject: [PATCH 9/9] Improved and fixed Readme --- Nitro-Web | 2 +- README.md | 36 ++++++++++++++---------------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Nitro-Web b/Nitro-Web index d84892930..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit d84892930295dcfd3f6687fc33c7234446127099 +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 diff --git a/README.md b/README.md index 2480a7250..fb8c94162 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Human-Connection An Open Source Social Network for the positive change that we need in the World. -Human-Connection is beeing build to provide better Communication Tools for everyone. +Human-Connection is being built to provide better Communication Tools for everyone. We want to do more than comments and sharing! **Features** @@ -22,34 +22,26 @@ We want to do more than comments and sharing! - Versus Challenging - Modular UI -**REPO States** - - [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) | [Nitro Backend](https://github.com/Human-Connection/Nitro-Backend) - - [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) | [Nitro Web](https://github.com/Human-Connection/Nitro-Web) - - ![Always passing](https://camo.githubusercontent.com/14b2ac1fc61cf21f2022ff3ee5ad6feca559ee18/68747470733a2f2f7472617669732d63692e636f6d2f48756d616e2d436f6e6e656374696f6e2f4e6974726f2d5374796c6567756964652e7376673f6272616e63683d6d6173746572) | [Nitro Embed](https://github.com/Human-Connection/Nitro-Embed) - - [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) - - +**Repositories** +| Repo | Status | +|---|---| +| [Nitro Web](https://github.com/Human-Connection/Nitro-Web) | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) | [Nitro Web](https://github.com/Human-Connection/Nitro-Web) | +| [Nitro Backend](https://github.com/Human-Connection/Nitro-Backend) | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Backend](https://github.com/Human-Connection/Nitro-Backend) | +| [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) | +| [Nitro Embed](https://github.com/Human-Connection/Nitro-Embed) | ![Todo: add build pipeline](https://img.shields.io/badge/TODO-add%20build%20pipeline-red.svg) | + **Technology Stack** - vuejs - nuxtjs -- neo4j +- neo4j - graphql -## Code - -### Frontend -[Frontend](https://github.com/Human-Connection/Nitro-Web) - -### Backend -[Backend](https://github.com/Human-Connection/Nitro-Backend) - ## Documentation [Docs](https://docs.human-connection.org/nitro) -## Developer Discord +## Translations +You can help translating the interface by joining us on [lokalise.co](https://lokalise.co/public/556252725c18dd752dd546.13222042/). + +## Developer Chat [Discord](https://discord.gg/6ub73U3)