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

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
3de377a860
Merge pull request #2373 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc18 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc17 to 4.0.0-rc18 in /webapp
 2019-11-28 11:47:10 +01:00
mattwr18
595236ac53
Merge pull request #2372 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.4 
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend
 2019-11-28 11:46:49 +01:00
mattwr18
277c425e37
Merge pull request #2371 from Human-Connection/dependabot/npm_and_yarn/cypress-3.7.0 
build(deps-dev): bump cypress from 3.6.1 to 3.7.0
 2019-11-28 11:46:28 +01:00
dependabot-preview[bot]
a1a68a36ce
build(deps-dev): bump @babel/cli from 7.7.0 to 7.7.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.0 to 7.7.4.
- [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.7.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 10:40:27 +00:00
mattwr18
fc31aae181
Merge pull request #2359 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend
 2019-11-28 11:38:26 +01:00
mattwr18
5e56098600
Merge pull request #2357 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.12 
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend
 2019-11-28 11:34:25 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
dependabot-preview[bot]
0a5a0668c8
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc17 to 4.0.0-rc18.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.17...v4.0.0-rc.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:19:49 +00:00
dependabot-preview[bot]
98623133fe
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.2 to 7.0.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.2...v7.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:18:22 +00:00
dependabot-preview[bot]
6a52673524
build(deps-dev): bump cypress from 3.6.1 to 3.7.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.6.1...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:17:57 +00:00
Alina Beck
3116f8cc0a use imageAspectRatio to set an estimated initial height for grid items 2019-11-27 21:35:43 +03:00
Alina Beck
dda9837569 set aspect ratio for seed data to actual ratio of faker images 2019-11-27 21:34:23 +03:00
dependabot-preview[bot]
3c4a3a8a32
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.11 to 2.9.12.
- [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.9.11...apollo-server@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:17:58 +00:00
dependabot-preview[bot]
1f52c73324
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 to 7.7.4.
- [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.7.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:16:21 +00:00
mattwr18
4861ab26dd
Merge pull request #2369 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /webapp
 2019-11-27 18:15:51 +01:00
mattwr18
ff1ba9ea21
Merge pull request #2368 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.8 
build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in /backend
 2019-11-27 18:15:31 +01:00
mattwr18
943693f9ed
Merge pull request #2365 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /backend
 2019-11-27 18:15:11 +01:00
mattwr18
46c16e9060
Merge pull request #2339 from Human-Connection/dependabot/npm_and_yarn/backend/babel/plugin-proposal-throw-expressions-7.7.4 
build(deps-dev): bump @babel/plugin-proposal-throw-expressions from 7.2.0 to 7.7.4 in /backend
 2019-11-27 18:14:15 +01:00
mattwr18
6865709210
Merge pull request #2334 from Human-Connection/refactor_is_author_permission 
refactor: Close session in isAuthor permission
 2019-11-27 18:13:48 +01:00
mattwr18
f42eea15a6
Merge pull request #2323 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp
 2019-11-27 18:11:08 +01:00
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
mattwr18
6324fd7d26 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-11-27 18:05:02 +01:00
mattwr18
5d80eca711
Merge pull request #2169 from Human-Connection/1967-Component-Tests-ContentView 
1967 component tests content view
 2019-11-27 18:03:36 +01:00
mattwr18
1f7d8a023e Update reports query in frontend 2019-11-27 17:45:32 +01:00
mattwr18
c6f16497fa Update Post slug to be non-nullable 2019-11-27 17:45:05 +01:00
mattwr18
d18d9228b0 Refactor tests/resolvers 
- we were making multiple http requests to report resources in this
test, now we are bypassing these requests by setting the database up to
how we want to test, then testing what we want in isolation.
- also added tests for closing a report
- favor union for returning resource
- simplify review mutation
 2019-11-27 17:35:30 +01:00
mattwr18
3a05844356 Refactor tests/resolvers 
- Favor union as it's cleaner and less code
- refactor tests to new implementation
- add reviewedByModerator resolver
 2019-11-27 17:31:51 +01:00
mattwr18
d03d669056 Remove reviewedByModerator from resources 
- moved to Report node, as the report was reviewed by the moderator...
a resource can have many reports on them, so we are interested in
grouping reviewed/filed by report
 2019-11-27 17:26:42 +01:00
Moriz Wahl
b2f2783f4f Merge branch 'master' into 1967-Component-Tests-ContentView 
Resolving conflicts
 2019-11-27 14:56:55 +01:00
mattwr18
62080a0afb
Merge pull request #2295 from Human-Connection/2294_fix_email_filter 
If an admin searches for a user by email, don't crash if no user can be found
 2019-11-27 14:46:16 +01:00
Moriz Wahl
d47ebb936e use .filter to find items 2019-11-27 14:28:57 +01:00
Moriz Wahl
809ef47a03 only one expect per it block 2019-11-27 14:28:57 +01:00
Moriz Wahl
3d3a121dc5 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
e4883b5175 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
a14b3cb39a spec file added with basic test logic 2019-11-27 14:28:57 +01:00
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00
mattwr18
2332576e17 Add imageAspectRatio to seeded Post 2019-11-27 12:08:21 +01:00
Alina Beck
2b1f0b1c4a
Merge pull request #2288 from Human-Connection/migrate-styleguide-icons 
Migrate styleguide icons
 2019-11-27 13:28:56 +03:00
Moriz Wahl
317b335c80 use .filter to find items 2019-11-27 11:18:46 +01:00
Moriz Wahl
03e7ffa442 only one expect per it block 2019-11-27 10:26:31 +01:00
Moriz Wahl
cd3156c8c7 method tests added 2019-11-27 10:26:31 +01:00
Moriz Wahl
186a2f1abe method tests added 2019-11-27 10:26:31 +01:00
Moriz Wahl
b1b607c1b7 spec file added with basic test logic 2019-11-27 10:26:31 +01:00
Moriz Wahl
7616682a8e directory created a path names changed 2019-11-27 10:26:31 +01:00
Alina Beck
1dc68cbae8 follow @Roschaefer suggestions 2019-11-27 11:51:30 +03:00
ogerly
d75c02c057 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-11-27 08:34:59 +01:00
dependabot-preview[bot]
448c29a39b
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [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.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:22:56 +00:00
dependabot-preview[bot]
6798d18b92
build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.7 to 16.1.8.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.7...v16.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:22:51 +00:00
dependabot-preview[bot]
ef17b40678
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [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.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:21:28 +00:00
mattwr18
eceeecd9b7 Refactor reports query, tests 
- Query returns an array of Reports with all the filedReports that
belong to them
- Mutation returns the same
 2019-11-26 21:34:21 +01:00