IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-14 00:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,705 Commits 5 Branches 2 Tags
Commit Graph

1593 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Matt Rider
bb40e9d432 Update component tests for categories 2019-06-26 18:21:12 -03:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
Ulf Gebhardt
31259b4341
Merge pull request #911 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.0.0 
Bump eslint-config-prettier from 5.0.0 to 6.0.0 in /webapp
 2019-06-26 14:06:13 +02:00
Robert Schäfer
421ee07b98
Merge pull request #913 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-promise-4.2.1 
Bump eslint-plugin-promise from 4.1.1 to 4.2.1 in /webapp
 2019-06-26 11:03:43 +02:00
dependabot-preview[bot]
fad0447312
Bump eslint-config-prettier from 5.0.0 to 6.0.0 in /webapp 
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 09:03:03 +00:00
dependabot-preview[bot]
4f8122e117
Bump date-fns from 2.0.0-alpha.36 to 2.0.0-alpha.37 in /webapp 
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:25:08 +00:00
dependabot-preview[bot]
dba7678e5f
Bump eslint-plugin-promise from 4.1.1 to 4.2.1 in /webapp 
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:03 +00:00
Matt Rider
2baaf85b21 Extract TeaserImage component, refactor tests 2019-06-25 20:49:09 -03:00
Grzegorz Leoniec
6d852b5803 Added basic embed link rendering 2019-06-26 00:44:44 +02:00
Grzegorz Leoniec
e4279c3694 Fixed no-ssr in storybook 2019-06-26 00:41:29 +02:00
Grzegorz Leoniec
e8f1c04ffe Fixed small issues 2019-06-26 00:37:11 +02:00
Matt Rider
6d8e981043 Fix styling for EditPost teaser image 2019-06-25 19:20:26 -03:00
Grzegorz Leoniec
cc64f43a9f added one more post story 2019-06-25 22:39:00 +02: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
Grzegorz Leoniec
2b80c12e91 Added actions and accessibility addons 2019-06-25 15:40:09 +02: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
senderfm
e0c7566edd variable changed 2019-06-25 12:09:50 +02:00
Robert Schäfer
4ea6834919
Merge pull request #881 from Human-Connection/paginage_12_entries 
Page size of 12 entries on / page
 2019-06-25 11:50:23 +02: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
9b7a0f0031
Merge pull request #898 from Human-Connection/895-write-component-tests-for-update-post 
Write tests for UpdatePost, refactor tests
 2019-06-25 11:47:04 +02:00
Robert Schäfer
7140950c59
Merge pull request #903 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-5.2.3 
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /webapp
 2019-06-25 11:45:52 +02:00
Wolfgang Huß
58810c6add Merge branch '779-tags-of-contribution-in-text' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-06-25 08:53:47 +02:00
dependabot-preview[bot]
b723093c06
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /webapp 
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:26:49 +00:00