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
99b6254303 Split neode models into own directory 2019-07-08 16:45:39 +02:00
Matt Rider
3dc5888364 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-08 10:21:33 -03:00
Robert Schäfer
66740b0f55 Neo4j uses a different name for its env vars 2019-07-05 15:57:38 +02:00
dependabot-preview[bot]
27cc6c49af
Bump node from 12.5-alpine to 12.6-alpine in /backend 
Bumps node from 12.5-alpine to 12.6-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:30 +00:00
dependabot-preview[bot]
01c73e9996
Bump @babel/preset-env from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.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.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:02 +00:00
dependabot-preview[bot]
7f054809d6
Bump @babel/node from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.4.5 to 7.5.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.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:23:30 +00:00
dependabot-preview[bot]
c0f7b48a07
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.2.
- [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/v22.7.1...v22.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:52 +00:00
dependabot-preview[bot]
d11881b2f4
Bump @babel/cli from 7.4.4 to 7.5.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.4.4 to 7.5.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.4.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:06 +00:00
Matt Rider
a875fe0d5e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-04 20:33:24 -03:00
Wolfgang Huß
ac17f3fe1c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/passwordReset.js
 2019-07-04 20:56:14 +02:00
Wolfgang Huß
1c8dac7359 Get the links of the Tags in the Post as a URL driven query to work 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-04 19:55:06 +02:00
dependabot-preview[bot]
7fbf634ff4
Bump graphql from 14.4.0 to 14.4.2 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.0 to 14.4.2.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.0...v14.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 10:20:38 +00:00
mattwr18
063ba642a0
Merge pull request #945 from Human-Connection/943_bring_user_mutation_under_control 
943 bring user mutation under control
 2019-07-04 07:18:29 -03:00
Wolfgang Huß
4b1bcdc0f9
Merge pull request #951 from Human-Connection/805-remove-unused-query 
Remove unused query as cleanup
 2019-07-04 08:09:58 +02:00
Matt Rider
c6b261853f Add test for filter posts by category 2019-07-03 19:46:26 -03:00
Robert Schäfer
8b991ea686 Less log output 2019-07-03 23:22:31 +02:00
Robert Schäfer
09ff79763d Follow @mattwr18's other suggestion 2019-07-03 23:20:36 +02:00
Robert Schäfer
ef46f71c0d Follow @mattwr18 code review 👍 2019-07-03 22:22:42 +02:00
Matt Rider
e7b70ce7cd Fix failing test after new implementation merged in 2019-07-03 17:08:47 -03:00
Matt Rider
b187fbb7b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-03 16:30:15 -03:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control 
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
 2019-07-03 15:58:42 +02:00
Alexander Friedland
76388d4c4b
Merge pull request #908 from Human-Connection/785-reporting-a-user-post-or-comment 
the one-time reporting of a user, post or comment
 2019-07-03 08:44:19 +02:00
Matt Rider
4c7718afb4 Remove unused query as cleanup 2019-07-02 14:36:03 -03:00
mattwr18
db3221cec6
Merge pull request #948 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.2 
Bump graphql-shield from 5.6.2 to 6.0.2 in /backend
 2019-07-02 13:38:57 -03:00
mattwr18
7fa3cc7709
Merge pull request #919 from Human-Connection/778-categories-for-posts 
Post with categories
 2019-07-02 12:20:43 -03:00
mattwr18
97f31abccd
Merge pull request #905 from Human-Connection/850-api-mapbox-check-place-or-region 
region and place is no longer created twice.
 2019-07-02 12:18:12 -03:00
Matt Rider
677f657b2e Update schemas, fix typo 
Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-07-02 10:40:32 -03:00
Robert Schäfer
0bc1444336 Explicitly define all comment mutations in schema 
Remove `postId` as part of the to-be-saved comment type.
 2019-07-02 15:11:21 +02:00
Matt Rider
17ff9c4c0f Add caching rule to allow for upgrade 2019-07-02 08:36:47 -03:00
dependabot-preview[bot]
dfa41aa67f
Bump graphql-shield from 5.6.2 to 6.0.2 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.6.2 to 6.0.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.6.2...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-02 04:22:58 +00:00
Ulf Gebhardt
3a961e5b77
Merge pull request #941 from Human-Connection/dependabot/docker/backend/node-12.5-alpine 
Bump node from 12.4-alpine to 12.5-alpine in /backend
 2019-07-02 01:25:34 +02:00
Matt Rider
b034d22732 Fix failing cypress test 2019-07-01 18:50:24 -03:00
Matt Rider
0982ca716b Fix lint 2019-07-01 18:17:09 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03:00
Wolfgang Huß
69070f824c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.spec.js
 2019-07-01 20:18:09 +02:00
Wolfgang Huß
a4cf2d3ee8 Store Hashtags of Post content in database and write a lot of tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-01 20:13:28 +02:00
Matt Rider
b8ea32cfc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 778-categories-for-posts 2019-07-01 15:06:52 -03:00
mattwr18
730c18faec
Merge pull request #935 from Human-Connection/fix_cypher_injection 
Patch cypher injection vulnerability
 2019-07-01 12:30:31 -03:00
mattwr18
14b5109e78
Merge pull request #787 from Human-Connection/759-teaser-image-create-posts 
Add teaser image to contribution form
 2019-07-01 12:29:47 -03:00
Ulf Gebhardt
a264ff8eee
emotion data modelling 2019-07-01 16:21:11 +02:00
Wolfgang Huß
f7196e8663 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-01 10:05:46 +02:00
dependabot-preview[bot]
2437d9100b
Bump node from 12.4-alpine to 12.5-alpine in /backend 
Bumps node from 12.4-alpine to 12.5-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 04:31:48 +00:00
mattwr18
2040c480fb
Merge pull request #930 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.2 
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.2 in /backend
 2019-06-29 22:54:26 -03:00
mattwr18
9ac0c9b7cf
Merge pull request #924 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.7 
Bump apollo-server from 2.6.6 to 2.6.7 in /backend
 2019-06-29 22:53:39 -03:00
Matt Rider
d6f0698ef7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-29 13:53:37 -03:00
Robert Schäfer
4e687a06ea Patch cypher injection vulnerability 
@mattwr18 this patches the vulnerability. However we should never do
string interpolation with user input.
 2019-06-29 13:48:40 +02:00
Wolfgang Huß
c81b495186 Lint fix 2019-06-28 17:12:14 +02:00
Wolfgang Huß
28e4433b87 Refactoring and second approach to change the database 2019-06-28 16:47:26 +02:00
Matt Rider
865e2c0ec3 Refactor resolver, rename params 
- Use one cypher statement

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-06-28 10:17:22 -03:00
Wolfgang Huß
1d1959561b First approach to extract the Hashtags in the middleware and change the database 2019-06-28 08:14:37 +02:00