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

3947 Commits

Author SHA1 Message Date
mattwr18
3f87b42987
Merge pull request #818 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.3 
Bump apollo-server from 2.6.2 to 2.6.3 in /backend
 2019-06-13 21:17:58 -03:00
Robert Schäfer
fc4e9f40b3 Whitelist queries/mutations, fix backend tests 2019-06-13 23:29:29 +02:00
Matt Rider
8a214a4007 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-13 17:30:24 -03:00
ALau2088
3cc05c0916 add backend managecomments tests 2019-06-13 13:00:20 -07:00
Matt Rider
589fb16c51 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-13 14:59:23 -03:00
ALau2088
d91221fe7e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-13 10:22:25 -07:00
dependabot-preview[bot]
bbe6d63512
Bump apollo-server-testing from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.2...apollo-server-testing@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:04:29 +00:00
dependabot-preview[bot]
f77aa4ec4e
Bump apollo-server from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.2...apollo-server@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:04:05 +00:00
dependabot-preview[bot]
6507b97fdf
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.32.
- [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.0.0-alpha.31...v2.0.0-alpha.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:03:26 +00:00
mattwr18
d0fd4de079
Merge pull request #809 from Human-Connection/800_fix_broken_image_urls 
Fix #800
 2019-06-12 19:53:18 -03:00
Robert Schäfer
113cf04c60 Fix build 2019-06-13 00:26:20 +02:00
Robert Schäfer
1ffa3cd046 Fix #799 
For target `production` the badges were simply not copied. It also
explains why we never saw that error in development. For development we
use docker build target `build-and-test`.

FYI: @ulfgebhardt @Tirokk @ogerly
 2019-06-12 23:55:42 +02:00
Robert Schäfer
4166936e5f Fix #800 
Ok, so apparently all we have to do is to remove the `/api` prefix from
fixImageUrlMiddleware. I guess that's just a leftover.
 2019-06-12 23:27:43 +02:00
Matt Rider
6e6407b265 Upgrade apollo-cache-inmemory 2019-06-12 17:06:37 -03:00
Matt Rider
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00
Matt Rider
d15857d240 Set user's posts/comments' delete attribute to true 
- favor over actually deleting the node so that the comments will appear as anonymous and not lose the context of the conversation
- the post will not appear, but for admin it will be accessible
- follow @roschaefer `PR` review
 2019-06-12 15:27:57 -03:00
Robert Schäfer
45fc604c25
Merge pull request #797 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.8 
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend
 2019-06-12 10:27:45 +02:00
Robert Schäfer
c2bcc9f595
Merge pull request #754 from Human-Connection/402-userprofil-tab-click-function 
402 userprofil tab click function
 2019-06-12 10:24:41 +02:00
dependabot-preview[bot]
78607dfd0e
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.7...v5.3.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 04:56:09 +00:00
Robert Schäfer
90107cfb18
Merge pull request #789 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.18.2 
Bump prettier from 1.17.1 to 1.18.2 in /backend
 2019-06-11 23:44:00 +02:00
Robert Schäfer
54c7c204c2 Run yarn run lint --fix 2019-06-11 23:10:26 +02:00
Matt Rider
fc8792e7af Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-11 15:48:43 -03:00
Matt Rider
f80173697c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-11 15:48:00 -03:00
Matt Rider
4407d6648a Add component tests, translations 2019-06-11 15:47:10 -03:00
Robert Schäfer
d1364e4aed Merge remote-tracking branch 'origin/master' into 402-userprofil-tab-click-function 2019-06-11 17:41:17 +02:00
dependabot-preview[bot]
db37d085f8
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.6 to 5.3.7.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.6...v5.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-11 04:51:32 +00:00
Matt Rider
5986ab2070 Create Posts with a specified language, or fallback 2019-06-10 17:12:00 -03:00
dependabot-preview[bot]
f18ae14741
Bump prettier from 1.17.1 to 1.18.2 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 11:12:27 +00:00
ALau2088
22f166adac merge upstream/552-update_comment 2019-06-08 15:55:51 -07:00
mattwr18
0259eeee66
Merge pull request #771 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.2 
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend
 2019-06-08 11:48:23 -03:00
Matt Rider
409b626425 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-07 19:11:21 -03:00
dependabot-preview[bot]
f0a4149b9e
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.1...apollo-cache-inmemory@1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 22:07:23 +00:00
mattwr18
a0f9e90ce2
Merge pull request #783 from Human-Connection/remove_unnecessary_dependency_ms 
Replace dependency `ms` completely
 2019-06-07 19:06:11 -03:00
Matt Rider
7bbf870d8d Clean up of backend tests 
- changed variable name, remove unneeded beforeEach
 2019-06-07 16:03:02 -03:00
Matt Rider
f7b2d52a7e Refactor resolver to use Promise and map 
- forEach cannot be used with async/await
 2019-06-07 15:58:51 -03:00
Matt Rider
ef1f5ea51c Nested beforeEach 
- flaky test, leaky info
 2019-06-07 14:47:57 -03:00
Matt Rider
687e121658 Remove unneccesary second database clean, reset variables 
- in high level describe block, to avoid leaky info
 2019-06-07 14:21:03 -03:00
Matt Rider
cc1be62bbd Add afterEach block to DeleteUser block 
- not able to reliably get reproduce build failure locally
 2019-06-07 13:58:53 -03:00
Matt Rider
6b0c1312f1 Refactor tests to dry out, search for by comment id 2019-06-07 13:38:31 -03:00
Matt Rider
fcb5ab8f1e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-07 12:14:12 -03:00
Robert Schäfer
314b257b45 Replace dependency ms completely 
I have seen this PR here: https://github.com/Human-Connection/Human-Connection/pull/774 and I thought: Never saw that one before, where is it used and what is the purpose? I could find this line only and thought this is not a justification for having the package installed.
 2019-06-07 15:49:18 +02:00
Matt Rider
ed5f14d052 Dry out resolver 2019-06-07 10:17:58 -03:00
Robert Schäfer
02dca83358
Merge pull request #768 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.2 
Bump apollo-client from 2.6.1 to 2.6.2 in /backend
 2019-06-07 14:37:21 +02:00
dependabot-preview[bot]
7d50c8f9fd
Bump apollo-client from 2.6.1 to 2.6.2 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.1...apollo-client@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 11:20:30 +00:00
dependabot-preview[bot]
850121015f
Bump apollo-server-testing from 2.6.1 to 2.6.2 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.1...apollo-server-testing@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 11:20:28 +00:00
Robert Schäfer
5503df0895
Merge pull request #776 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.2 
Bump apollo-server from 2.6.1 to 2.6.2 in /backend
 2019-06-07 13:18:28 +02:00
dependabot-preview[bot]
34a9799fac
Bump apollo-server from 2.6.1 to 2.6.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.1...apollo-server@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 05:00:10 +00:00
dependabot-preview[bot]
b5b3293af0
Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.29 to 2.0.0-alpha.31.
- [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.0.0-alpha.29...v2.0.0-alpha.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 04:59:36 +00:00
Robert Schäfer
a978591843 Fix bug introduced in 6f0447515 
@ulfgebhardt For the `deleted` and `disabled` flags I would be glad if we could
take only one value, that is `true`, in case the post is considered disabled or
deleted respectively.

There might be more bugs like this now. Please keep in mind that these
counts are also used as total limits for pagination and you break the
pagination if you change the cypher statement.
 2019-06-07 01:39:09 +02:00