ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

4261 Commits

Author SHA1 Message Date
Wolfgang Huß
d2442b73c9 Refactor report mutation 2019-11-15 10:49:55 +01:00
mattwr18
58f48781a2 Fix incorrect pronoun in docs 2019-11-14 23:53:31 +01:00
roschaefer
28e1ff9f55 Write documentation for neo4j-graphql-js 2019-11-14 23:13:10 +01:00
roschaefer
985e23c5b4 Remove obsolete script in package.json 
@mattwr18 nope, I would not create a script to debug neo4j-graphql-js.
If you use environment variables, please also use `cross-env`.
 2019-11-14 23:13:10 +01:00
mattwr18
aad6234be4 Add script to debug neo4j-graphl-js 
@roschaefer, I needed to push a commit to trigger the build again,
do you like this?
 2019-11-14 14:22:20 +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
Alina Beck
3cf3c31808 remove package-lock.json 2019-11-13 11:43:19 +03: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
444630aeb0
Merge pull request #2209 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.8.0 
build(deps): bump @sentry/node from 5.7.1 to 5.8.0 in /backend
 2019-11-12 14:05:02 +01:00
mattwr18
a215093bc3 Make Donations reactive 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 13:26:30 +01:00
Alina Beck
6a98e5759f fix lint errors in backend 2019-11-12 13:50:45 +03:00
mattwr18
311f2fc912 Create Donations node in seeds 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 10:20:21 +01:00
dependabot-preview[bot]
be7a907a9e
build(deps): bump @sentry/node from 5.7.1 to 5.8.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.7.1 to 5.8.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.7.1...5.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:25:16 +00:00
dependabot-preview[bot]
f8490ca006
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.2 to 23.0.3.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.2...v23.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 04:23:49 +00: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
46ed623cfa
Merge pull request #2111 from Human-Connection/russian-locales 
added Russian to locales
 2019-11-11 14:38:00 +01:00
mattwr18
36722962e0
Merge pull request #1975 from Human-Connection/1974-notifications-page 
Add notifications page with All Notifications
 2019-11-11 14:29:40 +01:00
mattwr18
6dfcd44cfa
Merge pull request #2166 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.7.0 
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /backend
 2019-11-11 08:55:36 +01:00
mattwr18
210ac3d119
Merge pull request #2155 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.3 
build(deps): bump merge-graphql-schemas from 1.7.2 to 1.7.3 in /backend
 2019-11-11 08:54:01 +01:00
mattwr18
f650c5cc05 Make createdAt/updatedAt non-nullable for NOTIFIED 
- Follow @Tirokk PR review suggestion
 2019-11-11 08:52:51 +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
Vasily Belolapotkov
dc09240c20 sync with 'master' to cleanup PR 2019-11-10 11:48:39 +03: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
dependabot-preview[bot]
fe2beaeedc
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 04:21:05 +00:00
Wolfgang Huß
2a23bbf101 Refactor frontend and 'reports' query again 2019-11-07 15:54:26 +01:00
dependabot-preview[bot]
eaefce1390
build(deps-dev): bump @babel/core from 7.6.4 to 7.7.2 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.4 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.6.4...v7.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 09:41:23 +00:00
dependabot-preview[bot]
fa33b640d8
build(deps): bump merge-graphql-schemas from 1.7.2 to 1.7.3 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases)
- [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/merge-graphql-schemas/compare/v1.7.2...1.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 09:18:01 +00: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
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
roschaefer
874b34211c Fix lint 2019-11-07 00:55:21 +01:00