2445 Commits

Author SHA1 Message Date
Robert Schäfer
828ca50f19 Update backend/src/resolvers/user_management.spec.js
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
2019-04-12 16:51:30 +02:00
Robert Schäfer
008d99c6ef Update backend/src/resolvers/user_management.spec.js
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
2019-04-12 16:51:10 +02:00
Wolfgang Huß
b007015eeb Backend test for query "publicKey" to asure that "privatKey" is generated
Minor approofments.
2019-04-12 14:30:04 +02:00
Wolfgang Huß
95a0567e69 Query of users "publicKey" 'throws "Not Authorised!"'
Changes password and permission middleware.

Thanks for your big help @roschaefer !
2019-04-11 20:01:20 +02:00
Wolfgang Huß
6794156c86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-11 10:54:12 +02:00
Robert Schäfer
e3f3e081cc
Merge pull request #416 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.6.1
Bump nuxt from 2.4.5 to 2.6.1 in /webapp
2019-04-10 19:49:20 +02:00
Robert Schäfer
cec94bf381
Merge pull request #366 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/cli-7.4.3
Bump @babel/cli from 7.2.3 to 7.4.3 in /backend
2019-04-10 16:01:02 +02:00
dependabot[bot]
9bf9b62485 Bump nuxt from 2.4.5 to 2.6.1 in /webapp
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.4.5 to 2.6.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-10 14:51:01 +02:00
Robert Schäfer
65076d24db
Merge pull request #196 from Human-Connection/dependabot/docker/backend/neo4j/neo4j-3.5.3
Bump neo4j from 3.5.0 to 3.5.3 in /backend/neo4j
2019-04-10 14:33:55 +02:00
dependabot[bot]
87c651e253 Bump @babel/cli from 7.2.3 to 7.4.3 in /backend
Bumps [@babel/cli](https://github.com/babel/babel) from 7.2.3 to 7.4.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.3...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-10 14:30:49 +02:00
d28ef3e7c4
Merge pull request #434 from Human-Connection/2019/kw15/hide_all_unfuctional_content
2019/kw15/hide_all_unfuctional_content
2019-04-10 14:17:58 +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
56ed6260db
Merge branch 'master' into 2019/kw15/hide_all_unfuctional_content 2019-04-10 11:40:07 +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
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
1c78e969c6
Merge branch 'master' into 2019/kw15/hide_all_unfuctional_content 2019-04-10 10:58:11 +02: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