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
7,596 Commits 5 Branches 2 Tags
Commit Graph

1996 Commits

Author SHA1 Message Date
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
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
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
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
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
Wolfgang Huß
a4521b4621 Use of mutation disable removed 
- The mutation definition still has to be removed.
 2019-11-06 09:13:08 +01:00
Ewald Arnold
4285932319 Merge branch 'russian-locales' of https://github.com/Human-Connection/Human-Connection into russian-locales 2019-11-06 09:09:48 +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