ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

4261 Commits

Author SHA1 Message Date
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
dependabot-preview[bot]
0271f95146
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.2 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.1 to 2.0.0-beta.2.
- [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-beta.1...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-28 04:23:19 +00:00
dependabot-preview[bot]
058eae515e
Bump apollo-server from 2.6.6 to 2.6.7 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.7.
- [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.6...apollo-server@2.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 21:17:31 +00:00
mattwr18
6fe3fdc961
Merge pull request #909 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.0.0 
Bump eslint-config-prettier from 5.0.0 to 6.0.0 in /backend
 2019-06-27 18:16:43 -03:00
mattwr18
f5786b703f
Merge pull request #922 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.1 
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /backend
 2019-06-27 18:16:19 -03:00
mattwr18
9002d1b889
Merge pull request #921 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.4.0 
Bump graphql from 14.3.1 to 14.4.0 in /backend
 2019-06-27 18:15:55 -03:00
Matt Rider
351f258fab Refactor resolver, write component tests 
- use UNWIND instead of iterating over categories(cypher magic)
- do not return nested categories on post creation as it's expensive and we don't use
- refactor backend test
- component tests for CategoriesSelect
 2019-06-27 16:57:55 -03:00
ALau2088
912b94d43c add EditCommentForm spec.js 2019-06-27 10:59:53 -07:00
ALau2088
5e9f46405e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-27 10:18:53 -07:00
Wolfgang Huß
d80e38ede8 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.spec.js
 2019-06-27 10:27:39 +02:00
dependabot-preview[bot]
71d98e5370
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 to 2.0.0-beta.1.
- [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.37...v2.0.0-beta.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 04:22:49 +00:00
dependabot-preview[bot]
0a05a52095
Bump graphql from 14.3.1 to 14.4.0 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.1 to 14.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.1...v14.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 04:22:16 +00:00
dependabot-preview[bot]
d383592c09
Bump apollo-server-testing from 2.6.6 to 2.6.7 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.7.
- [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.6...apollo-server-testing@2.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 04:21:37 +00:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
Matt Rider
46b83c540d Add contentExcerpt to CreatePost Mutation 2019-06-26 13:53:11 -03:00
Matt Rider
d714927315 Set up backend for Post creation with categories 2019-06-26 11:26:44 -03:00
dependabot-preview[bot]
ee1be0ba27
Bump eslint-config-prettier from 5.0.0 to 6.0.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v5.0.0...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 12:08:23 +00:00
dependabot-preview[bot]
df29412dd1
Bump apollo-server from 2.6.4 to 2.6.6 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.4 to 2.6.6.
- [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.4...apollo-server@2.6.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 09:06:01 +00:00
Robert Schäfer
0bdf051bb3
Merge pull request #912 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.6 
Bump apollo-server-testing from 2.6.4 to 2.6.6 in /backend
 2019-06-26 11:04:04 +02:00
Robert Schäfer
15c4059f5a
Merge pull request #914 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-promise-4.2.1 
Bump eslint-plugin-promise from 4.1.1 to 4.2.1 in /backend
 2019-06-26 11:03:20 +02:00
Robert Schäfer
a7eebe7928
Merge pull request #915 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.37 
Bump date-fns from 2.0.0-alpha.36 to 2.0.0-alpha.37 in /backend
 2019-06-26 11:02:23 +02:00
dependabot-preview[bot]
74b2199cae
Bump eslint from 5.16.0 to 6.0.1 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.0.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.16.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 04:25:36 +00:00
dependabot-preview[bot]
978e4fa0ea
Bump date-fns from 2.0.0-alpha.36 to 2.0.0-alpha.37 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.36 to 2.0.0-alpha.37.
- [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.36...v2.0.0-alpha.37)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 04:24:59 +00:00
dependabot-preview[bot]
9e23b49143
Bump eslint-plugin-promise from 4.1.1 to 4.2.1 in /backend 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 04:24:08 +00:00
dependabot-preview[bot]
8e33bade21
Bump apollo-server-testing from 2.6.4 to 2.6.6 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.4 to 2.6.6.
- [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.4...apollo-server-testing@2.6.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 04:23:51 +00:00
senderfm
6c7ee1ef42 das einmalige melden eines User, Beitrags oder Kommentars 
ist jetzt möglich
 2019-06-25 17:51:14 +02:00
Matt Rider
9f8720df81 Remove need for third party url upload 
- we can save the file to a variable, it requires a "url" returned
- we can get by returning an empty string
 2019-06-25 12:09:48 -03:00
Matt Rider
145f488556 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-25 09:41:40 -03:00
Robert Schäfer
ef9b43f1da
Merge pull request #901 from Human-Connection/900-refactor-create-comments-mutation-remove-global-event-listener-update-cache 
Refactor CreateComments functionality
 2019-06-25 11:49:19 +02:00
Robert Schäfer
ad51da8e3c
Merge pull request #882 from Human-Connection/unfork-neo4j-graphql-js 
Use upstream neo4j-graphql-js
 2019-06-25 11:48:10 +02:00
senderfm
74cbe47485 region and place is no longer created twice. 2019-06-25 07:43:27 +02:00
dependabot-preview[bot]
21b38e1942
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 04:25:55 +00:00
mattwr18
49cc012da3
Merge pull request #877 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.36 
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.36 in /backend
 2019-06-24 20:18:03 -03:00
Matt Rider
c6203ad8eb Refactor CreateComments functionality 
- update apollo cache on successful mutation
- remove global event listener
- avoid refetch Post to update CommentsList
- return comment with its author from resolver
 2019-06-24 18:21:52 -03:00
dependabot-preview[bot]
37e8eb9a68
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.36 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.34 to 2.0.0-alpha.36.
- [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.34...v2.0.0-alpha.36)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:37:14 +00:00
Robert Schäfer
96cda680bb Use upstream neo4j-graphql-js 
After the relevant PR of mine has been merged, we should point our
`package.json` back to the published npm version of `neo4j-graphql-js`.
That way we are receiving updates again.
 2019-06-24 21:33:23 +02:00
dependabot-preview[bot]
0ebfdd27c5
Bump eslint-plugin-jest from 22.7.0 to 22.7.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.0 to 22.7.1.
- [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.0...v22.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:28:15 +00:00