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

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ulf Gebhardt
44205e7268
delete follows correctly 2019-07-01 16:18:49 +02:00
Ulf Gebhardt
760f899379
import emotions 2019-07-01 16:18:14 +02:00
Matt Rider
2edf99148d Remove test 
- we don't set the form language because we want to have the name of the language as a placeholder, not its code
 2019-07-01 08:22:46 -03:00
Matt Rider
51a7a0e5d8 Add back test accidentally deleted 2019-07-01 07:29:06 -03:00
senderfm
d7b423ec61 code variable designation changed from isActive to isCollapsed 2019-07-01 12:17:14 +02:00
senderfm
e255b71cc8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-07-01 11:19:01 +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]
292b527ea2
Bump node from 12.4-alpine to 12.5-alpine in /webapp 
Bumps node from 12.4-alpine to 12.5-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 04:31:58 +00: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
dependabot-preview[bot]
9ac513ad45
Bump cypress-file-upload from 3.1.4 to 3.2.0 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.1.4 to 3.2.0.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.1.4...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 04:26:37 +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
a57fdec86c
Merge pull request #928 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.2 
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.2 in /webapp
 2019-06-29 22:54:02 -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
mattwr18
084447c743
Merge pull request #929 from Human-Connection/dependabot/npm_and_yarn/cypress-3.3.2 
Bump cypress from 3.3.1 to 3.3.2
 2019-06-29 22:53:13 -03:00
Wolfgang Huß
118e53fa02 Added a missing Deletable 2019-06-29 19:21:20 +02: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
dependabot-preview[bot]
2e48a3529b
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.2 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 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-alpha.37...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-29 16:22:49 +00:00
Matt Rider
e06b05af90 Remove request for categories from CreatePost 2019-06-29 13:09:48 -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
senderfm
7879ec9233 clear bug of testcode remove 2019-06-28 11:21:41 +02:00
senderfm
ac6da2e42c fixed lint und test ok 2019-06-28 11:19:22 +02:00
senderfm
1b2396645f main menu changed to flex menu and responsively adapted, search edited 2019-06-28 09:01:47 +02: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]
5980249703
Bump cypress from 3.3.1 to 3.3.2 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-28 04:22:52 +00:00
mattwr18
7763083bd6
Merge pull request #925 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.1 
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /webapp
 2019-06-27 18:18:13 -03: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
49e99417ac
Merge pull request #923 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.4.0 
Bump graphql from 14.3.1 to 14.4.0 in /webapp
 2019-06-27 18:17:05 -03: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
mattwr18
df4ae95ae3
Merge pull request #920 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.7 
Bump apollo-server-testing from 2.6.6 to 2.6.7 in /backend
 2019-06-27 18:15:31 -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ß
12418eefd9 Little refactoring 2019-06-27 11:10:42 +02: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]
3eab153164
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /webapp 
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:24:11 +00:00
dependabot-preview[bot]
84e81f88c4
Bump graphql from 14.3.1 to 14.4.0 in /webapp 
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:55 +00: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