4208 Commits

Author SHA1 Message Date
dependabot-preview[bot]
450555f658
Bump eslint-loader from 2.1.2 to 2.2.0 in /webapp
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/2.1.2...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-04 04:29:12 +00: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
senderfm
07b8116447 Update of polish locales 2019-07-03 22:51:39 +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
Matt Rider
daaa979c99 Remove request for image
- we do not need to request it and if there is none it throws an error
2019-07-03 16:20:30 -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
senderfm
d108ee5bab long links and content is wrapped 2019-07-03 15:30:21 +02:00
senderfm
ccafc8709c fixed a bug 2019-07-03 12:29:24 +02:00
Alexander Friedland
324330ad8e
Merge pull request #864 from Human-Connection/844-Comments-cannot-be-expanded-if-they-are-too-long
🐛 [Bug] :  long comments can be folded up and down
2019-07-03 10:52:19 +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
senderfm
91f9aacb79 full ads width use with small devices 2019-07-03 08:26:15 +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
Robert Schäfer
47732b3e13
Merge pull request #954 from Human-Connection/765-refactor-to-extract-query
Refactor code to extract query to it's own file
2019-07-03 00:31:00 +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
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
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
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
Robert Schäfer
cbc8fc8d83 Add missing German translations 2019-07-02 14:18:39 +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
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
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
03eedfc836
Merge pull request #937 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.2.0
Bump cypress-file-upload from 3.1.4 to 3.2.0
2019-07-02 01:24:41 +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
a264ff8eee
emotion data modelling 2019-07-01 16:21:11 +02:00
44205e7268
delete follows correctly 2019-07-01 16:18:49 +02:00
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