IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,097 Commits 5 Branches 2 Tags
Commit Graph

436 Commits

Author SHA1 Message Date
Wolfgang Huß
a5689e2f67 Get implementing 'reviewedByModerator' further 2019-11-22 08:44:40 +01:00
Wolfgang Huß
c0fb53c2b5 Get frontend running by start implementing 'reviewedByModerator' right 2019-11-21 13:35:12 +01:00
Wolfgang Huß
ef84e9991f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
 2019-11-21 08:09:50 +01:00
Wolfgang Huß
6d9e6e7f0a Get frontend runnig with new CaseFolder structure first try 2019-11-20 16:22:36 +01:00
Wolfgang Huß
0fdd46b656 Implement CaseFolder property rule 2019-11-20 15:30:37 +01:00
Wolfgang Huß
cf02ca4506 Refactor decide mutation to new CaseFolder structure 2019-11-20 15:17:37 +01:00
Wolfgang Huß
7c3ec289f7 Start refactor the decide mutation to CaseFolder structure 2019-11-20 08:33:47 +01:00
Robert Schäfer
9a985d464c
Merge pull request #2257 from Human-Connection/bump_metascraper_modules 
build(deps): bump metascraper modules
 2019-11-18 22:00:26 +01:00
mattwr18
19d2e2cd41
Merge pull request #2243 from Human-Connection/refactor_neo4j-graphql-js 
Explicitly define our schema, improve performance
 2019-11-18 21:46:56 +01:00
Robert Schäfer
735a31ed00
Merge pull request #2101 from Human-Connection/1747-show-shouts 
1747 show shouts
 2019-11-18 17:00:43 +01:00
Wolfgang Huß
3b4de22855 Refactor reports mutation to CaseFolder structure 2019-11-18 11:25:47 +01:00
Wolfgang Huß
240bd84b45 Refactor report mutation 2019-11-18 10:36:49 +01:00
Wolfgang Huß
4a732beb0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-18 07:59:44 +01:00
Wolfgang Huß
b569f46dad Refactor report mutation beginn 2019-11-18 07:57:52 +01:00
roschaefer
5d570c24a7 Fix tests 2019-11-16 20:21:27 +01:00
roschaefer
978347ba7b Tell github-linguists to ignore snapshots 2019-11-16 20:09:05 +01:00
roschaefer
034a353367 Hard-code graphql schema 
Apparently, `neo4j-graphql-js` *replaces* the schema partly. When we use
join models like `EMOTED`, `neo4j-graphql-js` puts in a join model with
the two names of the connected types.
 2019-11-15 11:04:07 +01:00
Wolfgang Huß
d2442b73c9 Refactor report mutation 2019-11-15 10:49:55 +01:00
roschaefer
c6e4c38de8 build(deps): remove deprecated debug flags 
I deprecated the debug flags myself here:
https://github.com/neo4j-graphql/neo4j-graphql-js/pull/288

You can now debug the queries run by `neo4j-graphql-js` by starting
the backend like this:

```bash
DEBUG=neo4j-graphql-js yarn run backend
```
 2019-11-14 14:22:20 +01:00
Wolfgang Huß
913fcc2cdb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
#	webapp/locales/pt.json
 2019-11-14 09:41:00 +01:00
Alina Beck
6213a25355
Merge branch 'master' into 1747-show-shouts 2019-11-14 09:37:54 +03:00
mattwr18
b38fde0fd0 Fix production error "User.locale" returned undefined 2019-11-13 18:00:35 +01:00
mattwr18
a0fe9cb94c
Merge pull request #2218 from Human-Connection/fix_locations_resolver 
fix: return `null` for missig translations
 2019-11-12 22:38:59 +01:00
mattwr18
feb65a6c9c Update property name to be more descriptive 
- I wanted to trigger a build, since we had issues with our build server
today. I think this naming is more in the direction we want to go,
though. Maybe it could be makeShoutsPublic as @alina-beck used for the
translation keys... what do you think @kachulio
 2019-11-12 21:19:52 +01:00
mattwr18
ecf0e5948b Commit to trigger build 
- prefer variables on one line
 2019-11-12 21:09:02 +01:00
roschaefer
deb4b4f698 fix: return null for missig translations 
A query such as `{ notifications }` would return `null` for Locations
with a missing translation, e.g. `nameRU`. This would not happen for
queries implemented by `neo4j-graphql-js` because they nullify all
missing attributes automatically.
 2019-11-12 19:14:34 +01:00
Alina Beck
6e3bd19267 set up privacy page in settings 2019-11-12 19:13:56 +03:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
mattwr18
a215093bc3 Make Donations reactive 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 13:26:30 +01:00
mattwr18
afb443ac0d Update resolver to match one Donations node 
- there should only ever be one Donations node to start off with, if
that changes in the future for some reason, then we'd need to look into
changing the match to something that makes more sense.
 2019-11-11 19:14:06 +01:00
mattwr18
835a098731 Set up backend for DonationsInfo 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 18:14:33 +01:00
Wolfgang Huß
677039b786 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	webapp/pages/moderation/index.vue
 2019-11-11 17:52:58 +01:00
mattwr18
780a418254 Fix lint 2019-11-11 08:52:04 +01:00
roschaefer
8e129c6001 fix: update counter when notification is read 
@mattwr18 vue-apollo rocks! Taking the time to study the docs is a
rewarding investment.

My first idea was to cache the `unreadNotificationsCount` with Vuex.
But the docs of apollo even suggest to use apollo's local state as a
complete replacement of Vuex:
https://vue-apollo.netlify.com/guide/local-state.html

Then I further investigated why the updated `NOTIFIED` objects won't
update the notification counter. Turns out: They don't have an ID and
the computed property didn't fire when the notifications array would
change. I fixed both in this commit and yes, it works as expected.

No additional code required 💪
 2019-11-11 08:52:04 +01:00
mattwr18
715261238a Protect against cypher injection vulnerability 
- following @roschaefer PR review suggestion
 2019-11-11 08:52:04 +01:00
mattwr18
f34c8f44e0 Update resolver for paginated notifications 2019-11-11 08:50:35 +01:00
Wolfgang Huß
553a3ca2cb Implement 'decide' button and functionality 2019-11-08 17:29:09 +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ß
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
cb2b8ddad7
Merge pull request #2148 from Human-Connection/2128-close-all-sessions 
close all open sessions
 2019-11-07 10:05:59 +01: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
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ß
a4521b4621 Use of mutation disable removed 
- The mutation definition still has to be removed.
 2019-11-06 09:13:08 +01:00
roschaefer
807ac00a12 Fix backend tests 2019-11-05 18:06:10 +01:00