2429 Commits

Author SHA1 Message Date
Wolfgang Huß
9929aa4626 Rnamed "sessionRes" to "transactionRes"
Even in the rewards mutation.
2019-04-12 08:41:53 +02:00
Wolfgang Huß
c636d031be Refactored mutations "shout", "unshout"
Formated "schema.graphql" for better readability.
"
2019-04-10 15:24:58 +02:00
Wolfgang Huß
2feedc94e7 Refactored mutation "unfollow"
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations
2019-04-10 14:45:45 +02:00
Wolfgang Huß
6a01146647 Refactored mutation "follow"
Done by @Tirokk and @mattwr18 .
2019-04-10 14:11:13 +02:00
Robert Schäfer
a28da06a00
Merge pull request #445 from Human-Connection/346-mark_as_read
Mark a notification in the backend as read
2019-04-10 14:04:34 +02:00
Robert Schäfer
40c1f683ee
Merge pull request #442 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.18.11
Bump nodemon from 1.18.10 to 1.18.11 in /webapp
2019-04-10 13:39:43 +02:00
Robert Schäfer
b6b000e805
Merge pull request #444 from Human-Connection/less_flaky_cucumbers
Disabling activityPub middleware again
2019-04-10 13:39:26 +02:00
Robert Schäfer
8629b826b8
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-10 11:39:52 +02:00
Robert Schäfer
81b84916a3
Merge branch 'master' into less_flaky_cucumbers 2019-04-10 11:39:49 +02:00
Robert Schäfer
da2cfd4be3
Merge branch 'master' into 346-mark_as_read 2019-04-10 11:39:46 +02:00
Robert Schäfer
bbe36f3206
Merge pull request #446 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.2
Bump graphql-shield from 5.3.1 to 5.3.2 in /backend
2019-04-10 11:39:21 +02:00
Robert Schäfer
e61abed88c
Merge branch 'master' into 346-mark_as_read 2019-04-10 11:36:45 +02:00
Robert Schäfer
1f8c91f2d4
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-10 11:35:10 +02:00
Robert Schäfer
eab5d160f7
Merge branch 'master' into less_flaky_cucumbers 2019-04-10 11:29:06 +02:00
Wolfgang Huß
61c781c922 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-10 11:17:43 +02:00
Wolfgang Huß
587025e4d3 Start refactoring follow 2019-04-10 11:15:45 +02:00
dependabot[bot]
8d8c75d6c1
Bump graphql-shield from 5.3.1 to 5.3.2 in /backend
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.1...v5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-10 08:58:34 +00:00
8821b1c7f1
Merge pull request #438 from Human-Connection/2019/kw15/new_post_button_position
2019/kw15/new_post_button_position
2019-04-10 10:56:22 +02:00
23c2b6889b
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-10 10:25:07 +02:00
ff86088260
Merge pull request #443 from Human-Connection/2019/kw15/Access_Settings_from_Profile_as_Owner
2019/kw15/Access_Settings_from_Profile_as_Owner
2019-04-10 10:23:18 +02:00
c8d01d80cf
Merge branch 'master' into 2019/kw15/Access_Settings_from_Profile_as_Owner 2019-04-10 10:07:06 +02:00
Robert Schäfer
b63200ac8e Authorize and whitelist Notifications 2019-04-10 01:58:18 +02:00
Robert Schäfer
26caff5a9b Fix lint 2019-04-10 01:58:18 +02:00
Robert Schäfer
0476c15163 Remove dots from matched @mention regex 2019-04-10 01:58:18 +02:00
Robert Schäfer
58019c8975 Avoid to send out notifications for email adresses 2019-04-10 01:58:18 +02:00
Robert Schäfer
771779348a Fix test 2019-04-10 01:58:18 +02:00
Robert Schäfer
bab748e506 Create notifications on CreatePost 2019-04-10 01:58:18 +02:00
Robert Schäfer
4dead6e6f7 Sketch test to create a notificaion for a mention 2019-04-10 01:58:18 +02:00
Robert Schäfer
6d24a63143
Merge pull request #437 from Human-Connection/2019/kw15/disabled_post_fix_disabled_border_z-index
2019/kw15/disabled_post_fix_disabled_border_z-index
2019-04-10 00:44:18 +02:00
Robert Schäfer
17046f029c
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-10 00:43:59 +02:00
Robert Schäfer
607cee7f70
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-10 00:41:58 +02:00
Robert Schäfer
8c937bcb2d
Merge branch 'master' into 2019/kw15/Access_Settings_from_Profile_as_Owner 2019-04-10 00:41:40 +02:00
Robert Schäfer
ad2e628ba4
Merge branch 'master' into 2019/kw15/disabled_post_fix_disabled_border_z-index 2019-04-10 00:01:00 +02:00
Robert Schäfer
89914f9a1a Disabling activityPub middleware again
I thought it might be a good thing to create RSA keys at least for
cucumber testing. At least that's where we test activitityPub. But it
caused too flaky tests and broken builds. @Mastercuber if you need to
create a user and you need the RSA keys, don't create it through seeds
but through the actual server.
2019-04-09 23:47:13 +02:00
Robert Schäfer
3d47735b32
Merge pull request #441 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.18.11
Bump nodemon from 1.18.10 to 1.18.11 in /backend
2019-04-09 23:41:31 +02:00
Robert Schäfer
030e41c995
Merge branch 'master' into dependabot/npm_and_yarn/backend/nodemon-1.18.11 2019-04-09 22:13:02 +02:00
Robert Schäfer
98e7d28457
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-09 22:12:56 +02:00
Robert Schäfer
98138f2500
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-09 22:10:04 +02:00
Robert Schäfer
cf612e6fda
Merge branch 'master' into 2019/kw15/disabled_post_fix_disabled_border_z-index 2019-04-09 22:07:45 +02:00
Robert Schäfer
04e8642d17
Merge pull request #435 from Human-Connection/2019/kw15/post_make_menu_sticky
2019/kw15/post_make_menu_sticky
2019-04-09 22:04:56 +02:00
5c540b618e
Access Settings from Profile as Owner -> link was already present, but text was misleading (corrected), removed eslint exception 2019-04-09 13:24:00 +02:00
5e28ef32ab
lint fixes 2019-04-09 11:14:41 +02:00
03eb58ed3b
lint fixes 2019-04-09 11:13:19 +02:00
b235c640c5
lint fix 2019-04-09 11:09:03 +02:00
dependabot[bot]
6c43941429
Bump nodemon from 1.18.10 to 1.18.11 in /webapp
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.10 to 1.18.11.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.10...v1.18.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-09 04:54:12 +00:00
dependabot[bot]
5b64ba1dd1
Bump nodemon from 1.18.10 to 1.18.11 in /backend
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.10 to 1.18.11.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.10...v1.18.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-09 04:52:26 +00:00
e51fd361ed
fixed position of new post button to fit all devices and be completely visible at any time 2019-04-08 12:45:03 +02:00
42e39a6973
fixed disabled red border z-index in order not to cross the menu in profile, refactored css of postCard 2019-04-08 12:32:42 +02:00
Wolfgang Huß
c513b7ba2e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-08 11:41:42 +02:00
1f31c29552
make post sticky - fixes https://github.com/Human-Connection/Human-Connection/issues/385 2019-04-08 11:39:39 +02:00