IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,781 Commits 5 Branches 2 Tags
Commit Graph

6781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
553a3ca2cb Implement 'decide' button and functionality 2019-11-08 17:29:09 +01:00
Wolfgang Huß
c2444a5288 Changed layout 2019-11-08 16:26:46 +01:00
Wolfgang Huß
49bea62fa7 Clarified comments in 'decide' resolver 2019-11-08 10:01:49 +01:00
Wolfgang Huß
3020a38de2 Rename variable 2019-11-08 09:56:18 +01:00
Wolfgang Huß
f2ab84a5e9 Change database script 2019-11-08 09:56:06 +01:00
Wolfgang Huß
1a4ca722ca Corrected icon color related to decision status 2019-11-08 09:46:47 +01:00
Wolfgang Huß
353687766e Change 'DECIDED' property 'updatedAt' to always be set 2019-11-08 09:41:28 +01:00
Wolfgang Huß
f4a62b03dc Clarify 'decide' resolver, rename to 'latest' property 2019-11-08 09:12:49 +01:00
Wolfgang Huß
526e4c642b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-08 08:28:47 +01:00
Wolfgang Huß
2a23bbf101 Refactor frontend and 'reports' query again 2019-11-07 15:54:26 +01:00
mattwr18
1fd3fd8e41
Merge pull request #2158 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.2 
build(deps-dev): bump @babel/core from 7.7.0 to 7.7.2 in /webapp
 2019-11-07 10:39:23 +01:00
mattwr18
a344919154
Merge pull request #2157 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.14.0 
build(deps-dev): bump vue-svg-loader from 0.12.0 to 0.14.0 in /webapp
 2019-11-07 10:38:52 +01:00
mattwr18
28c9bb17c6
Merge pull request #2151 from Human-Connection/2150_remove-graphql-request 
Remove graphql-requests
 2019-11-07 10:16:04 +01:00
mattwr18
cb2b8ddad7
Merge pull request #2148 from Human-Connection/2128-close-all-sessions 
close all open sessions
 2019-11-07 10:05:59 +01:00
Alexander Friedland
f023fa40c9
Merge pull request #2126 from Human-Connection/1994-load-latest-posts-on-logo-click 
Implement refresh posts, fix duplicate posts bug
 2019-11-07 09:53:03 +01:00
Alexander Friedland
377b0eb2b3
Merge pull request #2118 from Human-Connection/fix-2057 
Fix: Email is Case-Sensitive
 2019-11-07 09:52:47 +01:00
Wolfgang Huß
446549d1b5 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-07 07:55:27 +01:00
dependabot-preview[bot]
b83586d9d9
build(deps-dev): bump @babel/core from 7.7.0 to 7.7.2 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.0 to 7.7.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.0...v7.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 04:24:28 +00:00
dependabot-preview[bot]
4e97bdaea9
build(deps-dev): bump vue-svg-loader from 0.12.0 to 0.14.0 in /webapp 
Bumps [vue-svg-loader](https://github.com/visualfanatic/vue-svg-loader) from 0.12.0 to 0.14.0.
- [Release notes](https://github.com/visualfanatic/vue-svg-loader/releases)
- [Commits](https://github.com/visualfanatic/vue-svg-loader/commits/0.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 04:23:21 +00:00
roschaefer
874b34211c Fix lint 2019-11-07 00:55:21 +01:00
aonomike
c1938bacbf Remove graphql-requests 
- Remove package-lock.json because we are using yarn
- Remove every instance of graphql-requests as the backend doesnt use it anymore
- Remove graphql-request dependancy from the backend
- Update scripts for running tests in package.json and remove the unused scripts
- Update travis.yml to run the new test scripts
 2019-11-06 21:42:34 +03:00
Youri Seichter
d262ed678c close all open sessions 2019-11-06 18:32:25 +01:00
Wolfgang Huß
465314eda9 Extended decide mutation to close reports on close decision, first step 
- Give REPORTED a 'closed' and 'decisionUuid' property.
- Give DECIDED a 'uuid' property.
 2019-11-06 17:15:47 +01:00
mattwr18
2a860297c7
Merge pull request #2135 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.7.1 
build(deps-dev): bump @babel/preset-env from 7.6.3 to 7.7.1 in /backend
 2019-11-06 16:36:50 +01:00
Wolfgang Huß
35b802bf82 Remove definition of mutation disable 2019-11-06 15:18:24 +01:00
Wolfgang Huß
7d217148d3 Remove definition of mutation enable 2019-11-06 14:38:09 +01:00
Wolfgang Huß
d4e7e10f8c Use of mutation enable removed, fix fronend tests 
- The mutation definition still has to be removed.
 2019-11-06 14:34:24 +01:00
dependabot-preview[bot]
a221aae5fb
build(deps-dev): bump @babel/preset-env from 7.6.3 to 7.7.1 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.3 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 13:23:51 +00:00
mattwr18
3e084d09d7
Merge pull request #2136 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.2 
build(deps): bump graphql-shield from 7.0.1 to 7.0.2 in /backend
 2019-11-06 14:21:55 +01:00
mattwr18
302b4d2270
Merge pull request #2134 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.7.0 
build(deps-dev): bump @babel/node from 7.6.3 to 7.7.0 in /backend
 2019-11-06 14:21:32 +01:00
mattwr18
ad5a69c793
Merge pull request #2132 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.0 
build(deps-dev): bump @babel/core from 7.6.4 to 7.7.0 in /webapp
 2019-11-06 14:21:15 +01:00
dependabot-preview[bot]
5a084e12e9
build(deps-dev): bump @babel/core from 7.6.4 to 7.7.0 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.4 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.4...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 09:16:10 +00:00
dependabot-preview[bot]
06917d7774
build(deps-dev): bump @babel/node from 7.6.3 to 7.7.0 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.6.3 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 09:15:45 +00:00
dependabot-preview[bot]
79bb29acc8
build(deps): bump graphql-shield from 7.0.1 to 7.0.2 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.1...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 09:13:29 +00:00
mattwr18
0867940197
Merge pull request #2133 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.1 
build(deps-dev): bump @babel/preset-env from 7.6.3 to 7.7.1 in /webapp
 2019-11-06 10:13:27 +01:00
mattwr18
707837fa6a
Merge pull request #2131 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.7.0 
build(deps-dev): bump @babel/register from 7.6.2 to 7.7.0 in /backend
 2019-11-06 10:12:48 +01:00
mattwr18
2cc3c7e0d4
Merge pull request #2130 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-middleware-4.0.2 
build(deps): bump graphql-middleware from 4.0.1 to 4.0.2 in /backend
 2019-11-06 10:11:15 +01:00
mattwr18
0df4a327a1
Merge pull request #2129 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.0 
build(deps-dev): bump @babel/cli from 7.6.4 to 7.7.0 in /backend
 2019-11-06 10:10:37 +01:00
mattwr18
558f0b7485
Merge pull request #2091 from Human-Connection/1851-tags-clickable 
1851 tags clickable
 2019-11-06 09:59:11 +01:00
Wolfgang Huß
a4521b4621 Use of mutation disable removed 
- The mutation definition still has to be removed.
 2019-11-06 09:13:08 +01:00
Wolfgang Huß
4a6f8c423e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-06 07:49:20 +01:00
dependabot-preview[bot]
b6959837cf
build(deps-dev): bump @babel/preset-env from 7.6.3 to 7.7.1 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.3 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:22:42 +00:00
dependabot-preview[bot]
bad6a46294
build(deps-dev): bump @babel/register from 7.6.2 to 7.7.0 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.6.2 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:21:36 +00:00
dependabot-preview[bot]
af95360704
build(deps): bump graphql-middleware from 4.0.1 to 4.0.2 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:20:51 +00:00
dependabot-preview[bot]
bea37818ac
build(deps-dev): bump @babel/cli from 7.6.4 to 7.7.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.4 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.4...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:20:15 +00:00
mattwr18
5609622e4a
Merge pull request #2123 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.1 
build(deps): bump graphql-shield from 7.0.0 to 7.0.1 in /backend
 2019-11-05 19:39:48 +01:00
roschaefer
807ac00a12 Fix backend tests 2019-11-05 18:06:10 +01:00
roschaefer
20b47b873e refactor: add new email, display server response 2019-11-05 15:23:31 +01:00
mattwr18
2ea0364242 Implement refresh posts, fix duplicate posts bug 
- on logo click
- scrollToTop
- remove duplicate records

Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2019-11-05 14:57:54 +01:00
roschaefer
2a53eb2e6c refactor: use email of backend response in Signup 2019-11-05 14:24:02 +01:00