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
Robert Schäfer
f85975e48d
Merge pull request #3070 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.11.1 
build(deps): bump metascraper-author from 5.10.7 to 5.11.1 in /backend
 2020-02-20 13:55:46 +01:00
Wolfgang Huß
82f3eb2a29 Delete comments 2020-02-20 11:09:43 +01:00
Wolfgang Huß
5c7f92e557 Remove user GQL prop 'filedUnclosedReportByCurrentUser' again 
- Shall be implemented in a later PR.
 2020-02-20 10:54:34 +01:00
Wolfgang Huß
4bd7f61fcc Refactor GQL schema, resolvers and moderators report list 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:35:37 +01:00
mattwr18
b0bb00f7a5
Merge pull request #3068 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.11.1 
build(deps): bump metascraper-publisher from 5.10.7 to 5.11.1 in /backend
 2020-02-20 09:32:03 +01:00
dependabot-preview[bot]
312b950590
build(deps): bump @sentry/node from 5.12.3 to 5.12.4 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.12.3 to 5.12.4.
- [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.12.3...5.12.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 04:18:08 +00:00
dependabot-preview[bot]
196883c23c
build(deps): bump metascraper-publisher in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:10:39 +00:00
dependabot-preview[bot]
64c03e13f0
build(deps): bump metascraper-author from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:10:28 +00:00
dependabot-preview[bot]
eb6a949993
build(deps): bump metascraper-date from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:10:27 +00:00
Robert Schäfer
cfd25842c9
Merge pull request #3066 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.11.1 
build(deps): bump metascraper-audio from 5.10.7 to 5.11.1 in /backend
 2020-02-19 16:55:42 +01:00
Wolfgang Huß
3421afe4e0 Refactor tests, next step 2020-02-19 13:33:00 +01:00
Wolfgang Huß
5ffaac193d Refactor tests, going on 2020-02-19 11:37:31 +01:00
dependabot-preview[bot]
b6bca1879f
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.10.0 to 2.10.1.
- [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.10.0...apollo-server-testing@2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 08:51:19 +00:00
Robert Schäfer
b7896f9c4e
Merge pull request #3101 from Human-Connection/3088-fix_notificationAdded_is_null 
fix(subscriptions): Don't publish undefined
 2020-02-19 09:47:38 +01:00
Wolfgang Huß
f380915b2c Refactor GQL and tests, first approach 2020-02-19 08:09:14 +01:00
mattwr18
a346632fff Avoid running cypher statement if not needed 
- it just feels safer to not run a cypher statement if there is no user
  in the idsOfUsers array. Why risk notifications pointing to empty
nodes? It doesn't seem like this happens, but I'm not sure how to write
a test to verify, and why run cypher statements, if there is no need to?
 2020-02-18 23:19:14 +01:00
mattwr18
54caaaaa0a Remove unnecessary guard clause 
- filter returns an empty array, and no notification is created if
  idsOfUsers is an empty array
 2020-02-18 22:43:19 +01:00
mattwr18
7fe6fb110b Remove unnecessary negation of negation, refactor 
- tests to use `toMatchObject`, which checks that only one notification
  is indeed created
 2020-02-18 22:21:49 +01:00
Robert Schäfer
b003fb3f10
Merge pull request #2589 from Human-Connection/2587-geolocation-swap-lng-with-lat 
fix: swap lat and lng
 2020-02-18 17:55:57 +01:00
roschaefer
f32bfc7e36 fix(subscriptions): Don't publish undefined 
Fix #3088
 2020-02-18 16:25:11 +01:00
mattwr18
44d503c53c
Merge pull request #3090 from Human-Connection/2202_do_not_encode_the_entire_user_in_bearer_token 
fix(jwt): Whitelist encoded JWT attributes
 2020-02-18 14:37:15 +01:00
Moriz Wahl
5b41561cc4 throw error added to template 2020-02-18 14:16:46 +01:00
mattwr18
1b62dc3b2e Remove sequence for slug as it's not needed 2020-02-18 13:40:48 +01:00
mattwr18
6f6b1534df Reload page to add Category button 
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
 2020-02-18 13:33:34 +01:00
roschaefer
e41a639cf1 fix(jwt): Encode only 3 attributes in JWT 
This will prevent unintentional encoding of users email addresses in the
JWT.

@steffi201028 this might be interesting for you as well.
 2020-02-18 11:23:04 +01:00
mattwr18
0f74273b5b Let post factory create default category 
- since we have factories that ensure a post has a category created, we
  don't need extra code to create a category before the post
 2020-02-18 10:36:34 +01:00
mattwr18
ee3a85f70f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-18 09:38:56 +01:00
roschaefer
6bba756856 Fix seeds, don't create additional categories 2020-02-18 00:30:53 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
Wolfgang Huß
ba3cfa8e04 Set sensible report properties to moderators only in the permissionsMiddleware 2020-02-14 16:52:51 +01:00
mattwr18
6ea2f3c8a9
Merge pull request #3029 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.7.0 
build(deps-dev): bump eslint-plugin-jest from 23.6.0 to 23.7.0 in /backend
 2020-02-14 11:28:18 +01:00
dependabot-preview[bot]
b93ed8dc1b
build(deps): bump metascraper-image from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:18:52 +00:00
dependabot-preview[bot]
665f66f523
build(deps): bump metascraper-audio from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:18:26 +00:00
mattwr18
fa02a4dd33 Write cypress tests for ImageUploader 
- have I missed any important features? too many tests?
 2020-02-12 17:53:38 +01:00
mattwr18
4391915611 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-12 16:14:05 +01:00
mattwr18
b4fe3de4bb
Merge pull request #3041 from Human-Connection/node_v13_compatiblity 
build(deps): Node v13 compatbility
 2020-02-12 11:40:36 +01:00
dependabot-preview[bot]
b6f505d4be
build(deps): bump request from 2.88.0 to 2.88.2 in /backend 
Bumps [request](https://github.com/request/request) from 2.88.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 04:17:48 +00:00
roschaefer
2f0e40e0e4 build(deps): Node v13 compatbility 
Through https://github.com/jaydenseric/graphql-upload/issues/170#issue-527336432
 2020-02-11 23:18:37 +01:00
Moriz Wahl
31cec2cf0c improved migration 2020-02-11 14:37:10 +01:00
Moriz Wahl
1ae6769c7d spec for location swapped lng and lat too 2020-02-11 11:33:47 +01:00
mattwr18
708ab6ecde Set equal to nginx max body size 2020-02-10 19:21:53 +01:00
mattwr18
00195f1615 Increase body parser limit 
- The default limit is only 100kb
- we are getting many requests that exceed this limit
- not sure about what would be an appropriate limit, but have seen 50mb
  in many examples.
 2020-02-10 19:16:41 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
63ef9e339d chore: Update to v0.3.1 2020-02-10 17:33:31 +01:00
mattwr18
409150813d Update to use PubSub in development 
- for some reason RedisPubSub works locally, but with docker it tries to
  connect to Redis and therefore it doesn't pass the build. PubSub is
imported from graphql-subscriptions which is a dependency of
apollo-server-express, and suitable for dev purposes.
 2020-02-10 17:19:19 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-02-10 16:25:00 +01:00
mattwr18
bcf9680ad9 Add type resolver for hasBlocked 2020-02-10 14:33:49 +01:00
mattwr18
c2802aa4f2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3033-fix-block-users-bug 2020-02-10 14:24:32 +01:00
mattwr18
1fce867b46
Merge pull request #2921 from Human-Connection/refactor_factories_with_rosie 
refactor(factories): Refactor test factories with rosie.js
 2020-02-10 14:03:03 +01:00
mattwr18
70bb034343 Remove unused email property from user factory 2020-02-10 13:13:51 +01:00