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

781 Commits

Author SHA1 Message Date
senderfm
3481b1f24b maximum number of characters in content without html tags is 2000, characters are counted and number is displayed. regex is strongly shortened. 2019-07-10 09:18:47 +02:00
senderfm
aa264a0d56 fixed specs, test ok 2019-07-04 18:02:06 +02:00
senderfm
23cf309cfc HcContributionForm submit is disabled by default replace all editor html tags 2019-07-04 17:14:02 +02:00
senderfm
cb356161e5 HcContributionForm submit is disabled by default 2019-07-04 16:53:56 +02:00
senderfm
d108ee5bab long links and content is wrapped 2019-07-03 15:30:21 +02:00
senderfm
0c1403dda5 fix conflict 2019-07-03 10:06:48 +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
Robert Schäfer
a4dd65ab40
Merge pull request #955 from Human-Connection/717-comment-display-and-design 
Add basic styling for comment list
 2019-07-03 00:48:49 +02:00
Matt Rider
2407f0b0d1 Add basic styling for comment list 2019-07-02 19:14:18 -03:00
Matt Rider
1c1a390d0c Refactor code to extract query to it's own file 2019-07-02 18:38:41 -03:00
senderfm
ffb261b71c load long content after save 2019-07-02 18:18:18 +02: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
82c08b17b4
Merge pull request #933 from Human-Connection/907-Mobile-Responsive-Menu-Navbar 
907 mobile responsive menu navbar
 2019-07-02 12:18:59 -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
Robert Schäfer
cbc8fc8d83 Add missing German translations 2019-07-02 14:18:39 +02:00
Ulf Gebhardt
55b598fb69
Merge pull request #942 from Human-Connection/dependabot/docker/webapp/node-12.5-alpine 
Bump node from 12.4-alpine to 12.5-alpine in /webapp
 2019-07-02 01:25:13 +02:00
Matt Rider
b034d22732 Fix failing cypress test 2019-07-01 18:50:24 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03: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
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
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
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
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
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
Matt Rider
6d8e981043 Fix styling for EditPost teaser image 2019-06-25 19:20:26 -03: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