16408 Commits

Author SHA1 Message Date
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
Matt Rider
4de8407620 Rename variable, mutation
- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
2019-04-08 12:05:57 -03:00
Matt Rider
832afee51d Merge branch '236-list-social-media-accounts' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-08 11:57:51 -03:00
Matt Rider
a1ebb89d64 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-08 11:57:35 -03:00
mattwr18
bcd4cbe184
Merge branch 'master' into 236-list-social-media-accounts 2019-04-08 11:40:56 -03:00
0e09b0fb74
fixed design differences between alpha & nitro - Post Page
- [X] Title and Author Position reversed
- [X] Design & Format of Post-Date + Position
- [X] No Category Names
- [X] Actions/Reactions & Tags reversed
2019-04-08 15:53:00 +02: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
Robert Schäfer
adde8a5965 Remove dots from matched @mention regex 2019-04-08 12:08:49 +02:00
Robert Schäfer
f372cdcbdb Avoid to send out notifications for email adresses 2019-04-08 12:01:09 +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
5d1cb43e8c
hide all unfunctional content - fixes https://github.com/Human-Connection/Human-Connection/issues/429 2019-04-08 10:48:04 +02:00
Robert Schäfer
93097d586c Merge remote-tracking branch 'origin/master' into create_notifications 2019-04-08 10:20:23 +02:00
Robert Schäfer
8e6fb3d9e2 Fix test 2019-04-08 10:19:57 +02:00
Robert Schäfer
cece32f55d
Merge pull request #431 from Human-Connection/dependabot/npm_and_yarn/backend/cheerio-1.0.0-rc.3
Bump cheerio from 1.0.0-rc.2 to 1.0.0-rc.3 in /backend
2019-04-08 10:12:51 +02:00
dependabot[bot]
419b80dae4
Bump cheerio from 1.0.0-rc.2 to 1.0.0-rc.3 in /backend
Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.2 to 1.0.0-rc.3.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Changelog](https://github.com/cheeriojs/cheerio/blob/1.0.0-rc.3/History.md)
- [Commits](https://github.com/cheeriojs/cheerio/compare/1.0.0-rc.2...1.0.0-rc.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-08 04:55:37 +00:00
Robert Schäfer
cf1f655451 Create notifications on CreatePost 2019-04-06 16:02:54 +02:00
ad307e7008
Merge branch 'master' into dependabot/docker/backend/neo4j/neo4j-3.5.3 2019-04-06 09:46:48 +02:00
35fe706d0a
Merge branch 'master' into 236-list-social-media-accounts 2019-04-06 09:46:38 +02:00
6721b0d094
Merge branch 'master' into 342-merge_documentation 2019-04-06 09:45:37 +02:00
851e6919e9
Merge branch 'master' into keep_private_rsa_key_secret 2019-04-06 09:45:21 +02:00
c1785af8e1
Merge branch 'master' into create_notifications 2019-04-06 09:44:43 +02:00
Robert Schäfer
471a7affb1
Merge pull request #362 from Human-Connection/quick-fix
Fixes #361
2019-04-06 00:28:46 +02:00
63a646c6b1
Merge branch 'master' into dependabot/docker/backend/neo4j/neo4j-3.5.3 2019-04-05 20:01:07 +02:00
a941bcdd9a
Merge branch 'master' into 236-list-social-media-accounts 2019-04-05 20:00:46 +02:00
1b9ce269cf
Merge branch 'master' into quick-fix 2019-04-05 20:00:14 +02:00
a8e574e8bb
Merge branch 'master' into 342-merge_documentation 2019-04-05 19:59:37 +02:00
ea2499fafa
Merge branch 'master' into keep_private_rsa_key_secret 2019-04-05 19:59:15 +02:00
256b4d92bb
Merge branch 'master' into create_notifications 2019-04-05 19:58:51 +02:00
Wolfgang Huß
a995c84ddf Merge branch 'keep_private_rsa_key_secret' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-05 18:43:47 +02:00
Wolfgang Huß
c4e57fc928 User to query for "publicKey" is generated on port "4001"
But still no "publicKey" is generated.
So wished failing test shows not "publicKey" except other than "null".
2019-04-05 18:32:11 +02:00
Wolfgang Huß
8713f61734 Added Tests to "user_management.spec.js"
Implemented suppression of "publicKey", now commented out for testing approach.
Use port 4001 for querying, but forgot that I have to generate the user on the same port, before I can query it with generated "publicKey".
Do this in next commit.
2019-04-05 17:44:43 +02:00
c7cb5f3eec
Merge pull request #396 from Human-Connection/github_emojis
Use github emojis if possible
2019-04-05 16:07:08 +02:00
Robert Schäfer
cb5280e6e8 Sketch test to create a notificaion for a mention 2019-04-05 14:35:41 +02:00
Matt Rider
24d4259510 Add validURLMiddleware, remove unused package, extract tests 2019-04-05 09:15:22 -03:00
Robert Schäfer
c3b320380a
Merge pull request #368 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.3
Bump @babel/core from 7.4.0 to 7.4.3 in /webapp
2019-04-05 13:50:09 +02:00
dependabot[bot]
ca6acb4041
Bump @babel/core from 7.4.0 to 7.4.3 in /webapp
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.0 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.4.0...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-05 10:45:58 +00:00
Robert Schäfer
2b725aec78
Merge pull request #390 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.7.1
Bump jest from 24.7.0 to 24.7.1 in /webapp
2019-04-05 12:44:07 +02:00
Matt Rider
2778bca11f Merge branch '236-list-social-media-accounts' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:32:34 -03:00
Matt Rider
4d4978c0f2 Merge github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:29:44 -03:00
Robert Schäfer
c543d7558c
Merge pull request #415 from Human-Connection/350-query_current_users_notifications
350 query current users notifications
2019-04-05 12:00:11 +02:00
dependabot[bot]
8b27a565e7
Bump jest from 24.7.0 to 24.7.1 in /webapp
Bumps [jest](https://github.com/facebook/jest) from 24.7.0 to 24.7.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.7.0...v24.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-05 09:53:58 +00:00
Robert Schäfer
a6c2fcebde
Merge pull request #388 from Human-Connection/dependabot/npm_and_yarn/backend/babel-jest-24.7.1
Bump babel-jest from 24.5.0 to 24.7.1 in /backend
2019-04-05 11:51:49 +02:00
Robert Schäfer
710a8515d3 Fix lint 2019-04-05 11:20:19 +02:00
Robert Schäfer
bb3a8525db Only admins are allowed to query all notifications 2019-04-05 02:35:33 +02:00
Robert Schäfer
97d9b6d772 Add notifications to User 2019-04-05 02:35:33 +02:00
Robert Schäfer
03d4c93f96 Add Notification type 2019-04-05 02:35:33 +02:00
Robert Schäfer
8477e71c28 Sketch test for #350 2019-04-05 02:31:32 +02:00
Robert Schäfer
5f43fe77fc Fix kubeconfig filename 2019-04-05 00:25:59 +02:00