From 345e254afaa897bd459230c5439c679a218b2ce9 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 30 Nov 2017 10:12:41 +0100 Subject: [PATCH 001/179] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..81691f591 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# HumanConnection \ No newline at end of file From ee77027b797bbf07a5895cbfe2bc0a6b2947af33 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 30 Nov 2017 10:14:43 +0100 Subject: [PATCH 002/179] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 81691f591..7002b9b5e 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# HumanConnection \ No newline at end of file +# Human-Connection + +An Open Source Social Network for the positive change that we need in the World. From a866e3c0f2d7402a5806650b67e6d87f232f682b Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 30 Nov 2017 10:15:31 +0100 Subject: [PATCH 003/179] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7002b9b5e..6b52133f3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Human-Connection An Open Source Social Network for the positive change that we need in the World. + +> This is a placeholder for the next updates From 10af461970bd7950498000888959b2914c63c7c0 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 30 Nov 2017 10:18:59 +0100 Subject: [PATCH 004/179] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6b52133f3..fd5e29fc0 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,7 @@ An Open Source Social Network for the positive change that we need in the World. > This is a placeholder for the next updates + +## Code +Frontend (coming soon) +API (coming soon) From af5a4b1934afeeaf00101540f5a03e18071b0e44 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 30 Nov 2017 10:19:12 +0100 Subject: [PATCH 005/179] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fd5e29fc0..38485da46 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,7 @@ An Open Source Social Network for the positive change that we need in the World. > This is a placeholder for the next updates ## Code + Frontend (coming soon) + API (coming soon) From 7cee65ff5fa9e812fc43f52796a913ce4f590baf Mon Sep 17 00:00:00 2001 From: Human-Connection Date: Wed, 31 Jan 2018 14:40:51 +0100 Subject: [PATCH 006/179] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38485da46..0b49920d7 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ An Open Source Social Network for the positive change that we need in the World. ## Code -Frontend (coming soon) +### Frontend +https://github.com/HumanConnection/HC-Frontend -API (coming soon) +### API +https://github.com/HumanConnection/HC-API From bdb7ea4dde9413b48c37d7a9638445d23732848d Mon Sep 17 00:00:00 2001 From: Human-Connection Date: Wed, 31 Jan 2018 14:44:23 +0100 Subject: [PATCH 007/179] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0b49920d7..27b6b0ada 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +

+ Human Connection +

+ # Human-Connection An Open Source Social Network for the positive change that we need in the World. From e0085fa0624b55f0b562a01c4f9c95fd39abfaf8 Mon Sep 17 00:00:00 2001 From: Human-Connection Date: Wed, 31 Jan 2018 22:19:34 +0100 Subject: [PATCH 008/179] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 27b6b0ada..61be98f85 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@

# Human-Connection +## The Social Knowledge- and Action Network An Open Source Social Network for the positive change that we need in the World. From b9ec6353cdd8c74ff6c1f18fe0ab269145ed1fe0 Mon Sep 17 00:00:00 2001 From: Human-Connection Date: Wed, 31 Jan 2018 22:22:10 +0100 Subject: [PATCH 009/179] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 61be98f85..27b6b0ada 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@

# Human-Connection -## The Social Knowledge- and Action Network An Open Source Social Network for the positive change that we need in the World. From 1ad9b20a682367889173fb88e7ed20b853b2f2c3 Mon Sep 17 00:00:00 2001 From: HC-Team Date: Fri, 2 Feb 2018 22:04:41 +0100 Subject: [PATCH 010/179] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 27b6b0ada..b46ccb01b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Human Connection + Human-Connection

# Human-Connection @@ -11,7 +11,7 @@ An Open Source Social Network for the positive change that we need in the World. ## Code ### Frontend -https://github.com/HumanConnection/HC-Frontend +https://github.com/Human-Connection/WebApp ### API -https://github.com/HumanConnection/HC-API +https://github.com/Human-Connection/API From 40cc3eea957081656a255e75cc4c8801858cf63a Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Tue, 13 Mar 2018 09:29:58 +0100 Subject: [PATCH 011/179] added docker compose files for frontend and backend --- docker-compose.build.yml | 64 ++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 64 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 docker-compose.build.yml create mode 100644 docker-compose.yml diff --git a/docker-compose.build.yml b/docker-compose.build.yml new file mode 100644 index 000000000..82b48aabe --- /dev/null +++ b/docker-compose.build.yml @@ -0,0 +1,64 @@ +version: '2' + +services: + api: + build: ../API/ + environment: + NODE_ENV: production + API_HOST: 0.0.0.0 + API_PORT: 3030 + API_SECRET: TE9TqAk2xK[9EFJL + API_BASE_URL: http://localhost:3030 + WEBAPP_BASE_URL: http://localhost:3000 + AUTH_SECRET: tspi23efT%FfZ4Uf + EMAIL_ADDRESS: your-company@domain.tld + MONGO_DB: mongodb://mongodb:27017/hc_api + SENTRY_DNS: + THUMBOR_KEY: uJV67K8%coEnbDFj + THUMBOR_URL: http://localhost:8888 + SMTP_HOST: + SMTP_PASS: + SMTP_USER: + stdin_open: true + links: + - mongodb:mongodb + tty: true + ports: + - 3030:3030/tcp + + frontend: + build: ../WebApp/ + environment: + NODE_ENV: development + WEBAPP_HOST: 0.0.0.0 + WEBAPP_PORT: 3000 + WEBAPP_BASE_URL: http://localhost:3000 + API_HOST: localhost + API_PORT: 3030 + MAPBOX_TOKEN: + stdin_open: true + tty: true + links: + - api:api + ports: + - 3000:3000/tcp + + tumbor: + image: apsl/thumbor:latest + environment: + SECURITY_KEY: uJV67K8%coEnbDFj + ALLOW_UNSAFE_URL: 'False' + ALLOW_OLD_URLS: 'False' + SENTRY_DSN_URL: + RESPECT_ORIENTATION: 'True' + stdin_open: true + tty: true + ports: + - 8888:8000/tcp + + mongodb: + image: mongo:3.4 + environment: + MONGO_SERVICE_NAME: mongodb + ports: + - 27017:27017/tcp diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..8d0d8319a --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,64 @@ +version: '2' + +services: + api: + image: humanconnection/api-feathers + environment: + NODE_ENV: production + API_HOST: 0.0.0.0 + API_PORT: 3030 + API_SECRET: TE9TqAk2xK[9EFJL + API_BASE_URL: http://localhost:3030 + WEBAPP_BASE_URL: http://localhost:3000 + AUTH_SECRET: tspi23efT%FfZ4Uf + EMAIL_ADDRESS: your-company@domain.tld + MONGO_DB: mongodb://mongodb:27017/hc_api + SENTRY_DNS: + THUMBOR_KEY: uJV67K8%coEnbDFj + THUMBOR_URL: http://localhost:8888 + SMTP_HOST: + SMTP_PASS: + SMTP_USER: + stdin_open: true + links: + - mongodb:mongodb + tty: true + ports: + - 3030:3030/tcp + + frontend: + image: humanconnection/frontend-nuxt + environment: + NODE_ENV: development + WEBAPP_HOST: 0.0.0.0 + WEBAPP_PORT: 3000 + WEBAPP_BASE_URL: http://localhost:3000 + API_HOST: localhost + API_PORT: 3030 + MAPBOX_TOKEN: + stdin_open: true + tty: true + links: + - api:api + ports: + - 3000:3000/tcp + + tumbor: + image: apsl/thumbor:latest + environment: + SECURITY_KEY: uJV67K8%coEnbDFj + ALLOW_UNSAFE_URL: 'False' + ALLOW_OLD_URLS: 'False' + SENTRY_DSN_URL: + RESPECT_ORIENTATION: 'True' + stdin_open: true + tty: true + ports: + - 8888:8000/tcp + + mongodb: + image: mongo:3.4 + environment: + MONGO_SERVICE_NAME: mongodb + ports: + - 27017:27017/tcp From 3695a9851394c372bf96303bfe2a16fc4eb5d92a Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Sat, 8 Sep 2018 12:28:56 +0200 Subject: [PATCH 012/179] Update README.md Added Discord invite link so developers can meet there. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b46ccb01b..ec325d23c 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,6 @@ https://github.com/Human-Connection/WebApp ### API https://github.com/Human-Connection/API + +## Developer Discord +https://discord.gg/mVmjvNF From 7b29e6f32fdfbb23e8b96da516f0a47d5c277440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 14 Sep 2018 18:33:48 +0200 Subject: [PATCH 013/179] Copy issue templates from WebApp/ repo --- .github/ISSUE_TEMPLATE/bug_report.md | 35 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 17 +++++++++++ 2 files changed, 52 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..b73537336 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..066b2d920 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From a332a04442a1196887d757c228f42e0e2898dacf Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 17 Sep 2018 22:44:48 +0200 Subject: [PATCH 014/179] Create .gitignore Ignore .github folder on pull. This directory does not need to get copied. --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..bb0224d57 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.github/ From 2ed9cdbdfe5a502dd802edd50ac467babe6e33c6 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Tue, 18 Sep 2018 23:36:45 +0200 Subject: [PATCH 015/179] Update .gitignore Changed .github/ to /.github to work Tested on DiscordBot Repo --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb0224d57..1d0565198 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.github/ +/.github From 47cf295b4bccf5bd34758f630c0f773c7dcb617e Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Tue, 18 Sep 2018 23:38:52 +0200 Subject: [PATCH 016/179] Delete docker-compose.yml Suggestion of @roschaefer --- docker-compose.yml | 64 ---------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 8d0d8319a..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,64 +0,0 @@ -version: '2' - -services: - api: - image: humanconnection/api-feathers - environment: - NODE_ENV: production - API_HOST: 0.0.0.0 - API_PORT: 3030 - API_SECRET: TE9TqAk2xK[9EFJL - API_BASE_URL: http://localhost:3030 - WEBAPP_BASE_URL: http://localhost:3000 - AUTH_SECRET: tspi23efT%FfZ4Uf - EMAIL_ADDRESS: your-company@domain.tld - MONGO_DB: mongodb://mongodb:27017/hc_api - SENTRY_DNS: - THUMBOR_KEY: uJV67K8%coEnbDFj - THUMBOR_URL: http://localhost:8888 - SMTP_HOST: - SMTP_PASS: - SMTP_USER: - stdin_open: true - links: - - mongodb:mongodb - tty: true - ports: - - 3030:3030/tcp - - frontend: - image: humanconnection/frontend-nuxt - environment: - NODE_ENV: development - WEBAPP_HOST: 0.0.0.0 - WEBAPP_PORT: 3000 - WEBAPP_BASE_URL: http://localhost:3000 - API_HOST: localhost - API_PORT: 3030 - MAPBOX_TOKEN: - stdin_open: true - tty: true - links: - - api:api - ports: - - 3000:3000/tcp - - tumbor: - image: apsl/thumbor:latest - environment: - SECURITY_KEY: uJV67K8%coEnbDFj - ALLOW_UNSAFE_URL: 'False' - ALLOW_OLD_URLS: 'False' - SENTRY_DSN_URL: - RESPECT_ORIENTATION: 'True' - stdin_open: true - tty: true - ports: - - 8888:8000/tcp - - mongodb: - image: mongo:3.4 - environment: - MONGO_SERVICE_NAME: mongodb - ports: - - 27017:27017/tcp From ac6bd1efb0e5fd03788a73697be644e8c08df29c Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Tue, 18 Sep 2018 23:42:51 +0200 Subject: [PATCH 017/179] Delete docker-compose.build.yml --- docker-compose.build.yml | 64 ---------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 docker-compose.build.yml diff --git a/docker-compose.build.yml b/docker-compose.build.yml deleted file mode 100644 index 82b48aabe..000000000 --- a/docker-compose.build.yml +++ /dev/null @@ -1,64 +0,0 @@ -version: '2' - -services: - api: - build: ../API/ - environment: - NODE_ENV: production - API_HOST: 0.0.0.0 - API_PORT: 3030 - API_SECRET: TE9TqAk2xK[9EFJL - API_BASE_URL: http://localhost:3030 - WEBAPP_BASE_URL: http://localhost:3000 - AUTH_SECRET: tspi23efT%FfZ4Uf - EMAIL_ADDRESS: your-company@domain.tld - MONGO_DB: mongodb://mongodb:27017/hc_api - SENTRY_DNS: - THUMBOR_KEY: uJV67K8%coEnbDFj - THUMBOR_URL: http://localhost:8888 - SMTP_HOST: - SMTP_PASS: - SMTP_USER: - stdin_open: true - links: - - mongodb:mongodb - tty: true - ports: - - 3030:3030/tcp - - frontend: - build: ../WebApp/ - environment: - NODE_ENV: development - WEBAPP_HOST: 0.0.0.0 - WEBAPP_PORT: 3000 - WEBAPP_BASE_URL: http://localhost:3000 - API_HOST: localhost - API_PORT: 3030 - MAPBOX_TOKEN: - stdin_open: true - tty: true - links: - - api:api - ports: - - 3000:3000/tcp - - tumbor: - image: apsl/thumbor:latest - environment: - SECURITY_KEY: uJV67K8%coEnbDFj - ALLOW_UNSAFE_URL: 'False' - ALLOW_OLD_URLS: 'False' - SENTRY_DSN_URL: - RESPECT_ORIENTATION: 'True' - stdin_open: true - tty: true - ports: - - 8888:8000/tcp - - mongodb: - image: mongo:3.4 - environment: - MONGO_SERVICE_NAME: mongodb - ports: - - 27017:27017/tcp From 0614af7361930b80e46a68cf130e30d0e3c4b175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 8 Aug 2018 23:46:51 +0200 Subject: [PATCH 018/179] Add submodules to auto-update those by dependabot --- .gitmodules | 6 ++++++ API | 1 + WebApp | 1 + 3 files changed, 8 insertions(+) create mode 100644 .gitmodules create mode 160000 API create mode 160000 WebApp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..8161c1c4e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "WebApp"] + path = WebApp + url = https://github.com/Human-Connection/WebApp.git +[submodule "API"] + path = API + url = https://github.com/Human-Connection/API.git diff --git a/API b/API new file mode 160000 index 000000000..37fea2d90 --- /dev/null +++ b/API @@ -0,0 +1 @@ +Subproject commit 37fea2d90ca8a45194efb9a64a3407d78910c8c1 diff --git a/WebApp b/WebApp new file mode 160000 index 000000000..c10ef295f --- /dev/null +++ b/WebApp @@ -0,0 +1 @@ +Subproject commit c10ef295f88e818c31edc8f37f0ea11a9aff1bbc From 2368b46fe2da1f037665ba017610b57f6a653ec9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 18 Sep 2018 22:13:08 +0000 Subject: [PATCH 019/179] Bump API from `37fea2d` to `0c60238` Bumps [API](https://github.com/Human-Connection/API) from `37fea2d` to `0c60238`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/37fea2d90ca8a45194efb9a64a3407d78910c8c1...0c60238b7dcf20ff3d21076e16a560bb660adb7d) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 37fea2d90..0c60238b7 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 37fea2d90ca8a45194efb9a64a3407d78910c8c1 +Subproject commit 0c60238b7dcf20ff3d21076e16a560bb660adb7d From cfeb9242655699496dafefdc54e455db001e4e9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 19 Sep 2018 04:38:41 +0000 Subject: [PATCH 020/179] Bump WebApp from `c10ef29` to `26b6365` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `c10ef29` to `26b6365`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/c10ef295f88e818c31edc8f37f0ea11a9aff1bbc...26b6365234a79ab8adbfcade95814e1299444ada) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index c10ef295f..26b636523 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit c10ef295f88e818c31edc8f37f0ea11a9aff1bbc +Subproject commit 26b6365234a79ab8adbfcade95814e1299444ada From d0f9fa7d202aafb3dafc8ed7559a5ef5d38dcf97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 20 Sep 2018 04:38:56 +0000 Subject: [PATCH 021/179] Bump WebApp from `26b6365` to `e912261` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `26b6365` to `e912261`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/26b6365234a79ab8adbfcade95814e1299444ada...e9122617d3ef955f7401f8e81905610e2a774a37) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 26b636523..e9122617d 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 26b6365234a79ab8adbfcade95814e1299444ada +Subproject commit e9122617d3ef955f7401f8e81905610e2a774a37 From f4621241dd6059c9f07f18b798bd50a74d751af6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 20 Sep 2018 04:38:58 +0000 Subject: [PATCH 022/179] Bump API from `0c60238` to `8c93479` Bumps [API](https://github.com/Human-Connection/API) from `0c60238` to `8c93479`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/0c60238b7dcf20ff3d21076e16a560bb660adb7d...8c9347956ebe526d02b7c598871c90dba1ecc4b9) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 0c60238b7..8c9347956 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 0c60238b7dcf20ff3d21076e16a560bb660adb7d +Subproject commit 8c9347956ebe526d02b7c598871c90dba1ecc4b9 From 1e9c2ec7f2b2019577d4c63631accf3700a4dd3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 21 Sep 2018 04:25:01 +0000 Subject: [PATCH 023/179] Bump WebApp from `e912261` to `adad1da` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `e912261` to `adad1da`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/e9122617d3ef955f7401f8e81905610e2a774a37...adad1da68c56c6e92e8a8f8f5d7ae4da5ae4e637) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index e9122617d..adad1da68 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit e9122617d3ef955f7401f8e81905610e2a774a37 +Subproject commit adad1da68c56c6e92e8a8f8f5d7ae4da5ae4e637 From 3c74dc309d5b0215d4af36e6585bd62cb81c8288 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 21 Sep 2018 04:25:03 +0000 Subject: [PATCH 024/179] Bump API from `8c93479` to `be352a4` Bumps [API](https://github.com/Human-Connection/API) from `8c93479` to `be352a4`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/8c9347956ebe526d02b7c598871c90dba1ecc4b9...be352a43e4f0e1328bb92e79442c2b5927352e7f) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 8c9347956..be352a43e 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8c9347956ebe526d02b7c598871c90dba1ecc4b9 +Subproject commit be352a43e4f0e1328bb92e79442c2b5927352e7f From df664bf85de20d3d6c4ddd1abef2caac2236e3b8 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Sat, 22 Sep 2018 02:13:03 +0200 Subject: [PATCH 025/179] Update README.md Discord invite link update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec325d23c..02154504d 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ https://github.com/Human-Connection/WebApp https://github.com/Human-Connection/API ## Developer Discord -https://discord.gg/mVmjvNF +https://discord.gg/NgVpvx9 From 2ec18f341d701ed5ae1d15f5738073b8c2a67058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 24 Sep 2018 05:01:56 +0000 Subject: [PATCH 026/179] Bump WebApp from `adad1da` to `f504fdb` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `adad1da` to `f504fdb`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/adad1da68c56c6e92e8a8f8f5d7ae4da5ae4e637...f504fdb475df0c7bbd469b83d22f657286c13c72) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index adad1da68..f504fdb47 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit adad1da68c56c6e92e8a8f8f5d7ae4da5ae4e637 +Subproject commit f504fdb475df0c7bbd469b83d22f657286c13c72 From eb7f1ab5c283910e42702a503bf77c31d082a6cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 24 Sep 2018 05:01:58 +0000 Subject: [PATCH 027/179] Bump API from `be352a4` to `88d9bc5` Bumps [API](https://github.com/Human-Connection/API) from `be352a4` to `88d9bc5`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/be352a43e4f0e1328bb92e79442c2b5927352e7f...88d9bc5a774fdc877340b689b40b25607dba470c) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index be352a43e..88d9bc5a7 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit be352a43e4f0e1328bb92e79442c2b5927352e7f +Subproject commit 88d9bc5a774fdc877340b689b40b25607dba470c From dc25bf3ded9b78f191e8c0847202fc50eabc4c55 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 24 Sep 2018 11:27:39 +0200 Subject: [PATCH 028/179] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..45cc9972b --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Human-Connection + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 350b9a1b37582c5faaac5ebc73434087a2a6659f Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 24 Sep 2018 23:45:04 +0200 Subject: [PATCH 029/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02154504d..0c02351e6 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ https://github.com/Human-Connection/WebApp https://github.com/Human-Connection/API ## Developer Discord -https://discord.gg/NgVpvx9 +https://discord.gg/354TGs2 From e3500afe1ac5d0b7d1176dfd16485a9bd483f61f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 25 Sep 2018 04:27:08 +0000 Subject: [PATCH 030/179] Bump WebApp from `f504fdb` to `3fbcc4d` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `f504fdb` to `3fbcc4d`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/f504fdb475df0c7bbd469b83d22f657286c13c72...3fbcc4d2ca3b9d1b0f0b1949dec255db88f90033) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index f504fdb47..3fbcc4d2c 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit f504fdb475df0c7bbd469b83d22f657286c13c72 +Subproject commit 3fbcc4d2ca3b9d1b0f0b1949dec255db88f90033 From f2fbfe1118f71f375a00a59af0f9b80ba0c0f3b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 25 Sep 2018 04:27:09 +0000 Subject: [PATCH 031/179] Bump API from `88d9bc5` to `9ab1228` Bumps [API](https://github.com/Human-Connection/API) from `88d9bc5` to `9ab1228`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/88d9bc5a774fdc877340b689b40b25607dba470c...9ab12282df237fc2cc2b335e62932d71702608f7) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 88d9bc5a7..9ab12282d 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 88d9bc5a774fdc877340b689b40b25607dba470c +Subproject commit 9ab12282df237fc2cc2b335e62932d71702608f7 From cd26a384066644e6f05cdb5844bae860be76e970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 27 Sep 2018 10:08:07 +0200 Subject: [PATCH 032/179] Add logo for README to replace the current --- lets_get_together_2.png | Bin 0 -> 93479 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lets_get_together_2.png diff --git a/lets_get_together_2.png b/lets_get_together_2.png new file mode 100644 index 0000000000000000000000000000000000000000..07017e489063332615731e0db4dc23184ba9c2b9 GIT binary patch literal 93479 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

*nkD3^N8j88 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 literal 0 HcmV?d00001 From 36e2b892824d0028d5f762d50a01e0495f7c3546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 27 Sep 2018 10:10:01 +0200 Subject: [PATCH 033/179] Update logo of README, more beauty --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c02351e6..8376411cb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Human-Connection + Human-Connection

# Human-Connection From acdc1501b9fd504eef77f6856fd31c8b12a14732 Mon Sep 17 00:00:00 2001 From: Sebo Date: Fri, 28 Sep 2018 13:28:30 +0200 Subject: [PATCH 034/179] Update README.md added Features and Tech Stack --- README.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8376411cb..3d45f277b 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,28 @@ # 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! -> This is a placeholder for the next updates +**Features** +- Post Builder/Editor +- Voting +- Best of Lists +- Pro & Contra Discussions +- Projects +- Event Management +- Organisations +- Chats & Group Chats +- Knowledge Sharing +- Let's Talk +- Versus Challenging +- Modular UI + +**Technology Stack** +- vuejs +- nuxtjs +- mongodb +- feathersjs ## Code From 4459b484e86de4e102d16cceddb2f5ab6a0c9f13 Mon Sep 17 00:00:00 2001 From: Sebo Date: Fri, 28 Sep 2018 15:08:48 +0200 Subject: [PATCH 035/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d45f277b..87b89d1ce 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ We want to do more than comments and sharing! - Pro & Contra Discussions - Projects - Event Management -- Organisations +- Organizations - Chats & Group Chats - Knowledge Sharing - Let's Talk From bab336dad473f11f7d3a7e01d1fb20090371f81d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 2 Oct 2018 04:30:13 +0000 Subject: [PATCH 036/179] Bump API from `9ab1228` to `afe0ea0` Bumps [API](https://github.com/Human-Connection/API) from `9ab1228` to `afe0ea0`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/9ab12282df237fc2cc2b335e62932d71702608f7...afe0ea02fceecf0bd146e270e8e6ea06beb04e2f) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 9ab12282d..afe0ea02f 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 9ab12282df237fc2cc2b335e62932d71702608f7 +Subproject commit afe0ea02fceecf0bd146e270e8e6ea06beb04e2f From 325f7fd64029c2ba2a651325c0760b577f90af09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 2 Oct 2018 04:30:15 +0000 Subject: [PATCH 037/179] Bump WebApp from `3fbcc4d` to `5cd89ed` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `3fbcc4d` to `5cd89ed`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/3fbcc4d2ca3b9d1b0f0b1949dec255db88f90033...5cd89ed1ea226d05652b491871ef51deffc05eac) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 3fbcc4d2c..5cd89ed1e 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 3fbcc4d2ca3b9d1b0f0b1949dec255db88f90033 +Subproject commit 5cd89ed1ea226d05652b491871ef51deffc05eac From 46e08c008125590cc47198c78c1e601c1171c148 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 5 Oct 2018 02:49:14 +0200 Subject: [PATCH 038/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87b89d1ce..8b3508016 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,4 @@ https://github.com/Human-Connection/WebApp https://github.com/Human-Connection/API ## Developer Discord -https://discord.gg/354TGs2 +https://discord.gg/6ub73U3 From e558fb3cbe49a90ec948aaf4be6e3bc50335eb27 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 5 Oct 2018 02:51:41 +0200 Subject: [PATCH 039/179] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8b3508016..8952ce091 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ We want to do more than comments and sharing! ## Code ### Frontend -https://github.com/Human-Connection/WebApp +[Frontend](https://github.com/Human-Connection/WebApp) ### API -https://github.com/Human-Connection/API +[API](https://github.com/Human-Connection/API) ## Developer Discord -https://discord.gg/6ub73U3 +[Discord](https://discord.gg/6ub73U3) From 82274306cccaf0413e1d40dd7953a147d67b518e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 04:36:36 +0000 Subject: [PATCH 040/179] Bump API from `afe0ea0` to `bf3f51b` Bumps [API](https://github.com/Human-Connection/API) from `afe0ea0` to `bf3f51b`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/afe0ea02fceecf0bd146e270e8e6ea06beb04e2f...bf3f51b510aa19d6077e88695f57cce0425caf82) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index afe0ea02f..bf3f51b51 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit afe0ea02fceecf0bd146e270e8e6ea06beb04e2f +Subproject commit bf3f51b510aa19d6077e88695f57cce0425caf82 From b5cd13343d9d4b7472b9acf1c48df38fe06b374a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 04:36:37 +0000 Subject: [PATCH 041/179] Bump WebApp from `5cd89ed` to `5013daf` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `5cd89ed` to `5013daf`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/5cd89ed1ea226d05652b491871ef51deffc05eac...5013daf5f22ef17746573c07b5bb0068cff91a62) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 5cd89ed1e..5013daf5f 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 5cd89ed1ea226d05652b491871ef51deffc05eac +Subproject commit 5013daf5f22ef17746573c07b5bb0068cff91a62 From b64e4cc551242305a047d36d09e9dc8f928d6b8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 8 Oct 2018 04:52:08 +0000 Subject: [PATCH 042/179] Bump API from `bf3f51b` to `e95b29c` Bumps [API](https://github.com/Human-Connection/API) from `bf3f51b` to `e95b29c`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/bf3f51b510aa19d6077e88695f57cce0425caf82...e95b29ccc715e3678f4eba8ec6be6a7d74f46101) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index bf3f51b51..e95b29ccc 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit bf3f51b510aa19d6077e88695f57cce0425caf82 +Subproject commit e95b29ccc715e3678f4eba8ec6be6a7d74f46101 From 634f81105ea3ee6fe3c0adb088cb3f3cebc85ae4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 10 Oct 2018 04:38:27 +0000 Subject: [PATCH 043/179] Bump WebApp from `5013daf` to `ba72242` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `5013daf` to `ba72242`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/5013daf5f22ef17746573c07b5bb0068cff91a62...ba722420951b25db71d0e29fe4bcd2d393a71d28) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 5013daf5f..ba7224209 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 5013daf5f22ef17746573c07b5bb0068cff91a62 +Subproject commit ba722420951b25db71d0e29fe4bcd2d393a71d28 From 517f9026f0845ab3b19a557e058f3fd0e5446ff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 10 Oct 2018 04:38:28 +0000 Subject: [PATCH 044/179] Bump API from `e95b29c` to `2f0508b` Bumps [API](https://github.com/Human-Connection/API) from `e95b29c` to `2f0508b`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/e95b29ccc715e3678f4eba8ec6be6a7d74f46101...2f0508b8cd97545e26c6ae4ea9e59f7f69ec2a76) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index e95b29ccc..2f0508b8c 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit e95b29ccc715e3678f4eba8ec6be6a7d74f46101 +Subproject commit 2f0508b8cd97545e26c6ae4ea9e59f7f69ec2a76 From f0377ed25f3319120383250d88cc91f8b2c4a06f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 11 Oct 2018 04:41:54 +0000 Subject: [PATCH 045/179] Bump API from `2f0508b` to `da96078` Bumps [API](https://github.com/Human-Connection/API) from `2f0508b` to `da96078`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/2f0508b8cd97545e26c6ae4ea9e59f7f69ec2a76...da960783f3bac2d407007c949a0dd109931895fb) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 2f0508b8c..da960783f 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 2f0508b8cd97545e26c6ae4ea9e59f7f69ec2a76 +Subproject commit da960783f3bac2d407007c949a0dd109931895fb From 60f225d7685161aa84822e0955732b676507560c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 11 Oct 2018 04:41:55 +0000 Subject: [PATCH 046/179] Bump WebApp from `ba72242` to `7176bbf` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `ba72242` to `7176bbf`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/ba722420951b25db71d0e29fe4bcd2d393a71d28...7176bbf27be40a5cf671bbe6757a42a770c217a6) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index ba7224209..7176bbf27 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit ba722420951b25db71d0e29fe4bcd2d393a71d28 +Subproject commit 7176bbf27be40a5cf671bbe6757a42a770c217a6 From 6ef8c93dec666675316161468ccf4cfc2b348dea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 12 Oct 2018 04:17:55 +0000 Subject: [PATCH 047/179] Bump API from `da96078` to `4437261` Bumps [API](https://github.com/Human-Connection/API) from `da96078` to `4437261`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/da960783f3bac2d407007c949a0dd109931895fb...4437261d59acf130613083ffbdf9daaa18bb2066) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index da960783f..4437261d5 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit da960783f3bac2d407007c949a0dd109931895fb +Subproject commit 4437261d59acf130613083ffbdf9daaa18bb2066 From aeb0a05a62ac15df34c11079582dc23b2a2740fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 12 Oct 2018 04:17:57 +0000 Subject: [PATCH 048/179] Bump WebApp from `7176bbf` to `dc74ac7` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `7176bbf` to `dc74ac7`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/7176bbf27be40a5cf671bbe6757a42a770c217a6...dc74ac7e9f260cd94ee5f8b1bad99673af055ea5) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 7176bbf27..dc74ac7e9 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 7176bbf27be40a5cf671bbe6757a42a770c217a6 +Subproject commit dc74ac7e9f260cd94ee5f8b1bad99673af055ea5 From 28020cfdc4411da3362dce687a8aa7ad47315a3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 16 Oct 2018 04:15:04 +0000 Subject: [PATCH 049/179] Bump WebApp from `dc74ac7` to `d162886` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `dc74ac7` to `d162886`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/dc74ac7e9f260cd94ee5f8b1bad99673af055ea5...d162886fcf99ad4debae8abac1a68b66f320f606) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index dc74ac7e9..d162886fc 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit dc74ac7e9f260cd94ee5f8b1bad99673af055ea5 +Subproject commit d162886fcf99ad4debae8abac1a68b66f320f606 From c4063db441ac0a9da8f30d496dce9e9000cb4fe9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 17 Oct 2018 04:40:20 +0000 Subject: [PATCH 050/179] Bump WebApp from `d162886` to `6854ebb` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `d162886` to `6854ebb`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/d162886fcf99ad4debae8abac1a68b66f320f606...6854ebb0f1510f48adb282b2e679a0d8092768ea) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index d162886fc..6854ebb0f 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit d162886fcf99ad4debae8abac1a68b66f320f606 +Subproject commit 6854ebb0f1510f48adb282b2e679a0d8092768ea From 470743e92ccfe14ae96394ad057954b39948e8d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 04:15:54 +0000 Subject: [PATCH 051/179] Bump WebApp from `6854ebb` to `ab4b520` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `6854ebb` to `ab4b520`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/6854ebb0f1510f48adb282b2e679a0d8092768ea...ab4b520df2f68b189f519a8c782b577c0c9d4144) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 6854ebb0f..ab4b520df 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 6854ebb0f1510f48adb282b2e679a0d8092768ea +Subproject commit ab4b520df2f68b189f519a8c782b577c0c9d4144 From c53aa828702bf97d283c2c96163c8347a2a62087 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 22 Oct 2018 20:58:48 +0000 Subject: [PATCH 052/179] Bump WebApp from `ab4b520` to `394707b` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `ab4b520` to `394707b`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/ab4b520df2f68b189f519a8c782b577c0c9d4144...394707bedfe0da81a4901c21bd6bd03b0205db36) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index ab4b520df..394707bed 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit ab4b520df2f68b189f519a8c782b577c0c9d4144 +Subproject commit 394707bedfe0da81a4901c21bd6bd03b0205db36 From 691eda4d1789ed236c13185b8b07e5b4d918766a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 24 Oct 2018 04:23:57 +0000 Subject: [PATCH 053/179] Bump WebApp from `394707b` to `de99fa4` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `394707b` to `de99fa4`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/394707bedfe0da81a4901c21bd6bd03b0205db36...de99fa439194591344aa7c21fa737054eab088d4) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index 394707bed..de99fa439 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 394707bedfe0da81a4901c21bd6bd03b0205db36 +Subproject commit de99fa439194591344aa7c21fa737054eab088d4 From 35c98d66e6a8cbda9bef1cc13e7cb1291533fff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Oct 2018 04:51:43 +0000 Subject: [PATCH 054/179] Bump WebApp from `de99fa4` to `afb8ba9` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `de99fa4` to `afb8ba9`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/de99fa439194591344aa7c21fa737054eab088d4...afb8ba9d4887008aed0f64e68e250b00ce7354ec) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index de99fa439..afb8ba9d4 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit de99fa439194591344aa7c21fa737054eab088d4 +Subproject commit afb8ba9d4887008aed0f64e68e250b00ce7354ec From f27945d1757c8509b02d32d4def7c8efb989087c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 30 Oct 2018 04:40:03 +0000 Subject: [PATCH 055/179] Bump WebApp from `afb8ba9` to `6f88ca7` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `afb8ba9` to `6f88ca7`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/afb8ba9d4887008aed0f64e68e250b00ce7354ec...6f88ca733fb09a4506fe12bb89c4557ce501e98d) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index afb8ba9d4..6f88ca733 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit afb8ba9d4887008aed0f64e68e250b00ce7354ec +Subproject commit 6f88ca733fb09a4506fe12bb89c4557ce501e98d From 090ae9bb1121d24d6a086d54fb5119e55eb93e24 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Fri, 16 Nov 2018 13:10:23 +0100 Subject: [PATCH 056/179] added nitro hint --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 8952ce091..fd0237fc9 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,11 @@ We want to do more than comments and sharing! - Versus Challenging - Modular UI +--- +# BE AWARE: we are currently transitioning to our Nitro version +> Check out https://docs.human-connection.org/nitro for more information. +--- + **Technology Stack** - vuejs - nuxtjs From d3e9664c12893528bb06491bcb01beab8d4a6ea8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 27 Nov 2018 04:16:32 +0000 Subject: [PATCH 057/179] Bump API from `4437261` to `a64fff7` Bumps [API](https://github.com/Human-Connection/API) from `4437261` to `a64fff7`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/4437261d59acf130613083ffbdf9daaa18bb2066...a64fff79be4b9c39692432bed6e99efd1391c055) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 4437261d5..a64fff79b 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 4437261d59acf130613083ffbdf9daaa18bb2066 +Subproject commit a64fff79be4b9c39692432bed6e99efd1391c055 From 79d7b07765e978c78fefd1a40493eae6e0897135 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 5 Dec 2018 04:51:32 +0000 Subject: [PATCH 058/179] Bump API from `a64fff7` to `8ea42b5` Bumps [API](https://github.com/Human-Connection/API) from `a64fff7` to `8ea42b5`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/a64fff79be4b9c39692432bed6e99efd1391c055...8ea42b5b40dd16958b0887eb7bb9a70ec76909e6) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index a64fff79b..8ea42b5b4 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit a64fff79be4b9c39692432bed6e99efd1391c055 +Subproject commit 8ea42b5b40dd16958b0887eb7bb9a70ec76909e6 From 75076b7d5af52db38f22cc2a65b98af342c410d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 14:54:39 +0100 Subject: [PATCH 059/179] Add Nitro-Web and Nitro-Backend as submodules --- .gitmodules | 6 ++++++ Nitro-Backend | 1 + Nitro-Web | 1 + 3 files changed, 8 insertions(+) create mode 160000 Nitro-Backend create mode 160000 Nitro-Web diff --git a/.gitmodules b/.gitmodules index 8161c1c4e..51e69c525 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "API"] path = API url = https://github.com/Human-Connection/API.git +[submodule "Nitro-Web"] + path = Nitro-Web + url = git@github.com:Human-Connection/Nitro-Web.git +[submodule "Nitro-Backend"] + path = Nitro-Backend + url = git@github.com:Human-Connection/Nitro-Backend.git diff --git a/Nitro-Backend b/Nitro-Backend new file mode 160000 index 000000000..4a8d3a67a --- /dev/null +++ b/Nitro-Backend @@ -0,0 +1 @@ +Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf diff --git a/Nitro-Web b/Nitro-Web new file mode 160000 index 000000000..8f42a1872 --- /dev/null +++ b/Nitro-Web @@ -0,0 +1 @@ +Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e From cf48aa86d7c2541721383df881516e498050c8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 14:55:45 +0100 Subject: [PATCH 060/179] Update API and WebApp submodules --- API | 2 +- WebApp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/API b/API index 8ea42b5b4..02dcc2285 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8ea42b5b40dd16958b0887eb7bb9a70ec76909e6 +Subproject commit 02dcc2285c71ce8010ec0952a303e9a9f5e05798 diff --git a/WebApp b/WebApp index 6f88ca733..fa26d7c65 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 6f88ca733fb09a4506fe12bb89c4557ce501e98d +Subproject commit fa26d7c65406220dcd617275d89f4a804911874c From b0bd5b8174564bfac8f339b8f65d6173f48ab063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:24:49 +0100 Subject: [PATCH 061/179] Coyp over files from webapp repository --- .gitignore | 3 + cypress/fixtures/example.json | 5 ++ cypress/integration/login/login.spec.js | 73 +++++++++++++++++++++++++ cypress/plugins/index.js | 17 ++++++ cypress/support/commands.js | 25 +++++++++ cypress/support/index.js | 20 +++++++ 6 files changed, 143 insertions(+) create mode 100644 cypress/fixtures/example.json create mode 100644 cypress/integration/login/login.spec.js create mode 100644 cypress/plugins/index.js create mode 100644 cypress/support/commands.js create mode 100644 cypress/support/index.js diff --git a/.gitignore b/.gitignore index 1d0565198..85e3cf3f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /.github + +cypress/videos +cypress/screenshots/ diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 000000000..da18d9352 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} \ No newline at end of file diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js new file mode 100644 index 000000000..33054bb7d --- /dev/null +++ b/cypress/integration/login/login.spec.js @@ -0,0 +1,73 @@ +/// + +const loginTestUser = function () { + // Visiting our app before each test removes any state build up from + cy.visit('http://localhost:3000/') + .get('.layout-blank') + .should('be.visible') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('input[name=email]') + .as('inputEmail') + .should('be.empty') + .and('have.attr', 'placeholder', 'Deine E-Mail') + .trigger('focus') + .type('user@example.org') + + cy.get('input[name=password]') + .as('inputPassword') + .should('be.empty') + // .and('have.attr', 'placeholder', 'Dein Passwort') + .trigger('focus') + .type('1234') + + cy.get('button[name=submit]') + .as('submitButton') + .should('be.visible') + .and('not.be.disabled') + .click() + + cy.get('@submitButton') + .should('be.disabled') + // .next('.snackbar') + + cy.get('.layout-default') + + cy.location('pathname') + .should('eq', '/') +} + +const logout = function () { + cy.visit('http://localhost:3000/logout') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('.layout-blank') + .should('be.visible') +} + +context('Authentication', () => { + it('Login Testuser', loginTestUser) + + it('Login & Logout', function () { + // login + loginTestUser() + + // logout + logout() + }) + + it('Still logged in after page-reload', function () { + // login + loginTestUser() + + cy.reload() + .get('.layout-default') + + // logout + // logout() + }) +}) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js new file mode 100644 index 000000000..fd170fba6 --- /dev/null +++ b/cypress/plugins/index.js @@ -0,0 +1,17 @@ +// *********************************************************** +// This example plugins/index.js can be used to load plugins +// +// You can change the location of this file or turn off loading +// the plugins file with the 'pluginsFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/plugins-guide +// *********************************************************** + +// This function is called when a project is opened or re-opened (e.g. due to +// the project's config changing) + +module.exports = (on, config) => { + // `on` is used to hook into various events Cypress emits + // `config` is the resolved Cypress config +} diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 000000000..c1f5a772e --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,25 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add("login", (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This is will overwrite an existing command -- +// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/cypress/support/index.js b/cypress/support/index.js new file mode 100644 index 000000000..d68db96df --- /dev/null +++ b/cypress/support/index.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/index.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands' + +// Alternatively you can use CommonJS syntax: +// require('./commands') From 0243bfbec2aac27d855eebb8bf5857418c4fd9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:26:07 +0100 Subject: [PATCH 062/179] Start with a .travis.yml and cypress run Build failures are expected --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..6387d429d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: node_js +node_js: + - "10" +cache: + yarn: true + directories: + - node_modules +services: + - docker + - neo4j + +install: + - git submodule update --remote --merge + - yarn global add cypress + +script: + - cypress run From 2d346448b37e84a6c177642110a09b00c74f81c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:44:35 +0100 Subject: [PATCH 063/179] Use https for submodules to avoid SSH key exchange --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 51e69c525..b2bde5a9f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/Human-Connection/API.git [submodule "Nitro-Web"] path = Nitro-Web - url = git@github.com:Human-Connection/Nitro-Web.git + url = https://github.com/Human-Connection/Nitro-Web.git [submodule "Nitro-Backend"] path = Nitro-Backend - url = git@github.com:Human-Connection/Nitro-Backend.git + url = https://github.com/Human-Connection/Nitro-Backend.git From 3b807c5d050b8a3404cc8cb68cc0aec8d280ae97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:50:33 +0100 Subject: [PATCH 064/179] Add missing cypress.json --- cypress.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 cypress.json diff --git a/cypress.json b/cypress.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/cypress.json @@ -0,0 +1 @@ +{} From 203ab4b0c5aa1832d1debe2dfbb4cd0e0a5e86e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:53:42 +0100 Subject: [PATCH 065/179] Starting docker-containers in both repos --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6387d429d..68532110b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,9 @@ install: - git submodule update --remote --merge - yarn global add cypress +before_install: + - cd Nitro-Backend && docker-compose start + - cd Nitro-Web && docker-compose start + script: - cypress run From 54b92c465f6046810202d2f554a273119d3b0001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:58:03 +0100 Subject: [PATCH 066/179] Update docker-compose on Travis CI --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 68532110b..ff610266c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,16 @@ services: - docker - neo4j +env: + - DOCKER_COMPOSE_VERSION=1.23.2 + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + + install: - git submodule update --remote --merge - yarn global add cypress From e783acf97c377d8d84f41a2dccf44eb21a744f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 16:00:51 +0100 Subject: [PATCH 067/179] Fix .yaml format --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff610266c..98e2b320f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,14 +18,12 @@ before_install: - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - install: - git submodule update --remote --merge - - yarn global add cypress - -before_install: - cd Nitro-Backend && docker-compose start - cd Nitro-Web && docker-compose start + - yarn global add cypress + script: - cypress run From fa617955d3c670465d1f4fb3d2d1086b1e28899d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:19:42 +0100 Subject: [PATCH 068/179] Up the containers and send to background --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98e2b320f..d10012b19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose start - - cd Nitro-Web && docker-compose start + - cd Nitro-Backend && docker-compose up -d + - cd Nitro-Web && docker-compose up -d - yarn global add cypress From 255f563206d5529385550584f4e6131298656df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:22:39 +0100 Subject: [PATCH 069/179] Ok, don't run neo4j to keep port 7687 up --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d10012b19..d9af5f64b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ cache: - node_modules services: - docker - - neo4j env: - DOCKER_COMPOSE_VERSION=1.23.2 From ce07ece4d61b0fc5ddd61dee9a5f572833f2504c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:29:39 +0100 Subject: [PATCH 070/179] Go back the directory tree --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d9af5f64b..9c10fced9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose up -d + - cd Nitro-Backend && docker-compose up -d && cd .. - cd Nitro-Web && docker-compose up -d - yarn global add cypress From e1137bd03f3606e2393474e93a585c52e28fa236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:47:58 +0100 Subject: [PATCH 071/179] Again one level up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c10fced9..d6245e739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: install: - git submodule update --remote --merge - cd Nitro-Backend && docker-compose up -d && cd .. - - cd Nitro-Web && docker-compose up -d + - cd Nitro-Web && docker-compose up -d && cd .. - yarn global add cypress From 9b4279c162651d96fdd6d754c8278c8b35476fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:39:55 +0100 Subject: [PATCH 072/179] Wait on port 3000 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6245e739..427b99d9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ install: - cd Nitro-Backend && docker-compose up -d && cd .. - cd Nitro-Web && docker-compose up -d && cd .. - yarn global add cypress - + - yarn global add wait-on script: + - wait-on tcp:3000 - cypress run From cb215b850a2d0e6d9a713a16855f765e8273c9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:51:13 +0100 Subject: [PATCH 073/179] Maybe `localhost` is not available on Travis CI? --- cypress/integration/login/login.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js index 33054bb7d..b608cfc4c 100644 --- a/cypress/integration/login/login.spec.js +++ b/cypress/integration/login/login.spec.js @@ -2,7 +2,7 @@ const loginTestUser = function () { // Visiting our app before each test removes any state build up from - cy.visit('http://localhost:3000/') + cy.visit('http://127.0.0.1:3000/') .get('.layout-blank') .should('be.visible') @@ -40,7 +40,7 @@ const loginTestUser = function () { } const logout = function () { - cy.visit('http://localhost:3000/logout') + cy.visit('http://127.0.0.1:3000/logout') cy.location('pathname') .should('contain', '/login') From 8ce9dedc0631dec13c462d659b2ef494e662afa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:54:23 +0100 Subject: [PATCH 074/179] Remove one `&` to increase build time? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 427b99d9a..0042a49a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose up -d && cd .. - - cd Nitro-Web && docker-compose up -d && cd .. + - cd Nitro-Backend && docker-compose up -d & cd .. + - cd Nitro-Web && docker-compose up -d & & cd .. - yarn global add cypress - yarn global add wait-on From 61e1a474a80615a90a041dc078eaf55a956baf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:56:54 +0100 Subject: [PATCH 075/179] Merge all docker-compose files --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0042a49a3..6200fc5a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose up -d & cd .. - - cd Nitro-Web && docker-compose up -d & & cd .. + - docker-compose -f Nitro-Backend/docker-compose.yml -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress - yarn global add wait-on From d801e679e6e5e122afa5f9db43ddbe7c7ec00e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 02:19:22 +0100 Subject: [PATCH 076/179] Current dir relative to first docker-compose.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6200fc5a0..6a05a11b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ before_install: install: - git submodule update --remote --merge - - docker-compose -f Nitro-Backend/docker-compose.yml -f Nitro-Web/docker-compose.yml up -d + - docker-compose -f Nitro-Backend/docker-compose.yml up -d + - docker-compose -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress - yarn global add wait-on From 266072bcc9cb8eca7695d6f4c0fa63d516e9aab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 02:32:46 +0100 Subject: [PATCH 077/179] Wait for http connection instead of tcp --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a05a11b9..bf28e8fb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,8 @@ install: - git submodule update --remote --merge - docker-compose -f Nitro-Backend/docker-compose.yml up -d - docker-compose -f Nitro-Web/docker-compose.yml up -d - - yarn global add cypress - - yarn global add wait-on + - yarn global add cypress wait-on script: - - wait-on tcp:3000 + - wait-on http://localhost:3000 - cypress run From d2cde2154f0a002f7cbd087ca0f7bf7d2b45e09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 11:46:51 +0100 Subject: [PATCH 078/179] Update submodules Backend is now on a commit that has npm-run-all which allows to run seed data in docker-compose. --- Nitro-Backend | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Backend b/Nitro-Backend index 4a8d3a67a..46080fff9 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf +Subproject commit 46080fff98d5faae49d73beb1e19f0889a415642 diff --git a/Nitro-Web b/Nitro-Web index 8f42a1872..987fa33d5 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e +Subproject commit 987fa33d58ea1708528f926511245a83eb221fce From 6ce9406188f41f0f745e95a67912f8fcad362f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 11:48:34 +0100 Subject: [PATCH 079/179] And run seed data on Travis CI --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bf28e8fb2..b6d929be6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,5 +24,6 @@ install: - yarn global add cypress wait-on script: + - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed - wait-on http://localhost:3000 - cypress run From 287aa96a3fa9354bb170cdeeb471dc2dcc30eab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 11:55:34 +0100 Subject: [PATCH 080/179] Don't update submodules --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6d929be6..293294218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ before_install: - sudo mv docker-compose /usr/local/bin install: - - git submodule update --remote --merge - docker-compose -f Nitro-Backend/docker-compose.yml up -d - docker-compose -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress wait-on From 4b8ac0836c1eb34ea579b0f2120469e9b46467a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 12:08:27 +0100 Subject: [PATCH 081/179] Revert "Maybe `localhost` is not available on Travis CI?" This reverts commit cb215b850a2d0e6d9a713a16855f765e8273c9e5. --- cypress/integration/login/login.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js index b608cfc4c..33054bb7d 100644 --- a/cypress/integration/login/login.spec.js +++ b/cypress/integration/login/login.spec.js @@ -2,7 +2,7 @@ const loginTestUser = function () { // Visiting our app before each test removes any state build up from - cy.visit('http://127.0.0.1:3000/') + cy.visit('http://localhost:3000/') .get('.layout-blank') .should('be.visible') @@ -40,7 +40,7 @@ const loginTestUser = function () { } const logout = function () { - cy.visit('http://127.0.0.1:3000/logout') + cy.visit('http://localhost:3000/logout') cy.location('pathname') .should('contain', '/login') From 0abdb80b00fa8f2369c44b22e69dff268b2e18ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 12:54:04 +0100 Subject: [PATCH 082/179] Update Nitro-Web so cypress can find email input --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 987fa33d5..8f02861b7 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 987fa33d58ea1708528f926511245a83eb221fce +Subproject commit 8f02861b7418b0e8931d4c5b347406b8a2d97b6e From bc5d75261bc5e59572902f582fdd16eac65978a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 13:26:28 +0100 Subject: [PATCH 083/179] Wire frontend and backend together --- Nitro-Backend | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Backend b/Nitro-Backend index 46080fff9..94dbe5bf8 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 46080fff98d5faae49d73beb1e19f0889a415642 +Subproject commit 94dbe5bf82d276f95b37ab758366d52b78aa2bb2 diff --git a/Nitro-Web b/Nitro-Web index 8f02861b7..3f435194d 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 8f02861b7418b0e8931d4c5b347406b8a2d97b6e +Subproject commit 3f435194d1862e64e26ab57ddc133a49d260b364 From ef816b2d10835ef141d55eedc96cb2a0a571d5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 13:37:42 +0100 Subject: [PATCH 084/179] Wrong network name in Nitro-Backend --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 94dbe5bf8..d8e326d8f 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 94dbe5bf82d276f95b37ab758366d52b78aa2bb2 +Subproject commit d8e326d8f8a7b0c00e350b64f13da7b9fe9e8299 From e102b6e3fe6b31d635bfd6612a94b7709e6f81a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 22:12:04 +0100 Subject: [PATCH 085/179] Update submodules --- Nitro-Backend | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Backend b/Nitro-Backend index d8e326d8f..99a9d5159 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit d8e326d8f8a7b0c00e350b64f13da7b9fe9e8299 +Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 diff --git a/Nitro-Web b/Nitro-Web index 3f435194d..d4d0eb88c 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 3f435194d1862e64e26ab57ddc133a49d260b364 +Subproject commit d4d0eb88cf369d5afa71faf04dc29d6aa8c1385d From 01497dddaafbdde0a3872df5f1e9fc3f487ca613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 22:47:43 +0100 Subject: [PATCH 086/179] Reduce verbosity of database seeding --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 293294218..95cce90b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,6 @@ install: - yarn global add cypress wait-on script: - - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed + - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - cypress run From d461238d2e77cc5c3b2224e7fdf8f0335170bd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 23:19:13 +0100 Subject: [PATCH 087/179] This should be the first green build --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index d4d0eb88c..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit d4d0eb88cf369d5afa71faf04dc29d6aa8c1385d +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 From 3802780ffde83fd4951840006d5a542fa9f57bd3 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Sun, 9 Dec 2018 18:02:00 +0100 Subject: [PATCH 088/179] record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs --- .travis.yml | 2 +- cypress.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95cce90b5..25e9ad58c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ install: script: - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - - cypress run + - cypress run --record --key $CYPRESS_TOKEN diff --git a/cypress.json b/cypress.json index 0967ef424..1f453389b 100644 --- a/cypress.json +++ b/cypress.json @@ -1 +1,3 @@ -{} +{ + "projectId": "qa7fe2" +} From 33290c32e0ad25d390fc1800850c274ceeea47fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 14:54:39 +0100 Subject: [PATCH 089/179] Add Nitro-Web and Nitro-Backend as submodules --- .gitmodules | 6 ++++++ API | 2 +- Nitro-Backend | 1 + Nitro-Web | 1 + WebApp | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 Nitro-Backend create mode 160000 Nitro-Web diff --git a/.gitmodules b/.gitmodules index 8161c1c4e..51e69c525 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "API"] path = API url = https://github.com/Human-Connection/API.git +[submodule "Nitro-Web"] + path = Nitro-Web + url = git@github.com:Human-Connection/Nitro-Web.git +[submodule "Nitro-Backend"] + path = Nitro-Backend + url = git@github.com:Human-Connection/Nitro-Backend.git diff --git a/API b/API index 8ea42b5b4..02dcc2285 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8ea42b5b40dd16958b0887eb7bb9a70ec76909e6 +Subproject commit 02dcc2285c71ce8010ec0952a303e9a9f5e05798 diff --git a/Nitro-Backend b/Nitro-Backend new file mode 160000 index 000000000..4a8d3a67a --- /dev/null +++ b/Nitro-Backend @@ -0,0 +1 @@ +Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf diff --git a/Nitro-Web b/Nitro-Web new file mode 160000 index 000000000..8f42a1872 --- /dev/null +++ b/Nitro-Web @@ -0,0 +1 @@ +Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e diff --git a/WebApp b/WebApp index 6f88ca733..fa26d7c65 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 6f88ca733fb09a4506fe12bb89c4557ce501e98d +Subproject commit fa26d7c65406220dcd617275d89f4a804911874c From 579cc3492c40d8453865e3fda08971961b277580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:24:49 +0100 Subject: [PATCH 090/179] Coyp over files from webapp repository --- .gitignore | 3 + .gitmodules | 4 +- .travis.yml | 28 ++++++++++ Nitro-Backend | 2 +- Nitro-Web | 2 +- cypress.json | 1 + cypress/fixtures/example.json | 5 ++ cypress/integration/login/login.spec.js | 73 +++++++++++++++++++++++++ cypress/plugins/index.js | 17 ++++++ cypress/support/commands.js | 25 +++++++++ cypress/support/index.js | 20 +++++++ 11 files changed, 176 insertions(+), 4 deletions(-) create mode 100644 .travis.yml create mode 100644 cypress.json create mode 100644 cypress/fixtures/example.json create mode 100644 cypress/integration/login/login.spec.js create mode 100644 cypress/plugins/index.js create mode 100644 cypress/support/commands.js create mode 100644 cypress/support/index.js diff --git a/.gitignore b/.gitignore index 1d0565198..85e3cf3f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /.github + +cypress/videos +cypress/screenshots/ diff --git a/.gitmodules b/.gitmodules index 51e69c525..b2bde5a9f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/Human-Connection/API.git [submodule "Nitro-Web"] path = Nitro-Web - url = git@github.com:Human-Connection/Nitro-Web.git + url = https://github.com/Human-Connection/Nitro-Web.git [submodule "Nitro-Backend"] path = Nitro-Backend - url = git@github.com:Human-Connection/Nitro-Backend.git + url = https://github.com/Human-Connection/Nitro-Backend.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..95cce90b5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,28 @@ +language: node_js +node_js: + - "10" +cache: + yarn: true + directories: + - node_modules +services: + - docker + +env: + - DOCKER_COMPOSE_VERSION=1.23.2 + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + +install: + - docker-compose -f Nitro-Backend/docker-compose.yml up -d + - docker-compose -f Nitro-Web/docker-compose.yml up -d + - yarn global add cypress wait-on + +script: + - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null + - wait-on http://localhost:3000 + - cypress run diff --git a/Nitro-Backend b/Nitro-Backend index 4a8d3a67a..99a9d5159 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf +Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 diff --git a/Nitro-Web b/Nitro-Web index 8f42a1872..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 diff --git a/cypress.json b/cypress.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/cypress.json @@ -0,0 +1 @@ +{} diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 000000000..da18d9352 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} \ No newline at end of file diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js new file mode 100644 index 000000000..33054bb7d --- /dev/null +++ b/cypress/integration/login/login.spec.js @@ -0,0 +1,73 @@ +/// + +const loginTestUser = function () { + // Visiting our app before each test removes any state build up from + cy.visit('http://localhost:3000/') + .get('.layout-blank') + .should('be.visible') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('input[name=email]') + .as('inputEmail') + .should('be.empty') + .and('have.attr', 'placeholder', 'Deine E-Mail') + .trigger('focus') + .type('user@example.org') + + cy.get('input[name=password]') + .as('inputPassword') + .should('be.empty') + // .and('have.attr', 'placeholder', 'Dein Passwort') + .trigger('focus') + .type('1234') + + cy.get('button[name=submit]') + .as('submitButton') + .should('be.visible') + .and('not.be.disabled') + .click() + + cy.get('@submitButton') + .should('be.disabled') + // .next('.snackbar') + + cy.get('.layout-default') + + cy.location('pathname') + .should('eq', '/') +} + +const logout = function () { + cy.visit('http://localhost:3000/logout') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('.layout-blank') + .should('be.visible') +} + +context('Authentication', () => { + it('Login Testuser', loginTestUser) + + it('Login & Logout', function () { + // login + loginTestUser() + + // logout + logout() + }) + + it('Still logged in after page-reload', function () { + // login + loginTestUser() + + cy.reload() + .get('.layout-default') + + // logout + // logout() + }) +}) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js new file mode 100644 index 000000000..fd170fba6 --- /dev/null +++ b/cypress/plugins/index.js @@ -0,0 +1,17 @@ +// *********************************************************** +// This example plugins/index.js can be used to load plugins +// +// You can change the location of this file or turn off loading +// the plugins file with the 'pluginsFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/plugins-guide +// *********************************************************** + +// This function is called when a project is opened or re-opened (e.g. due to +// the project's config changing) + +module.exports = (on, config) => { + // `on` is used to hook into various events Cypress emits + // `config` is the resolved Cypress config +} diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 000000000..c1f5a772e --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,25 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add("login", (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This is will overwrite an existing command -- +// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/cypress/support/index.js b/cypress/support/index.js new file mode 100644 index 000000000..d68db96df --- /dev/null +++ b/cypress/support/index.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/index.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands' + +// Alternatively you can use CommonJS syntax: +// require('./commands') From f43458ba3d42eceb6d9c2c7c0243a2c90849020d Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Sun, 9 Dec 2018 18:02:00 +0100 Subject: [PATCH 091/179] record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs --- .travis.yml | 2 +- cypress.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95cce90b5..25e9ad58c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ install: script: - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - - cypress run + - cypress run --record --key $CYPRESS_TOKEN diff --git a/cypress.json b/cypress.json index 0967ef424..1f453389b 100644 --- a/cypress.json +++ b/cypress.json @@ -1 +1,3 @@ -{} +{ + "projectId": "qa7fe2" +} From 0a8aadbb2dae438de0c2692d11efeaa8019db1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sun, 9 Dec 2018 23:23:36 +0100 Subject: [PATCH 092/179] Check out a common branch through environment var This will be useful if we trigger the build through the Travis CI API where we can alter the environment variables in the request. --- .travis.yml | 5 ++++- scripts/trigger.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 scripts/trigger.sh diff --git a/.travis.yml b/.travis.yml index 25e9ad58c..489d0cc75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ services: - docker env: - - DOCKER_COMPOSE_VERSION=1.23.2 + global: + - DOCKER_COMPOSE_VERSION=1.23.2 + - COMMON_BRANCH=master before_install: - sudo rm /usr/local/bin/docker-compose @@ -18,6 +20,7 @@ before_install: - sudo mv docker-compose /usr/local/bin install: + - git submodule foreach "git checkout $COMMON_BRANCH || echo 'Branch \`$COMMON_BRANCH\` does not exist, falling back to master.'" - docker-compose -f Nitro-Backend/docker-compose.yml up -d - docker-compose -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress wait-on diff --git a/scripts/trigger.sh b/scripts/trigger.sh new file mode 100755 index 000000000..ef430dc2c --- /dev/null +++ b/scripts/trigger.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +body=$(cat<< EOF +{ + "request": { + "branch":"e2e", + "message": "Triggered by \`$TRAVIS_REPO_SLUG\` on \`$TRAVIS_BRANCH\`", + "config": { + "merge_mode": "deep_merge", + "env": { + "global": { + "DOCKER_COMPOSE_VERSION":"1.23.2", + "COMMON_BRANCH": "$TRAVIS_BRANCH" + } + } + } + } +} +EOF +) + +curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token $TRAVIS_TOKEN" \ + -d "$body" \ + https://api.travis-ci.com/repo/Human-Connection%2FHuman-Connection/requests From 4489bbe662c2caf3e5be06d425d3a147c05fd57b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 10 Dec 2018 00:27:55 +0100 Subject: [PATCH 093/179] Use `export` for Travis variable for convenience This way, we don't need to set the environment variable in the `trigger_build.sh` script. --- .travis.yml | 5 ++--- scripts/{trigger.sh => trigger_build.sh} | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) rename scripts/{trigger.sh => trigger_build.sh} (81%) mode change 100755 => 100644 diff --git a/.travis.yml b/.travis.yml index 489d0cc75..de984cc66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ services: - docker env: - global: - - DOCKER_COMPOSE_VERSION=1.23.2 - - COMMON_BRANCH=master + - COMMON_BRANCH=master before_install: + - export DOCKER_COMPOSE_VERSION=1.23.2 - sudo rm /usr/local/bin/docker-compose - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose diff --git a/scripts/trigger.sh b/scripts/trigger_build.sh old mode 100755 new mode 100644 similarity index 81% rename from scripts/trigger.sh rename to scripts/trigger_build.sh index ef430dc2c..bac40e3a0 --- a/scripts/trigger.sh +++ b/scripts/trigger_build.sh @@ -8,10 +8,7 @@ body=$(cat<< EOF "config": { "merge_mode": "deep_merge", "env": { - "global": { - "DOCKER_COMPOSE_VERSION":"1.23.2", - "COMMON_BRANCH": "$TRAVIS_BRANCH" - } + "COMMON_BRANCH": "$TRAVIS_BRANCH" } } } From 6e9348a6d3580afff8051e4228fa9551606c058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 10 Dec 2018 00:30:31 +0100 Subject: [PATCH 094/179] Set executable permission on `trigger_build.sh` --- scripts/trigger_build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/trigger_build.sh diff --git a/scripts/trigger_build.sh b/scripts/trigger_build.sh old mode 100644 new mode 100755 From 4c9d906f4778f656ac8898c612bbdab47a5258e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 10 Dec 2018 04:21:25 +0000 Subject: [PATCH 095/179] Bump API from `8ea42b5` to `97d640d` Bumps [API](https://github.com/Human-Connection/API) from `8ea42b5` to `97d640d`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/8ea42b5b40dd16958b0887eb7bb9a70ec76909e6...97d640d58375555044ec55e22ccf61d87ef4d80d) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 8ea42b5b4..97d640d58 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8ea42b5b40dd16958b0887eb7bb9a70ec76909e6 +Subproject commit 97d640d58375555044ec55e22ccf61d87ef4d80d From 2d330e5b85bfae216c627b40f040d1215f23a933 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Mon, 10 Dec 2018 13:24:55 +0100 Subject: [PATCH 096/179] removed fixed branch in triffer_build.sh --- scripts/trigger_build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/trigger_build.sh b/scripts/trigger_build.sh index bac40e3a0..53519dda4 100755 --- a/scripts/trigger_build.sh +++ b/scripts/trigger_build.sh @@ -3,7 +3,6 @@ body=$(cat<< EOF { "request": { - "branch":"e2e", "message": "Triggered by \`$TRAVIS_REPO_SLUG\` on \`$TRAVIS_BRANCH\`", "config": { "merge_mode": "deep_merge", From 6b8433e54b943501a74672c1a6e66aa1b987e329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 10 Dec 2018 15:15:54 +0100 Subject: [PATCH 097/179] Add build status to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fd0237fc9..bc7bae6c0 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ # 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 211fdb97086d17d64d8029702214364550f8af82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Dec 2018 04:22:36 +0000 Subject: [PATCH 098/179] Bump Nitro-Backend from `99a9d51` to `bed0f81` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `99a9d51` to `bed0f81`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/99a9d51596a8f3575d8637754af45a01992a37a0...bed0f819ffcc8c3a28042e13cecc52d42a0eb143) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 99a9d5159..bed0f819f 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 +Subproject commit bed0f819ffcc8c3a28042e13cecc52d42a0eb143 From 99ab380706308d634ef83a6c15c0d2b56d7c8815 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Dec 2018 04:22:36 +0000 Subject: [PATCH 099/179] Bump Nitro-Web from `64abd76` to `22354ce` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `64abd76` to `22354ce`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/64abd767e2bae0579ae776dba70d23db4b978c10...22354ce86584a356233cf0d085507b3639f51275) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 64abd767e..22354ce86 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 +Subproject commit 22354ce86584a356233cf0d085507b3639f51275 From e158747c3fa1d51e18fb906d2d102aa67bbd7b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 12 Dec 2018 00:58:02 +0100 Subject: [PATCH 100/179] Delete remainings of cypress tests --- .gitignore | 3 - .travis.yml | 30 ---------- Nitro-Backend | 2 +- Nitro-Web | 2 +- cypress.json | 3 - cypress/fixtures/example.json | 5 -- cypress/integration/login/login.spec.js | 73 ------------------------- cypress/plugins/index.js | 17 ------ cypress/support/commands.js | 25 --------- cypress/support/index.js | 20 ------- scripts/trigger_build.sh | 24 -------- 11 files changed, 2 insertions(+), 202 deletions(-) delete mode 100644 .travis.yml delete mode 100644 cypress.json delete mode 100644 cypress/fixtures/example.json delete mode 100644 cypress/integration/login/login.spec.js delete mode 100644 cypress/plugins/index.js delete mode 100644 cypress/support/commands.js delete mode 100644 cypress/support/index.js delete mode 100755 scripts/trigger_build.sh diff --git a/.gitignore b/.gitignore index 85e3cf3f7..1d0565198 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ /.github - -cypress/videos -cypress/screenshots/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index de984cc66..000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: node_js -node_js: - - "10" -cache: - yarn: true - directories: - - node_modules -services: - - docker - -env: - - COMMON_BRANCH=master - -before_install: - - export DOCKER_COMPOSE_VERSION=1.23.2 - - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - - chmod +x docker-compose - - sudo mv docker-compose /usr/local/bin - -install: - - git submodule foreach "git checkout $COMMON_BRANCH || echo 'Branch \`$COMMON_BRANCH\` does not exist, falling back to master.'" - - docker-compose -f Nitro-Backend/docker-compose.yml up -d - - docker-compose -f Nitro-Web/docker-compose.yml up -d - - yarn global add cypress wait-on - -script: - - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - - wait-on http://localhost:3000 - - cypress run --record --key $CYPRESS_TOKEN diff --git a/Nitro-Backend b/Nitro-Backend index bed0f819f..99a9d5159 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit bed0f819ffcc8c3a28042e13cecc52d42a0eb143 +Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 diff --git a/Nitro-Web b/Nitro-Web index 22354ce86..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 22354ce86584a356233cf0d085507b3639f51275 +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 1f453389b..000000000 --- a/cypress.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projectId": "qa7fe2" -} diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json deleted file mode 100644 index da18d9352..000000000 --- a/cypress/fixtures/example.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io", - "body": "Fixtures are a great way to mock data for responses to routes" -} \ No newline at end of file diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js deleted file mode 100644 index 33054bb7d..000000000 --- a/cypress/integration/login/login.spec.js +++ /dev/null @@ -1,73 +0,0 @@ -/// - -const loginTestUser = function () { - // Visiting our app before each test removes any state build up from - cy.visit('http://localhost:3000/') - .get('.layout-blank') - .should('be.visible') - - cy.location('pathname') - .should('contain', '/login') - - cy.get('input[name=email]') - .as('inputEmail') - .should('be.empty') - .and('have.attr', 'placeholder', 'Deine E-Mail') - .trigger('focus') - .type('user@example.org') - - cy.get('input[name=password]') - .as('inputPassword') - .should('be.empty') - // .and('have.attr', 'placeholder', 'Dein Passwort') - .trigger('focus') - .type('1234') - - cy.get('button[name=submit]') - .as('submitButton') - .should('be.visible') - .and('not.be.disabled') - .click() - - cy.get('@submitButton') - .should('be.disabled') - // .next('.snackbar') - - cy.get('.layout-default') - - cy.location('pathname') - .should('eq', '/') -} - -const logout = function () { - cy.visit('http://localhost:3000/logout') - - cy.location('pathname') - .should('contain', '/login') - - cy.get('.layout-blank') - .should('be.visible') -} - -context('Authentication', () => { - it('Login Testuser', loginTestUser) - - it('Login & Logout', function () { - // login - loginTestUser() - - // logout - logout() - }) - - it('Still logged in after page-reload', function () { - // login - loginTestUser() - - cy.reload() - .get('.layout-default') - - // logout - // logout() - }) -}) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js deleted file mode 100644 index fd170fba6..000000000 --- a/cypress/plugins/index.js +++ /dev/null @@ -1,17 +0,0 @@ -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -module.exports = (on, config) => { - // `on` is used to hook into various events Cypress emits - // `config` is the resolved Cypress config -} diff --git a/cypress/support/commands.js b/cypress/support/commands.js deleted file mode 100644 index c1f5a772e..000000000 --- a/cypress/support/commands.js +++ /dev/null @@ -1,25 +0,0 @@ -// *********************************************** -// This example commands.js shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: -// https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add("login", (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This is will overwrite an existing command -- -// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/cypress/support/index.js b/cypress/support/index.js deleted file mode 100644 index d68db96df..000000000 --- a/cypress/support/index.js +++ /dev/null @@ -1,20 +0,0 @@ -// *********************************************************** -// This example support/index.js is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import './commands' - -// Alternatively you can use CommonJS syntax: -// require('./commands') diff --git a/scripts/trigger_build.sh b/scripts/trigger_build.sh deleted file mode 100755 index 53519dda4..000000000 --- a/scripts/trigger_build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -body=$(cat<< EOF -{ - "request": { - "message": "Triggered by \`$TRAVIS_REPO_SLUG\` on \`$TRAVIS_BRANCH\`", - "config": { - "merge_mode": "deep_merge", - "env": { - "COMMON_BRANCH": "$TRAVIS_BRANCH" - } - } - } -} -EOF -) - -curl -s -X POST \ - -H "Content-Type: application/json" \ - -H "Accept: application/json" \ - -H "Travis-API-Version: 3" \ - -H "Authorization: token $TRAVIS_TOKEN" \ - -d "$body" \ - https://api.travis-ci.com/repo/Human-Connection%2FHuman-Connection/requests From 4b3bab797922157323287f8f1d5856630f02d955 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 12 Dec 2018 04:27:01 +0000 Subject: [PATCH 101/179] Bump Nitro-Web from `22354ce` to `6f782ef` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `22354ce` to `6f782ef`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/22354ce86584a356233cf0d085507b3639f51275...6f782efbfbecb20e5957533430ec27520538aa49) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 22354ce86..6f782efbf 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 22354ce86584a356233cf0d085507b3639f51275 +Subproject commit 6f782efbfbecb20e5957533430ec27520538aa49 From 3de6b6623fe7ed8bab92c9aaec5a39c7917b576c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 13 Dec 2018 04:40:36 +0000 Subject: [PATCH 102/179] Bump Nitro-Web from `64abd76` to `40e1ab3` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `64abd76` to `40e1ab3`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/64abd767e2bae0579ae776dba70d23db4b978c10...40e1ab3483135792246e13e9310c0cdcf0827792) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 64abd767e..40e1ab348 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 +Subproject commit 40e1ab3483135792246e13e9310c0cdcf0827792 From b4e1e1f44ed8cc022e4e36e6073a73738512e98b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 13 Dec 2018 04:40:37 +0000 Subject: [PATCH 103/179] Bump Nitro-Backend from `99a9d51` to `766be0b` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `99a9d51` to `766be0b`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/99a9d51596a8f3575d8637754af45a01992a37a0...766be0bb800aa064649e25a12c9f480296cb9afb) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 99a9d5159..766be0bb8 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 +Subproject commit 766be0bb800aa064649e25a12c9f480296cb9afb From 1e15c3eacc170edd88bd72e95142baa7982f7643 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 14 Dec 2018 04:43:10 +0000 Subject: [PATCH 104/179] Bump Nitro-Backend from `766be0b` to `75bb73a` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `766be0b` to `75bb73a`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/766be0bb800aa064649e25a12c9f480296cb9afb...75bb73a5f87448b569a94bbf4295f4d258acd1e9) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 766be0bb8..75bb73a5f 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 766be0bb800aa064649e25a12c9f480296cb9afb +Subproject commit 75bb73a5f87448b569a94bbf4295f4d258acd1e9 From 2fd4e4b3424b7f0ac3b5be92a2003ccc7a086c39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 14 Dec 2018 04:43:11 +0000 Subject: [PATCH 105/179] Bump Nitro-Web from `40e1ab3` to `010bac5` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `40e1ab3` to `010bac5`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/40e1ab3483135792246e13e9310c0cdcf0827792...010bac50abb2deadc965a06885ba846f5d150e50) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 40e1ab348..010bac50a 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 40e1ab3483135792246e13e9310c0cdcf0827792 +Subproject commit 010bac50abb2deadc965a06885ba846f5d150e50 From d1972719f87b9e9c3abc563fc7e92cb2d29634ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 17 Dec 2018 04:57:10 +0000 Subject: [PATCH 106/179] Bump Nitro-Web from `010bac5` to `7a14979` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `010bac5` to `7a14979`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/010bac50abb2deadc965a06885ba846f5d150e50...7a149793e9a251d10e1edfe7e56f8dc5b4836a1f) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 010bac50a..7a149793e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 010bac50abb2deadc965a06885ba846f5d150e50 +Subproject commit 7a149793e9a251d10e1edfe7e56f8dc5b4836a1f From 07abdd734e5e8cf0a4bd75cfb06a51d62e69fd36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 17 Dec 2018 04:57:11 +0000 Subject: [PATCH 107/179] Bump Nitro-Backend from `75bb73a` to `1539d9a` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `75bb73a` to `1539d9a`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/75bb73a5f87448b569a94bbf4295f4d258acd1e9...1539d9ac91223995ec41dd5046b46eb7d1f5fef5) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 75bb73a5f..1539d9ac9 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 75bb73a5f87448b569a94bbf4295f4d258acd1e9 +Subproject commit 1539d9ac91223995ec41dd5046b46eb7d1f5fef5 From 120861a294cec8d66792e37582e9725154429f29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 18 Dec 2018 04:43:01 +0000 Subject: [PATCH 108/179] Bump Nitro-Backend from `1539d9a` to `5f133a2` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `1539d9a` to `5f133a2`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/1539d9ac91223995ec41dd5046b46eb7d1f5fef5...5f133a2d4847a0d380f715cabfa4fb8e1bf52fff) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 1539d9ac9..5f133a2d4 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 1539d9ac91223995ec41dd5046b46eb7d1f5fef5 +Subproject commit 5f133a2d4847a0d380f715cabfa4fb8e1bf52fff From 1e3970c340de1e5f75a8742689b6a231ff60875f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 18 Dec 2018 04:43:02 +0000 Subject: [PATCH 109/179] Bump Nitro-Web from `7a14979` to `679f4bd` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `7a14979` to `679f4bd`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/7a149793e9a251d10e1edfe7e56f8dc5b4836a1f...679f4bddbe03b5b2599dcb27c26d2f5d7baeae94) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 7a149793e..679f4bddb 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 7a149793e9a251d10e1edfe7e56f8dc5b4836a1f +Subproject commit 679f4bddbe03b5b2599dcb27c26d2f5d7baeae94 From 84bdb0ef13a2e85bfb5acc4b69e8ad95992c7495 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 19 Dec 2018 04:29:50 +0000 Subject: [PATCH 110/179] Bump Nitro-Backend from `5f133a2` to `618368c` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `5f133a2` to `618368c`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/5f133a2d4847a0d380f715cabfa4fb8e1bf52fff...618368cefe39832adbf065ad3d591ae8c613b8f2) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 5f133a2d4..618368cef 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 5f133a2d4847a0d380f715cabfa4fb8e1bf52fff +Subproject commit 618368cefe39832adbf065ad3d591ae8c613b8f2 From d16f65a6394152c5e2133c4fb1054c8d611596c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 20 Dec 2018 04:24:50 +0000 Subject: [PATCH 111/179] Bump Nitro-Backend from `618368c` to `f47b136` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `618368c` to `f47b136`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/618368cefe39832adbf065ad3d591ae8c613b8f2...f47b136232123527286918e2815643a8a28bd440) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 618368cef..f47b13623 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 618368cefe39832adbf065ad3d591ae8c613b8f2 +Subproject commit f47b136232123527286918e2815643a8a28bd440 From b666add8851d53c9611af6e3e30512e2c548de83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 21 Dec 2018 04:18:35 +0000 Subject: [PATCH 112/179] Bump Nitro-Backend from `f47b136` to `88341f5` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `f47b136` to `88341f5`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/f47b136232123527286918e2815643a8a28bd440...88341f5fce4a554ea770fd91b311523d8db12399) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index f47b13623..88341f5fc 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit f47b136232123527286918e2815643a8a28bd440 +Subproject commit 88341f5fce4a554ea770fd91b311523d8db12399 From 1b1fbe09d3d0e303356043e0ef0ef88a8263a5b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 25 Dec 2018 04:22:25 +0000 Subject: [PATCH 113/179] Bump Nitro-Web from `679f4bd` to `313538b` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `679f4bd` to `313538b`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/679f4bddbe03b5b2599dcb27c26d2f5d7baeae94...313538bd0c3b76aea8631bbb2824304042e6d0f1) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 679f4bddb..313538bd0 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 679f4bddbe03b5b2599dcb27c26d2f5d7baeae94 +Subproject commit 313538bd0c3b76aea8631bbb2824304042e6d0f1 From 8c77b3c97fc148a562465ce9dd2a3dd02a925453 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 27 Dec 2018 04:19:21 +0000 Subject: [PATCH 114/179] Bump Nitro-Backend from `88341f5` to `7593a09` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `88341f5` to `7593a09`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/88341f5fce4a554ea770fd91b311523d8db12399...7593a094e02021dee04b3df271b4248dd3380fbc) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 88341f5fc..7593a094e 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 88341f5fce4a554ea770fd91b311523d8db12399 +Subproject commit 7593a094e02021dee04b3df271b4248dd3380fbc From 53ec142fa9c4078f1e3e6f94c246e0291a70df80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 1 Jan 2019 04:28:08 +0000 Subject: [PATCH 115/179] Bump Nitro-Web from `313538b` to `a3171d3` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `313538b` to `a3171d3`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/313538bd0c3b76aea8631bbb2824304042e6d0f1...a3171d34492240019611a8dc59d6016cd9755027) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 313538bd0..a3171d344 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 313538bd0c3b76aea8631bbb2824304042e6d0f1 +Subproject commit a3171d34492240019611a8dc59d6016cd9755027 From 7d4bb9f099a35e3271d30aeb87959fa4160089d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 3 Jan 2019 04:16:32 +0000 Subject: [PATCH 116/179] Bump Nitro-Backend from `7593a09` to `a625118` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `7593a09` to `a625118`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/7593a094e02021dee04b3df271b4248dd3380fbc...a6251183c6ec1bd18f0c8df8699052a2eb84ef34) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 7593a094e..a6251183c 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 7593a094e02021dee04b3df271b4248dd3380fbc +Subproject commit a6251183c6ec1bd18f0c8df8699052a2eb84ef34 From 12ce15ef0f27360fbf14b9fdcd4addf3d93a8891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 4 Jan 2019 04:40:19 +0000 Subject: [PATCH 117/179] Bump Nitro-Backend from `a625118` to `3d3b3c8` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `a625118` to `3d3b3c8`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/a6251183c6ec1bd18f0c8df8699052a2eb84ef34...3d3b3c8c2468464e61b16b1c67640fdc7bf189b7) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index a6251183c..3d3b3c8c2 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit a6251183c6ec1bd18f0c8df8699052a2eb84ef34 +Subproject commit 3d3b3c8c2468464e61b16b1c67640fdc7bf189b7 From 907c64862bb66514ed8a2adc40b8086f23a18928 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 4 Jan 2019 04:40:20 +0000 Subject: [PATCH 118/179] Bump Nitro-Web from `a3171d3` to `d7f9769` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `a3171d3` to `d7f9769`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/a3171d34492240019611a8dc59d6016cd9755027...d7f9769e68ad973ab9420a31d55180650fa5b81a) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index a3171d344..d7f9769e6 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit a3171d34492240019611a8dc59d6016cd9755027 +Subproject commit d7f9769e68ad973ab9420a31d55180650fa5b81a From 78b8032d53879ef5702160b6254a1f6d94f2a046 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 8 Jan 2019 12:00:16 +0000 Subject: [PATCH 119/179] Bump Nitro-Backend from `3d3b3c8` to `a1b8d53` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `3d3b3c8` to `a1b8d53`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/3d3b3c8c2468464e61b16b1c67640fdc7bf189b7...a1b8d53e6e4f2791071b8d70d5d768e0c5e4158d) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 3d3b3c8c2..a1b8d53e6 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 3d3b3c8c2468464e61b16b1c67640fdc7bf189b7 +Subproject commit a1b8d53e6e4f2791071b8d70d5d768e0c5e4158d From b0de62a4669fff22f6464b2db02bb4e3a6fcb0ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 8 Jan 2019 12:00:23 +0000 Subject: [PATCH 120/179] Bump Nitro-Web from `d7f9769` to `717658f` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `d7f9769` to `717658f`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/d7f9769e68ad973ab9420a31d55180650fa5b81a...717658fd625b95168dc65eaa713c551f465243b1) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index d7f9769e6..717658fd6 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit d7f9769e68ad973ab9420a31d55180650fa5b81a +Subproject commit 717658fd625b95168dc65eaa713c551f465243b1 From 3c7ef15b18d05f3853790cc2e42692587b4722f0 Mon Sep 17 00:00:00 2001 From: Sam Joseph Date: Tue, 8 Jan 2019 13:37:53 +0000 Subject: [PATCH 121/179] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..19f3854c1 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at developer@human-connection.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ From 6471fed480e42e1030f4abcbb937d98b274b8bdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 9 Jan 2019 04:47:45 +0000 Subject: [PATCH 122/179] Bump Nitro-Backend from `a1b8d53` to `ae39c18` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `a1b8d53` to `ae39c18`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/a1b8d53e6e4f2791071b8d70d5d768e0c5e4158d...ae39c189805b639cf107f6f8ad7d42256321b1c6) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index a1b8d53e6..ae39c1898 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit a1b8d53e6e4f2791071b8d70d5d768e0c5e4158d +Subproject commit ae39c189805b639cf107f6f8ad7d42256321b1c6 From d11fcb24c855807b04328130b933235ff31ec369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 9 Jan 2019 04:47:45 +0000 Subject: [PATCH 123/179] Bump Nitro-Web from `717658f` to `349866f` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `717658f` to `349866f`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/717658fd625b95168dc65eaa713c551f465243b1...349866f20b9445d5a619e1142ef42d92e756f6bf) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 717658fd6..349866f20 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 717658fd625b95168dc65eaa713c551f465243b1 +Subproject commit 349866f20b9445d5a619e1142ef42d92e756f6bf From ac1a03557582845ba7bff872b615289cf05d2bf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 10 Jan 2019 04:26:13 +0000 Subject: [PATCH 124/179] Bump Nitro-Backend from `ae39c18` to `b2bad4f` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `ae39c18` to `b2bad4f`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/ae39c189805b639cf107f6f8ad7d42256321b1c6...b2bad4fedb33fcb35648e870002f5e93bf63cc0f) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index ae39c1898..b2bad4fed 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit ae39c189805b639cf107f6f8ad7d42256321b1c6 +Subproject commit b2bad4fedb33fcb35648e870002f5e93bf63cc0f From 9e91da1c6a73784142ccd06cb867bd39e38467d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 10 Jan 2019 04:26:14 +0000 Subject: [PATCH 125/179] Bump Nitro-Web from `349866f` to `11bc54b` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `349866f` to `11bc54b`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/349866f20b9445d5a619e1142ef42d92e756f6bf...11bc54b851c4c1d8b43301c57211a11dcba0e414) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 349866f20..11bc54b85 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 349866f20b9445d5a619e1142ef42d92e756f6bf +Subproject commit 11bc54b851c4c1d8b43301c57211a11dcba0e414 From 8b168d3dd9a94c28dddc90afc15486287f40ccf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 11 Jan 2019 04:32:06 +0000 Subject: [PATCH 126/179] Bump Nitro-Web from `11bc54b` to `c124602` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `11bc54b` to `c124602`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/11bc54b851c4c1d8b43301c57211a11dcba0e414...c124602c8955f966d42c0f9c4af9b46d6bfc908e) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 11bc54b85..c124602c8 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 11bc54b851c4c1d8b43301c57211a11dcba0e414 +Subproject commit c124602c8955f966d42c0f9c4af9b46d6bfc908e From 5ca5790bb6064defe5f3ad58674f9c306ed04dad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 14 Jan 2019 04:17:26 +0000 Subject: [PATCH 127/179] Bump Nitro-Backend from `b2bad4f` to `617a62a` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `b2bad4f` to `617a62a`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/b2bad4fedb33fcb35648e870002f5e93bf63cc0f...617a62a40ca7463a5a84c1bccf3755363087f7bf) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index b2bad4fed..617a62a40 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit b2bad4fedb33fcb35648e870002f5e93bf63cc0f +Subproject commit 617a62a40ca7463a5a84c1bccf3755363087f7bf From 1d3897c254b293e15732cd795522cd2294531fd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 14 Jan 2019 04:17:28 +0000 Subject: [PATCH 128/179] Bump Nitro-Web from `c124602` to `c334a81` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `c124602` to `c334a81`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/c124602c8955f966d42c0f9c4af9b46d6bfc908e...c334a81410104f9c3583f1a561d8e76c868a8b91) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index c124602c8..c334a8141 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit c124602c8955f966d42c0f9c4af9b46d6bfc908e +Subproject commit c334a81410104f9c3583f1a561d8e76c868a8b91 From 575d86a0b1685b3f3259b03813ea5076e16b16ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 15 Jan 2019 04:39:23 +0000 Subject: [PATCH 129/179] Bump Nitro-Backend from `617a62a` to `79749e6` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `617a62a` to `79749e6`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/617a62a40ca7463a5a84c1bccf3755363087f7bf...79749e657035d65e5adbaeceb07c72acf0a4ab0f) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 617a62a40..79749e657 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 617a62a40ca7463a5a84c1bccf3755363087f7bf +Subproject commit 79749e657035d65e5adbaeceb07c72acf0a4ab0f From 25a2e170d6506183d716efbf8c18d96a8336c109 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 15 Jan 2019 04:39:23 +0000 Subject: [PATCH 130/179] Bump Nitro-Web from `c334a81` to `6326e24` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `c334a81` to `6326e24`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/c334a81410104f9c3583f1a561d8e76c868a8b91...6326e243f459330006c09bbe4b5307634c1875f2) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index c334a8141..6326e243f 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit c334a81410104f9c3583f1a561d8e76c868a8b91 +Subproject commit 6326e243f459330006c09bbe4b5307634c1875f2 From 157e9082c40d0d82f569316e1c7a4abce7d07cda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 16 Jan 2019 04:15:44 +0000 Subject: [PATCH 131/179] Bump Nitro-Backend from `79749e6` to `1ecdcb1` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `79749e6` to `1ecdcb1`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/79749e657035d65e5adbaeceb07c72acf0a4ab0f...1ecdcb19b521ca191853a792627064c2ddfdf859) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 79749e657..1ecdcb19b 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 79749e657035d65e5adbaeceb07c72acf0a4ab0f +Subproject commit 1ecdcb19b521ca191853a792627064c2ddfdf859 From 28f7c0f5b08520163db2abaf563962b95682050f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 16 Jan 2019 04:15:46 +0000 Subject: [PATCH 132/179] Bump Nitro-Web from `6326e24` to `70aca85` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `6326e24` to `70aca85`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/6326e243f459330006c09bbe4b5307634c1875f2...70aca8579a59da45207b178640b3ac7038641b72) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 6326e243f..70aca8579 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 6326e243f459330006c09bbe4b5307634c1875f2 +Subproject commit 70aca8579a59da45207b178640b3ac7038641b72 From 31fd9dc23d30061395e30e132620ef4b5b08788f Mon Sep 17 00:00:00 2001 From: Sam Joseph Date: Thu, 17 Jan 2019 16:43:58 +0000 Subject: [PATCH 133/179] Create CONTRIBUTING.md --- CONTRIBUTING.md | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..469a0f562 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,67 @@ +Thanks so much for thinking of contributing to the Human Connection project, we really appreciate it! :-) + +We recommend that new folks should ideally work together with an existing developer. Please join our discord instance to chat with developers or just ask them in tickets in [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353): + +![](https://dl.dropbox.com/s/vbmcihkduy9dhko/Screenshot%202019-01-03%2015.50.11.png?dl=0) + +Here are some general notes on our development flow: + +### Development + +* Currently operating in two week sprints +* We are using ZenHub to coordinate + - gives time estimates that we don't currently get from Github alone + - https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353 + - "upforgrabs" links to github project https://github.com/orgs/Human-Connection/projects/10?card_filter_query=label%3A%22good+first+issue%22 + - ordering on ZenHub not necessarily reflected on github projects + +* AgileVentures run open pairing sessions at 10:30am UTC each week on Tuesdays and Thursdays + +* Core team + - all the people who are hired by HC non-profit corporation + - 9 people + - 2 core developers (Robert and Frank) + - 3 marketeers Jasi, Hardy and Sensi + - Martin head of IT and former data privacy + - Victor doing accounting + - Nicolas is the community manager (reviews content in the network) reflects community opinion back to the core team + +* when can folks pair with Robert + - 10am UTC until 5pm UTC every working day + +### Philosophy + +We practise collective code ownership rather than total code ownership, which means that: + +* anyone can start working on anyone elses code +* we avoid blocking because someone else isn't working on something +* however it's sometimes good to leave something in order to create successful education experience +* everyone should always push their code to branches so others can see it + +Everyone feel free to request merges or answers to issues from project manager Robert + +But what do we do when waiting for merge into master (wanting to keep PRs small) + --> Robert recommends creating a pull request for each step + - programming is also about thinking about other people - empathy for your co-workers + - but what about when you are waiting for merge? + - solutions + - 1) put 2nd PR into branch that the first PR is hitting - but requires update after merging + - 2) prefer to leave exiting PR until it can be reviewed, and instead go and work on some other part of the codebase that is not impacted by the first PR + +### Notes + +question: when you want to pick a task - (find out priority) - is it in discord? is it in AV slack? --> Robert says you can always ask in discord - group channels are the best + +Robert shares: https://app.zenhub.com/workspaces/nitro-embed-5c0154ecc699f60fc92cf11f/reports?report=home +Robert says the order of tickets are preserved in ZenHub and so check out the current milestones + +Matt - question about who can work on ticket 100 --> Robert - might be exclusive to someone with admin permissions +Robert: notes greg just pushed this today: https://github.com/Human-Connection/Nitro-Deployment + +Matt makes point that new stories will have to be taken off the "New Issues" and Robert says that's fine, if you don't like the first one, then you can take the next one. + +Robert notes that everyone is invited to join the kickoff meetings + +Robert - difference between "important" and "beginner friendly" + + From d9b7245c1bbe8f4ec312714e9e3310da733b6132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 17 Jan 2019 22:22:32 +0100 Subject: [PATCH 134/179] Update names and roles, Format Links @tansaku ping, I think the most important part is that my dear co-workers first name is "Greg" or Grzegorz :slightly_smiling_face: :poland: :de: @appinteractive --- CONTRIBUTING.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 469a0f562..5a353d1b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,20 +10,21 @@ Here are some general notes on our development flow: * Currently operating in two week sprints * We are using ZenHub to coordinate - - gives time estimates that we don't currently get from Github alone - - https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353 - - "upforgrabs" links to github project https://github.com/orgs/Human-Connection/projects/10?card_filter_query=label%3A%22good+first+issue%22 + - estimating time per issue is the crucial feature of [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f) that Github does not have + - "up-for-grabs" links to [Github project](https://github.com/orgs/Human-Connection/projects/10?card_filter_query=label%3A%22good+first+issue) - ordering on ZenHub not necessarily reflected on github projects * AgileVentures run open pairing sessions at 10:30am UTC each week on Tuesdays and Thursdays * Core team - all the people who are hired by HC non-profit corporation + - you can Meet-the-team [every two weeks in German](https://human-connection.org/veranstaltungen/) and [every month in English](https://human-connection.org/en/events/). - 9 people - - 2 core developers (Robert and Frank) - - 3 marketeers Jasi, Hardy and Sensi - - Martin head of IT and former data privacy - - Victor doing accounting + - 2 core developers (Robert [@roschaefer](https://github.com/roschaefer) and Greg [@appinteractive](https://github.com/appinteractive)) + - 3 marketeers Jasi, Dennis and Sensi + - Hardy doing business development + - Martin head of IT and previously data protection officer + - Victor doing accounting and controlling - Nicolas is the community manager (reviews content in the network) reflects community opinion back to the core team * when can folks pair with Robert @@ -31,14 +32,14 @@ Here are some general notes on our development flow: ### Philosophy -We practise collective code ownership rather than total code ownership, which means that: +We practise [collective code ownership](http://www.extremeprogramming.org/rules/collective.html) rather than strong code ownership, which means that: * anyone can start working on anyone elses code * we avoid blocking because someone else isn't working on something * however it's sometimes good to leave something in order to create successful education experience * everyone should always push their code to branches so others can see it -Everyone feel free to request merges or answers to issues from project manager Robert +Everyone feel free to request merges or answers to issues from the project managers But what do we do when waiting for merge into master (wanting to keep PRs small) --> Robert recommends creating a pull request for each step @@ -52,16 +53,16 @@ But what do we do when waiting for merge into master (wanting to keep PRs small) question: when you want to pick a task - (find out priority) - is it in discord? is it in AV slack? --> Robert says you can always ask in discord - group channels are the best -Robert shares: https://app.zenhub.com/workspaces/nitro-embed-5c0154ecc699f60fc92cf11f/reports?report=home -Robert says the order of tickets are preserved in ZenHub and so check out the current milestones +Robert shares: [Zenhub board](https://app.zenhub.com/workspaces/nitro-embed-5c0154ecc699f60fc92cf11f/boards?repos=112590397,152252353,152252578,157710732,163305928) +Robert says the order of tickets are preserved in ZenHub and reflect their priority (most important at the top) and so check out the current milestones -Matt - question about who can work on ticket 100 --> Robert - might be exclusive to someone with admin permissions +Matt - question about who can work on [ticket 100](https://app.zenhub.com/workspaces/nitro-embed-5c0154ecc699f60fc92cf11f/issues/human-connection/human-connection/100) --> Robert - in rare occasions it might be exclusive to someone with admin permissions Robert: notes greg just pushed this today: https://github.com/Human-Connection/Nitro-Deployment -Matt makes point that new stories will have to be taken off the "New Issues" and Robert says that's fine, if you don't like the first one, then you can take the next one. +Matt makes point that new stories will have to be taken off the "New Issues" and Robert says that's fine, if you don't like the first one, then you can take the next one. Volunteeers have no commitment except their own self development and their awesomeness by contributing to free and open-source software projects. Robert notes that everyone is invited to join the kickoff meetings -Robert - difference between "important" and "beginner friendly" +Robert - difference between "important" (creates a lot of value) and "beginner friendly" (easy to implement) From 003c4488c2f4c1048d0437b9c08e565c91926861 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 18 Jan 2019 04:14:44 +0000 Subject: [PATCH 135/179] Bump Nitro-Backend from `1ecdcb1` to `8b8caae` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `1ecdcb1` to `8b8caae`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/1ecdcb19b521ca191853a792627064c2ddfdf859...8b8caaef4080bdfb8defa3feaf90aec888ba3514) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 1ecdcb19b..8b8caaef4 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 1ecdcb19b521ca191853a792627064c2ddfdf859 +Subproject commit 8b8caaef4080bdfb8defa3feaf90aec888ba3514 From ba400adcca22a45ea460487af64b564dfaab0d50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 22 Jan 2019 04:15:18 +0000 Subject: [PATCH 136/179] Bump WebApp from `fa26d7c` to `e153eb6` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `fa26d7c` to `e153eb6`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/fa26d7c65406220dcd617275d89f4a804911874c...e153eb6c07ae89bdcb80de933ad94f42d5d5f87c) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index fa26d7c65..e153eb6c0 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit fa26d7c65406220dcd617275d89f4a804911874c +Subproject commit e153eb6c07ae89bdcb80de933ad94f42d5d5f87c From ed9b0daf97ab88e71bd46939ec6fa9f6a0e5d382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 5 Feb 2019 04:32:09 +0000 Subject: [PATCH 137/179] Bump Nitro-Web from `70aca85` to `9ba2200` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `70aca85` to `9ba2200`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/70aca8579a59da45207b178640b3ac7038641b72...9ba22002b71f8f313d0ddd9a1fddc4cd2a84a9f1) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 70aca8579..9ba22002b 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 70aca8579a59da45207b178640b3ac7038641b72 +Subproject commit 9ba22002b71f8f313d0ddd9a1fddc4cd2a84a9f1 From 285396dcd200a6f9225b2905f44b078eab03686a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 6 Feb 2019 04:15:15 +0000 Subject: [PATCH 138/179] Bump Nitro-Backend from `8b8caae` to `13c6743` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `8b8caae` to `13c6743`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/8b8caaef4080bdfb8defa3feaf90aec888ba3514...13c67437d8b314f9bf113019b36e7afe06064a2c) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 8b8caaef4..13c67437d 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 8b8caaef4080bdfb8defa3feaf90aec888ba3514 +Subproject commit 13c67437d8b314f9bf113019b36e7afe06064a2c From d651b2fa3144b9cfd56a226dc500419f8c64490d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 13 Feb 2019 04:36:25 +0000 Subject: [PATCH 139/179] Bump WebApp from `e153eb6` to `d4917da` Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `e153eb6` to `d4917da`. - [Release notes](https://github.com/Human-Connection/WebApp/releases) - [Commits](https://github.com/Human-Connection/WebApp/compare/e153eb6c07ae89bdcb80de933ad94f42d5d5f87c...d4917da335164f664837c9177c3bfb6e4a8d7432) Signed-off-by: dependabot[bot] --- WebApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebApp b/WebApp index e153eb6c0..d4917da33 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit e153eb6c07ae89bdcb80de933ad94f42d5d5f87c +Subproject commit d4917da335164f664837c9177c3bfb6e4a8d7432 From 84f7be2a1d4fe06482753ebbe8c7cef6705b5aa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 14 Feb 2019 05:07:21 +0000 Subject: [PATCH 140/179] Bump API from `02dcc22` to `8f0edaf` Bumps [API](https://github.com/Human-Connection/API) from `02dcc22` to `8f0edaf`. - [Release notes](https://github.com/Human-Connection/API/releases) - [Commits](https://github.com/Human-Connection/API/compare/02dcc2285c71ce8010ec0952a303e9a9f5e05798...8f0edaff90da046bd0db34bd77f0ead7ef336d85) Signed-off-by: dependabot[bot] --- API | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API b/API index 02dcc2285..8f0edaff9 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 02dcc2285c71ce8010ec0952a303e9a9f5e05798 +Subproject commit 8f0edaff90da046bd0db34bd77f0ead7ef336d85 From 90450e125157e78ce03ae3e922909542f78cdaab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 18 Feb 2019 05:58:28 +0000 Subject: [PATCH 141/179] Bump Nitro-Backend from `13c6743` to `c5c62d2` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `13c6743` to `c5c62d2`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/13c67437d8b314f9bf113019b36e7afe06064a2c...c5c62d283943f372b6d52e3517ac8297c61c47f1) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 13c67437d..c5c62d283 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 13c67437d8b314f9bf113019b36e7afe06064a2c +Subproject commit c5c62d283943f372b6d52e3517ac8297c61c47f1 From cb741d9158752cebf31e7be81a2adbb35be9a9b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Feb 2019 04:25:39 +0000 Subject: [PATCH 142/179] Bump Nitro-Web from `9ba2200` to `d857252` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `9ba2200` to `d857252`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/9ba22002b71f8f313d0ddd9a1fddc4cd2a84a9f1...d8572520e840f65ed97998c45fd370a7b759f615) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 9ba22002b..d8572520e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 9ba22002b71f8f313d0ddd9a1fddc4cd2a84a9f1 +Subproject commit d8572520e840f65ed97998c45fd370a7b759f615 From 9401e89d89c6f1338415c472ed2666d99fc93975 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Mon, 25 Feb 2019 08:53:53 +0100 Subject: [PATCH 143/179] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index bc7bae6c0..83a39dc57 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,15 @@ We want to do more than comments and sharing! > Check out https://docs.human-connection.org/nitro for more information. --- +**REPO States** +| Project | Status | +|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------| +| Nitro Backend | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) | +| Nitro Web | | +| Nitro Embed | | +| Nitro Styleguide | | + + **Technology Stack** - vuejs - nuxtjs From 5195991e715c1c29ca59f60b3e4b56db1c72948a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 7 Mar 2019 04:17:27 +0000 Subject: [PATCH 144/179] Bump Nitro-Web from `d857252` to `d848929` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `d857252` to `d848929`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/d8572520e840f65ed97998c45fd370a7b759f615...d84892930295dcfd3f6687fc33c7234446127099) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index d8572520e..d84892930 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit d8572520e840f65ed97998c45fd370a7b759f615 +Subproject commit d84892930295dcfd3f6687fc33c7234446127099 From aefca6da3217c6bd580d2cd1b83769fe6d05aded Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 7 Mar 2019 04:17:28 +0000 Subject: [PATCH 145/179] Bump Nitro-Backend from `c5c62d2` to `2813de4` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `c5c62d2` to `2813de4`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/c5c62d283943f372b6d52e3517ac8297c61c47f1...2813de4f8b79968b6c8d032295c4edb125df66ca) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index c5c62d283..2813de4f8 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit c5c62d283943f372b6d52e3517ac8297c61c47f1 +Subproject commit 2813de4f8b79968b6c8d032295c4edb125df66ca From e906bb42fdc5926f235ef151e4b3f4ce11ccd336 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 8 Mar 2019 04:41:32 +0000 Subject: [PATCH 146/179] Bump Nitro-Backend from `2813de4` to `2d24fc9` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `2813de4` to `2d24fc9`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/2813de4f8b79968b6c8d032295c4edb125df66ca...2d24fc9945fadf4ba56e464794d7ca619731f3d7) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 2813de4f8..2d24fc994 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 2813de4f8b79968b6c8d032295c4edb125df66ca +Subproject commit 2d24fc9945fadf4ba56e464794d7ca619731f3d7 From ad0e5c9a674804e95e752da53b7dc4a7d8253f44 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 10:27:45 +0100 Subject: [PATCH 147/179] Update README.md Updated Frontend & Repo to Nitro --- README.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 83a39dc57..ce16987ef 100644 --- a/README.md +++ b/README.md @@ -30,12 +30,17 @@ We want to do more than comments and sharing! --- **REPO States** -| Project | Status | -|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------| -| Nitro Backend | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) | -| Nitro Web | | -| Nitro Embed | | -| Nitro Styleguide | | + + *Project* | *Status* + + *Nitro Backend* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) | + + *Nitro Web* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) | + + *Nitro Embed* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Embed.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Embed) | + + *Nitro Styleguide* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) | + **Technology Stack** @@ -47,10 +52,10 @@ We want to do more than comments and sharing! ## Code ### Frontend -[Frontend](https://github.com/Human-Connection/WebApp) +[Frontend](https://github.com/Human-Connection/Nitro-Web) ### API -[API](https://github.com/Human-Connection/API) +[API](https://github.com/Human-Connection/Nitro-Backend) ## Developer Discord [Discord](https://discord.gg/6ub73U3) From 326fb217a284761da8d183c8ba9ce877823bd5fc Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 10:29:00 +0100 Subject: [PATCH 148/179] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ce16987ef..111f1051c 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,13 @@ We want to do more than comments and sharing! *Project* | *Status* - *Nitro Backend* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) | + *Nitro Backend* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Backend) - *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* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Web) - *Nitro Embed* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Embed.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Embed) | + *Nitro Embed* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Embed.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Embed) - *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* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Styleguide) From 84d496bf84dd1e36d0d064ed5e91c765f7416a22 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 10:33:28 +0100 Subject: [PATCH 149/179] Update README.md --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 111f1051c..efd61dd83 100644 --- a/README.md +++ b/README.md @@ -31,15 +31,13 @@ We want to do more than comments and sharing! **REPO States** - *Project* | *Status* + [![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) - *Nitro Backend* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Backend.svg?branch=master)](https://travis-ci.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) - *Nitro Web* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Web.svg?branch=master)](https://travis-ci.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) - *Nitro Embed* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Embed.svg?branch=master)](https://travis-ci.com/Human-Connection/Nitro-Embed) - - *Nitro Styleguide* | [![Build Status](https://travis-ci.com/Human-Connection/Nitro-Styleguide.svg?branch=master)](https://travis-ci.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) @@ -54,8 +52,8 @@ We want to do more than comments and sharing! ### Frontend [Frontend](https://github.com/Human-Connection/Nitro-Web) -### API -[API](https://github.com/Human-Connection/Nitro-Backend) +### Backend +[Backend](https://github.com/Human-Connection/Nitro-Backend) ## Developer Discord [Discord](https://discord.gg/6ub73U3) From 5d78dbd97aee959207a75ac0e36ab5e80c9d4eb7 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 10:41:48 +0100 Subject: [PATCH 150/179] Update .gitmodules Added other Nitro Repos --- .gitmodules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitmodules b/.gitmodules index b2bde5a9f..cf0a2dfca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "Nitro-Backend"] path = Nitro-Backend url = https://github.com/Human-Connection/Nitro-Backend.git +[submodule "Nitro-Embed"] + path = Nitro-Embed + url = https://github.com/Human-Connection/Nitro-Embed.git +[submodule "Nitro-Styleguide"] + path = Nitro-Styleguide + url = https://github.com/Human-Connection/Nitro-Styleguide.git From 9d953ee12591f9421afec62d8836f3a125b27f05 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Mar 2019 10:50:16 +0100 Subject: [PATCH 151/179] Updated Submodules --- Nitro-Embed | 1 + Nitro-Styleguide | 1 + 2 files changed, 2 insertions(+) create mode 160000 Nitro-Embed create mode 160000 Nitro-Styleguide diff --git a/Nitro-Embed b/Nitro-Embed new file mode 160000 index 000000000..296fc5a03 --- /dev/null +++ b/Nitro-Embed @@ -0,0 +1 @@ +Subproject commit 296fc5a0399425c698be0e8875b8dbd6a4455994 diff --git a/Nitro-Styleguide b/Nitro-Styleguide new file mode 160000 index 000000000..ce69fe5cb --- /dev/null +++ b/Nitro-Styleguide @@ -0,0 +1 @@ +Subproject commit ce69fe5cb7a0cd70b5fd93998c0ffa58114c39a9 From 4bcdfcf4b7fd411d549ca5efe7ad7c37ae3d8c53 Mon Sep 17 00:00:00 2001 From: Lulalaby Date: Fri, 8 Mar 2019 11:00:55 +0100 Subject: [PATCH 152/179] 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 153/179] 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 154/179] 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 155/179] 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 156/179] 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 157/179] 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 ce0c5c8c405617e9933f37d88d593456538504fe Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 15:58:11 +0100 Subject: [PATCH 158/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efd61dd83..fbeeea155 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,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 green](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 7b7fb7ebb8b48867b3c6592d86f6d5cf4abb56a4 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 15:58:57 +0100 Subject: [PATCH 159/179] 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 171edb5f326184ef03fec8a0f0772b5efc5b9432 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 8 Mar 2019 16:02:05 +0100 Subject: [PATCH 160/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbeeea155..4da0c4dc9 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,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) - ![Always green](https://camo.githubusercontent.com/14b2ac1fc61cf21f2022ff3ee5ad6feca559ee18/68747470733a2f2f7472617669732d63692e636f6d2f48756d616e2d436f6e6e656374696f6e2f4e6974726f2d5374796c6567756964652e7376673f6272616e63683d6d6173746572) | [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 82976b969713684306a88435584260191c1b0b19 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Sat, 9 Mar 2019 20:32:06 +0100 Subject: [PATCH 161/179] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 4da0c4dc9..f6ead7d47 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 3d1b3ce4892658875eb220f797fa37181c603dc8 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Sat, 9 Mar 2019 20:32:40 +0100 Subject: [PATCH 162/179] 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 f5535776a9d3cfe24c999cb9d4a216c8d486a0fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 11 Mar 2019 04:24:22 +0000 Subject: [PATCH 163/179] Bump Nitro-Styleguide from `ce69fe5` to `ce20d5b` Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `ce69fe5` to `ce20d5b`. - [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases) - [Commits](https://github.com/Human-Connection/Nitro-Styleguide/compare/ce69fe5cb7a0cd70b5fd93998c0ffa58114c39a9...ce20d5b58e64a35332239abf4b436b872a147904) Signed-off-by: dependabot[bot] --- Nitro-Styleguide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Styleguide b/Nitro-Styleguide index ce69fe5cb..ce20d5b58 160000 --- a/Nitro-Styleguide +++ b/Nitro-Styleguide @@ -1 +1 @@ -Subproject commit ce69fe5cb7a0cd70b5fd93998c0ffa58114c39a9 +Subproject commit ce20d5b58e64a35332239abf4b436b872a147904 From 8bae410931183113ec8b468247ded1503429f779 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 11 Mar 2019 04:24:37 +0000 Subject: [PATCH 164/179] Bump Nitro-Backend from `2d24fc9` to `28a37c2` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `2d24fc9` to `28a37c2`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/2d24fc9945fadf4ba56e464794d7ca619731f3d7...28a37c226a9ce96935706126dc0ab9b96501267a) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 2d24fc994..28a37c226 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 2d24fc9945fadf4ba56e464794d7ca619731f3d7 +Subproject commit 28a37c226a9ce96935706126dc0ab9b96501267a From 9cb19e618006a50317cace7ed8cae15b7ac1032d Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Mon, 11 Mar 2019 09:43:35 +0100 Subject: [PATCH 165/179] 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) From 682ad65f8315f26313bd913b13c6e2c22c103400 Mon Sep 17 00:00:00 2001 From: Lulalaby Date: Mon, 11 Mar 2019 11:38:02 +0100 Subject: [PATCH 166/179] submodule update --- Nitro-Styleguide | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Styleguide b/Nitro-Styleguide index ce20d5b58..562fddb1b 160000 --- a/Nitro-Styleguide +++ b/Nitro-Styleguide @@ -1 +1 @@ -Subproject commit ce20d5b58e64a35332239abf4b436b872a147904 +Subproject commit 562fddb1b47a19258c0c7a9e3a691ba7947a3c8d diff --git a/Nitro-Web b/Nitro-Web index 64abd767e..4aa640a2e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 +Subproject commit 4aa640a2e5abb071a9c8958e9f2353ca591e4b3a From 034f0bccd8bc9d195943405ce8855347f2c3b100 Mon Sep 17 00:00:00 2001 From: Sam Joseph Date: Mon, 11 Mar 2019 14:36:13 +0000 Subject: [PATCH 167/179] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a353d1b0..246b4e98b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,9 @@ Thanks so much for thinking of contributing to the Human Connection project, we really appreciate it! :-) +### Getting Set Up + +Instructions for how to install all the necessary software can be found in our [documentation](https://docs.human-connection.org/documentation/) + We recommend that new folks should ideally work together with an existing developer. Please join our discord instance to chat with developers or just ask them in tickets in [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353): ![](https://dl.dropbox.com/s/vbmcihkduy9dhko/Screenshot%202019-01-03%2015.50.11.png?dl=0) From e440e3b9738563302453bd7fea6badf741224cc3 Mon Sep 17 00:00:00 2001 From: Sam Joseph Date: Mon, 11 Mar 2019 14:37:53 +0000 Subject: [PATCH 168/179] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 246b4e98b..956d3af35 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Thanks so much for thinking of contributing to the Human Connection project, we ### Getting Set Up -Instructions for how to install all the necessary software can be found in our [documentation](https://docs.human-connection.org/documentation/) +Instructions for how to install all the necessary software can be found in our [documentation](https://docs.human-connection.org/nitro/) We recommend that new folks should ideally work together with an existing developer. Please join our discord instance to chat with developers or just ask them in tickets in [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353): From 80669e242db1f582a76067ea5585c1d2e218366b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 12 Mar 2019 04:31:01 +0000 Subject: [PATCH 169/179] Bump Nitro-Styleguide from `562fddb` to `e77754c` Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `562fddb` to `e77754c`. - [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases) - [Commits](https://github.com/Human-Connection/Nitro-Styleguide/compare/562fddb1b47a19258c0c7a9e3a691ba7947a3c8d...e77754cb780c9733c130b6846b74ff1bd2c90cab) Signed-off-by: dependabot[bot] --- Nitro-Styleguide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Styleguide b/Nitro-Styleguide index 562fddb1b..e77754cb7 160000 --- a/Nitro-Styleguide +++ b/Nitro-Styleguide @@ -1 +1 @@ -Subproject commit 562fddb1b47a19258c0c7a9e3a691ba7947a3c8d +Subproject commit e77754cb780c9733c130b6846b74ff1bd2c90cab From 5cf9145dd97cbf1be5baca2a87e65e0502f290f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 13 Mar 2019 04:47:52 +0000 Subject: [PATCH 170/179] Bump Nitro-Backend from `28a37c2` to `0dce83b` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `28a37c2` to `0dce83b`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/28a37c226a9ce96935706126dc0ab9b96501267a...0dce83b55fb5b84202925c8b3ac4bc10168beacc) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 28a37c226..0dce83b55 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 28a37c226a9ce96935706126dc0ab9b96501267a +Subproject commit 0dce83b55fb5b84202925c8b3ac4bc10168beacc From e0578fa4fed01f6202a2e368297608059f5b1f33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 13 Mar 2019 04:47:52 +0000 Subject: [PATCH 171/179] Bump Nitro-Web from `4aa640a` to `a05b438` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `4aa640a` to `a05b438`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/4aa640a2e5abb071a9c8958e9f2353ca591e4b3a...a05b438b3c0d09be4d22d556144e2e8587989ab0) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 4aa640a2e..a05b438b3 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 4aa640a2e5abb071a9c8958e9f2353ca591e4b3a +Subproject commit a05b438b3c0d09be4d22d556144e2e8587989ab0 From 453508040a81d57dfdd5d2f0f0e70febc28bd560 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 13 Mar 2019 04:47:53 +0000 Subject: [PATCH 172/179] Bump Nitro-Styleguide from `e77754c` to `baf3134` Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `e77754c` to `baf3134`. - [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases) - [Commits](https://github.com/Human-Connection/Nitro-Styleguide/compare/e77754cb780c9733c130b6846b74ff1bd2c90cab...baf3134f9dc07a629de5526727a2482717f2bd17) Signed-off-by: dependabot[bot] --- Nitro-Styleguide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Styleguide b/Nitro-Styleguide index e77754cb7..baf3134f9 160000 --- a/Nitro-Styleguide +++ b/Nitro-Styleguide @@ -1 +1 @@ -Subproject commit e77754cb780c9733c130b6846b74ff1bd2c90cab +Subproject commit baf3134f9dc07a629de5526727a2482717f2bd17 From 031b8da67358894e808b803a33f54212f857f7ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 14 Mar 2019 04:38:01 +0000 Subject: [PATCH 173/179] Bump Nitro-Web from `a05b438` to `0fae7a2` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `a05b438` to `0fae7a2`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/a05b438b3c0d09be4d22d556144e2e8587989ab0...0fae7a26e5927e520a50506441b3e09abe926ae1) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index a05b438b3..0fae7a26e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit a05b438b3c0d09be4d22d556144e2e8587989ab0 +Subproject commit 0fae7a26e5927e520a50506441b3e09abe926ae1 From a46d2c59d0edd9a37c41587bcd6870c8ab93593f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 14 Mar 2019 04:38:02 +0000 Subject: [PATCH 174/179] Bump Nitro-Backend from `0dce83b` to `fd02679` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `0dce83b` to `fd02679`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/0dce83b55fb5b84202925c8b3ac4bc10168beacc...fd026795884e6f762a52415bd026c27c554ae2f0) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 0dce83b55..fd0267958 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 0dce83b55fb5b84202925c8b3ac4bc10168beacc +Subproject commit fd026795884e6f762a52415bd026c27c554ae2f0 From 141b05819b7f22f831ccbb79ef0b3f5c5c09ec2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 15 Mar 2019 05:00:17 +0000 Subject: [PATCH 175/179] Bump Nitro-Backend from `fd02679` to `158ac36` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `fd02679` to `158ac36`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/fd026795884e6f762a52415bd026c27c554ae2f0...158ac369070ed2507a290c77630be7d94c932605) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index fd0267958..158ac3690 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit fd026795884e6f762a52415bd026c27c554ae2f0 +Subproject commit 158ac369070ed2507a290c77630be7d94c932605 From 921e5ea1e09c902870b9115a7dd0f075c938998c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 18 Mar 2019 04:20:18 +0000 Subject: [PATCH 176/179] Bump Nitro-Backend from `158ac36` to `fd8cc3f` Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `158ac36` to `fd8cc3f`. - [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases) - [Commits](https://github.com/Human-Connection/Nitro-Backend/compare/158ac369070ed2507a290c77630be7d94c932605...fd8cc3f7e60f4be10994ea934575fe38a60345f8) Signed-off-by: dependabot[bot] --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 158ac3690..fd8cc3f7e 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 158ac369070ed2507a290c77630be7d94c932605 +Subproject commit fd8cc3f7e60f4be10994ea934575fe38a60345f8 From eebd2b91848708d96702a5846f6c353bf716acfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 18 Mar 2019 04:20:19 +0000 Subject: [PATCH 177/179] Bump Nitro-Styleguide from `baf3134` to `3f7a00b` Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `baf3134` to `3f7a00b`. - [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases) - [Commits](https://github.com/Human-Connection/Nitro-Styleguide/compare/baf3134f9dc07a629de5526727a2482717f2bd17...3f7a00b8b94c4bfd2a029d6a50c847f3ab027692) Signed-off-by: dependabot[bot] --- Nitro-Styleguide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Styleguide b/Nitro-Styleguide index baf3134f9..3f7a00b8b 160000 --- a/Nitro-Styleguide +++ b/Nitro-Styleguide @@ -1 +1 @@ -Subproject commit baf3134f9dc07a629de5526727a2482717f2bd17 +Subproject commit 3f7a00b8b94c4bfd2a029d6a50c847f3ab027692 From d91ae4e40d3ba9b9bc735f70dc38f4e00baa4e87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Mar 2019 04:22:49 +0000 Subject: [PATCH 178/179] Bump Nitro-Web from `0fae7a2` to `0c2a228` Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `0fae7a2` to `0c2a228`. - [Release notes](https://github.com/Human-Connection/Nitro-Web/releases) - [Commits](https://github.com/Human-Connection/Nitro-Web/compare/0fae7a26e5927e520a50506441b3e09abe926ae1...0c2a228b47647de5bfe873ade42fb1bf110c8bc0) Signed-off-by: dependabot[bot] --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 0fae7a26e..0c2a228b4 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 0fae7a26e5927e520a50506441b3e09abe926ae1 +Subproject commit 0c2a228b47647de5bfe873ade42fb1bf110c8bc0 From fcc584af7d2aacbe5ff8af0f11f0e16e8625a015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 20 Mar 2019 21:17:53 +0100 Subject: [PATCH 179/179] Import changes relevant to monorepo --- .../ISSUE_TEMPLATE/bug_report.md | 0 .../ISSUE_TEMPLATE/feature_request.md | 0 .../CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md | 0 backend/LICENSE.md => LICENSE.md | 0 backend/.github/ISSUE_TEMPLATE/bug_report.md | 20 -------- ...template.json => cypress.env.template.json | 0 webapp/cypress.json => cypress.json | 0 .../cypress => cypress}/fixtures/example.json | 0 .../cypress => cypress}/fixtures/users.json | 0 .../integration/01.Login.feature | 0 .../02.Internationalization.feature | 0 .../integration/03.TagsAndCategories.feature | 0 .../integration/04.AboutMeAndLocation.feature | 0 .../integration/06.Search.feature | 0 .../integration/06.WritePost.feature | 0 .../integration/common/admin.js | 0 .../integration/common/report.js | 0 .../integration/common/search.js | 0 .../integration/common/settings.js | 0 .../integration/common/steps.js | 0 .../integration/moderation/HidePosts.feature | 0 .../moderation/ReportContent.feature | 0 {webapp/cypress => cypress}/plugins/index.js | 0 .../cypress => cypress}/support/commands.js | 0 .../cypress => cypress}/support/factories.js | 5 +- .../cypress => cypress}/support/helpers.js | 2 +- {webapp/cypress => cypress}/support/index.js | 0 docker-compose.override.yml | 35 ++++++++++++++ docker-compose.travis.yml | 20 ++++++++ docker-compose.yml | 46 +++++++++++++++++++ .../.github/ISSUE_TEMPLATE/feature_request.md | 17 ------- webapp/CODE_OF_CONDUCT.md | 46 ------------------- webapp/LICENSE.md | 21 --------- webapp/components/ContentMenu.vue | 1 + webapp/nuxt.config.js | 1 + webapp/plugins/axios.js | 1 + webapp/plugins/i18n.js | 1 + 37 files changed, 108 insertions(+), 108 deletions(-) rename {webapp/.github => .github}/ISSUE_TEMPLATE/bug_report.md (100%) rename {backend/.github => .github}/ISSUE_TEMPLATE/feature_request.md (100%) rename backend/CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md (100%) rename backend/LICENSE.md => LICENSE.md (100%) delete mode 100644 backend/.github/ISSUE_TEMPLATE/bug_report.md rename webapp/cypress.env.template.json => cypress.env.template.json (100%) rename webapp/cypress.json => cypress.json (100%) rename {webapp/cypress => cypress}/fixtures/example.json (100%) rename {webapp/cypress => cypress}/fixtures/users.json (100%) rename {webapp/cypress => cypress}/integration/01.Login.feature (100%) rename {webapp/cypress => cypress}/integration/02.Internationalization.feature (100%) rename {webapp/cypress => cypress}/integration/03.TagsAndCategories.feature (100%) rename {webapp/cypress => cypress}/integration/04.AboutMeAndLocation.feature (100%) rename {webapp/cypress => cypress}/integration/06.Search.feature (100%) rename {webapp/cypress => cypress}/integration/06.WritePost.feature (100%) rename {webapp/cypress => cypress}/integration/common/admin.js (100%) rename {webapp/cypress => cypress}/integration/common/report.js (100%) rename {webapp/cypress => cypress}/integration/common/search.js (100%) rename {webapp/cypress => cypress}/integration/common/settings.js (100%) rename {webapp/cypress => cypress}/integration/common/steps.js (100%) rename {webapp/cypress => cypress}/integration/moderation/HidePosts.feature (100%) rename {webapp/cypress => cypress}/integration/moderation/ReportContent.feature (100%) rename {webapp/cypress => cypress}/plugins/index.js (100%) rename {webapp/cypress => cypress}/support/commands.js (100%) rename {webapp/cypress => cypress}/support/factories.js (84%) rename {webapp/cypress => cypress}/support/helpers.js (77%) rename {webapp/cypress => cypress}/support/index.js (100%) create mode 100644 docker-compose.override.yml create mode 100644 docker-compose.travis.yml create mode 100644 docker-compose.yml delete mode 100644 webapp/.github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 webapp/CODE_OF_CONDUCT.md delete mode 100644 webapp/LICENSE.md diff --git a/webapp/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from webapp/.github/ISSUE_TEMPLATE/bug_report.md rename to .github/ISSUE_TEMPLATE/bug_report.md diff --git a/backend/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from backend/.github/ISSUE_TEMPLATE/feature_request.md rename to .github/ISSUE_TEMPLATE/feature_request.md diff --git a/backend/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md similarity index 100% rename from backend/CODE_OF_CONDUCT.md rename to CODE_OF_CONDUCT.md diff --git a/backend/LICENSE.md b/LICENSE.md similarity index 100% rename from backend/LICENSE.md rename to LICENSE.md diff --git a/backend/.github/ISSUE_TEMPLATE/bug_report.md b/backend/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 87e0ad52e..000000000 --- a/backend/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Authenticate '...' -2. Post following data to endpoint '...' -3. See error - -**Expected behavior** -A clear and concise description of what you expected to happen - -**Additional context** -Add any other context about the problem here. diff --git a/webapp/cypress.env.template.json b/cypress.env.template.json similarity index 100% rename from webapp/cypress.env.template.json rename to cypress.env.template.json diff --git a/webapp/cypress.json b/cypress.json similarity index 100% rename from webapp/cypress.json rename to cypress.json diff --git a/webapp/cypress/fixtures/example.json b/cypress/fixtures/example.json similarity index 100% rename from webapp/cypress/fixtures/example.json rename to cypress/fixtures/example.json diff --git a/webapp/cypress/fixtures/users.json b/cypress/fixtures/users.json similarity index 100% rename from webapp/cypress/fixtures/users.json rename to cypress/fixtures/users.json diff --git a/webapp/cypress/integration/01.Login.feature b/cypress/integration/01.Login.feature similarity index 100% rename from webapp/cypress/integration/01.Login.feature rename to cypress/integration/01.Login.feature diff --git a/webapp/cypress/integration/02.Internationalization.feature b/cypress/integration/02.Internationalization.feature similarity index 100% rename from webapp/cypress/integration/02.Internationalization.feature rename to cypress/integration/02.Internationalization.feature diff --git a/webapp/cypress/integration/03.TagsAndCategories.feature b/cypress/integration/03.TagsAndCategories.feature similarity index 100% rename from webapp/cypress/integration/03.TagsAndCategories.feature rename to cypress/integration/03.TagsAndCategories.feature diff --git a/webapp/cypress/integration/04.AboutMeAndLocation.feature b/cypress/integration/04.AboutMeAndLocation.feature similarity index 100% rename from webapp/cypress/integration/04.AboutMeAndLocation.feature rename to cypress/integration/04.AboutMeAndLocation.feature diff --git a/webapp/cypress/integration/06.Search.feature b/cypress/integration/06.Search.feature similarity index 100% rename from webapp/cypress/integration/06.Search.feature rename to cypress/integration/06.Search.feature diff --git a/webapp/cypress/integration/06.WritePost.feature b/cypress/integration/06.WritePost.feature similarity index 100% rename from webapp/cypress/integration/06.WritePost.feature rename to cypress/integration/06.WritePost.feature diff --git a/webapp/cypress/integration/common/admin.js b/cypress/integration/common/admin.js similarity index 100% rename from webapp/cypress/integration/common/admin.js rename to cypress/integration/common/admin.js diff --git a/webapp/cypress/integration/common/report.js b/cypress/integration/common/report.js similarity index 100% rename from webapp/cypress/integration/common/report.js rename to cypress/integration/common/report.js diff --git a/webapp/cypress/integration/common/search.js b/cypress/integration/common/search.js similarity index 100% rename from webapp/cypress/integration/common/search.js rename to cypress/integration/common/search.js diff --git a/webapp/cypress/integration/common/settings.js b/cypress/integration/common/settings.js similarity index 100% rename from webapp/cypress/integration/common/settings.js rename to cypress/integration/common/settings.js diff --git a/webapp/cypress/integration/common/steps.js b/cypress/integration/common/steps.js similarity index 100% rename from webapp/cypress/integration/common/steps.js rename to cypress/integration/common/steps.js diff --git a/webapp/cypress/integration/moderation/HidePosts.feature b/cypress/integration/moderation/HidePosts.feature similarity index 100% rename from webapp/cypress/integration/moderation/HidePosts.feature rename to cypress/integration/moderation/HidePosts.feature diff --git a/webapp/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature similarity index 100% rename from webapp/cypress/integration/moderation/ReportContent.feature rename to cypress/integration/moderation/ReportContent.feature diff --git a/webapp/cypress/plugins/index.js b/cypress/plugins/index.js similarity index 100% rename from webapp/cypress/plugins/index.js rename to cypress/plugins/index.js diff --git a/webapp/cypress/support/commands.js b/cypress/support/commands.js similarity index 100% rename from webapp/cypress/support/commands.js rename to cypress/support/commands.js diff --git a/webapp/cypress/support/factories.js b/cypress/support/factories.js similarity index 84% rename from webapp/cypress/support/factories.js rename to cypress/support/factories.js index b9633d434..3bdb86800 100644 --- a/webapp/cypress/support/factories.js +++ b/cypress/support/factories.js @@ -1,6 +1,5 @@ -// TODO: find a better way how to import the factories -import Factory from '../../../Nitro-Backend/src/seed/factories' -import { getDriver } from '../../../Nitro-Backend/src/bootstrap/neo4j' +import Factory from '../../backend/src/seed/factories' +import { getDriver } from '../../backend/src/bootstrap/neo4j' const neo4jDriver = getDriver({ uri: Cypress.env('NEO4J_URI'), diff --git a/webapp/cypress/support/helpers.js b/cypress/support/helpers.js similarity index 77% rename from webapp/cypress/support/helpers.js rename to cypress/support/helpers.js index 1aed57de1..4a8376ec0 100644 --- a/webapp/cypress/support/helpers.js +++ b/cypress/support/helpers.js @@ -1,7 +1,7 @@ import find from 'lodash/find' const helpers = { - locales: require('../../locales'), + locales: require('../../webapp/locales'), getLangByName: name => { return find(helpers.locales, { name }) } diff --git a/webapp/cypress/support/index.js b/cypress/support/index.js similarity index 100% rename from webapp/cypress/support/index.js rename to cypress/support/index.js diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 000000000..1e4c3fa91 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,35 @@ +version: "3.4" + +services: + webapp: + build: + context: webapp + target: build-and-test + volumes: + - ./webapp:/nitro-web + - webapp_node_modules:/nitro-web/node_modules + - nuxt:/nitro-web/.nuxt + command: yarn run dev + backend: + image: humanconnection/nitro-backend:builder + build: + context: backend + target: builder + volumes: + - ./backend:/nitro-backend + - backend_node_modules:/nitro-backend/node_modules + command: yarn run dev + neo4j: + environment: + - NEO4J_AUTH=none + ports: + - 7687:7687 + - 7474:7474 + volumes: + - neo4j-data:/data + +volumes: + webapp_node_modules: + backend_node_modules: + nuxt: + neo4j-data: diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml new file mode 100644 index 000000000..ccc24b6b4 --- /dev/null +++ b/docker-compose.travis.yml @@ -0,0 +1,20 @@ +version: "3.4" + +services: + webapp: + build: + context: webapp + target: build-and-test + environment: + - BACKEND_URL=http://backend:4123 + backend: + image: humanconnection/nitro-backend:builder + build: + context: backend + target: builder + neo4j: + environment: + - NEO4J_AUTH=none + ports: + - 7687:7687 + - 7474:7474 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..be604e273 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,46 @@ +version: "3.4" + +services: + webapp: + image: humanconnection/nitro-web:latest + build: + context: webapp + target: production + ports: + - 3000:3000 + - 8080:8080 + networks: + - hc-network + environment: + - HOST=0.0.0.0 + - BACKEND_URL=http://backend:4000 + - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ" + backend: + image: humanconnection/nitro-backend:latest + build: + context: backend + target: production + networks: + - hc-network + depends_on: + - neo4j + ports: + - 4000:4000 + environment: + - NEO4J_URI=bolt://neo4j:7687 + - GRAPHQL_PORT=4000 + - GRAPHQL_URI=http://localhost:4000 + - CLIENT_URI=http://localhost:3000 + - JWT_SECRET=b/&&7b78BF&fv/Vd + - MOCK=false + - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ + - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78 + neo4j: + image: humanconnection/neo4j:latest + build: + context: backend/neo4j + networks: + - hc-network + +networks: + hc-network: diff --git a/webapp/.github/ISSUE_TEMPLATE/feature_request.md b/webapp/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 066b2d920..000000000 --- a/webapp/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/webapp/CODE_OF_CONDUCT.md b/webapp/CODE_OF_CONDUCT.md deleted file mode 100644 index 19f3854c1..000000000 --- a/webapp/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at developer@human-connection.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/webapp/LICENSE.md b/webapp/LICENSE.md deleted file mode 100644 index 9d4508b38..000000000 --- a/webapp/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 Human-Connection gGmbH - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue index 2a63bb99b..abab7897d 100644 --- a/webapp/components/ContentMenu.vue +++ b/webapp/components/ContentMenu.vue @@ -82,6 +82,7 @@ export default { routes.push({ name: this.$t(`comment.edit`), callback: () => { + /* eslint-disable-next-line no-console */ console.log('EDIT COMMENT') }, icon: 'edit' diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 7f192aa57..9e3fa9575 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -142,6 +142,7 @@ module.exports = { // includeNodeModules: true, // optional, default: false (this includes graphql-tag for node_modules folder) // optional errorHandler(error) { + /* eslint-disable-next-line no-console */ console.log( '%cError', 'background: red; color: white; padding: 2px 4px; border-radius: 3px; font-weight: bold;', diff --git a/webapp/plugins/axios.js b/webapp/plugins/axios.js index 621a4ca55..0071857ec 100644 --- a/webapp/plugins/axios.js +++ b/webapp/plugins/axios.js @@ -1,5 +1,6 @@ export default ({ $axios, app }) => { $axios.onRequest(config => { + /* eslint-disable-next-line no-console */ console.log(Object.keys(app)) // add current ui language config.headers['Accept-Language'] = app.$i18n.locale() diff --git a/webapp/plugins/i18n.js b/webapp/plugins/i18n.js index 549ae722b..836ba220f 100644 --- a/webapp/plugins/i18n.js +++ b/webapp/plugins/i18n.js @@ -47,6 +47,7 @@ export default ({ app, req, cookie, store }) => { Vue.use(vuexI18n.plugin, store, { onTranslationNotFound: function(locale, key) { if (debug) { + /* eslint-disable-next-line no-console */ console.warn( `vuex-i18n :: Key '${key}' not found for locale '${locale}'` )