IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,888 Commits 5 Branches 2 Tags
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
9f6757f409 Use guard clauses if possible 2019-08-26 16:53:22 +02:00
Wolfgang Huß
af968461b6 Split handleNotificationsMiddleware in notificationsMiddleware and hashtagsMiddleware 2019-08-26 16:24:43 +02:00
Matt Rider
75d984073d Check there are ids in the badIds array 
- if there are no ids, we shouldn't add an empty array since it adds unneccessarily to our auto-generated post query and affects greatly performance. see issue #1390
 2019-08-26 16:19:42 +02:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
roschaefer
194665bf2e Remove explicit default, see if cypress tests fail 2019-08-26 13:56:32 +02:00
dependabot-preview[bot]
90a9f672e9
Bump apollo-server from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.8.2...apollo-server@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 11:46:58 +00:00
Alina Beck
62e34bf5b0 refactor suggestion list 2019-08-26 12:46:46 +01:00
dependabot-preview[bot]
37ec1a5a4f
Bump babel-eslint from 10.0.2 to 10.0.3 in /backend 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 11:45:41 +00:00
mattwr18
f11091c4ce
Merge pull request #1387 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.0 
Bump apollo-server-testing from 2.8.2 to 2.9.0 in /backend
 2019-08-26 13:44:50 +02:00
mattwr18
e89a74f1c6
Merge pull request #1383 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.3 
Bump babel-eslint from 10.0.2 to 10.0.3 in /webapp
 2019-08-26 13:43:42 +02:00
mattwr18
8c406af2a8
Merge pull request #1380 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.0 
Bump apollo-server-express from 2.8.2 to 2.9.0 in /backend
 2019-08-26 13:39:46 +02:00
roschaefer
c9b5f8e8d3 Fix infinite-loading infinitely loading 2019-08-26 13:39:01 +02:00
dependabot-preview[bot]
c3c07333a6
Bump date-fns from 2.0.0 to 2.0.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0 to 2.0.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...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 11:38:38 +00:00
mattwr18
6e47011970
Merge pull request #1379 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.3 
Bump graphql from 14.5.0 to 14.5.3 in /webapp
 2019-08-26 13:36:46 +02:00
mattwr18
523846ce98
Merge pull request #1377 from Human-Connection/simplify_docker_entrypoint_of_neo4j_image 
Simplify docker entrypoint of neo4j image
 2019-08-26 13:15:27 +02:00
roschaefer
f206d40e86 Add memory limits to neo4j deployment 
I cannot increase the memory above "2G" without getting an error that no
node has capacity for it. So I believe we have to change the kubernetes
cluster if we want to assign more memory to neo4j.

The other settings were suggested to me by neo4j-admin memrec:
https://neo4j.com/docs/operations-manual/current/tools/neo4j-admin-memrec/
 2019-08-26 13:03:48 +02:00
Alina Beck
5c4ec0dd19 use constants for keycodes and mention types 2019-08-26 11:58:15 +01:00
mattwr18
07f067822a
Merge pull request #1375 from Human-Connection/fix-flickery-create-button 
Fix flickering create-button
 2019-08-26 11:25:12 +02:00
dependabot-preview[bot]
c8f7391d05
Bump apollo-server-testing from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.8.2...apollo-server-testing@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:27:11 +00:00
dependabot-preview[bot]
881277270d
Bump eslint-loader from 2.2.1 to 3.0.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.2.1 to 3.0.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/v2.2.1...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:26:48 +00:00
dependabot-preview[bot]
7f94273e61
Bump babel-eslint from 10.0.2 to 10.0.3 in /webapp 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:25:44 +00:00
dependabot-preview[bot]
7c78a5f889
Bump apollo-server-express from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-express@2.8.2...apollo-server-express@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:27 +00:00
dependabot-preview[bot]
d4f43b6264
Bump graphql from 14.5.0 to 14.5.3 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.0 to 14.5.3.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.0...v14.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:00 +00:00
roschaefer
f464ee93e0 Setup database on Travis CI 2019-08-25 13:03:46 +02:00
roschaefer
67f5dd53e2 Remove the custom entrypoint from the docker image 
.. add documentation how to setup indices manually.
 2019-08-25 13:03:46 +02:00
Alina Beck
dc70da8826 make optional extensions a computed property 2019-08-24 12:42:34 +01:00
Alina Beck
6b452a2217 refactor duplicate code 2019-08-24 11:59:59 +01:00
Alina Beck
af985ba95c rename suggestions menu to suggestion list 2019-08-24 10:44:37 +01:00
Alina Beck
62775a93d6 put link input in separate component 2019-08-24 10:42:24 +01:00
Alina Beck
2c0b2ed482 place tippy popup in renderless component 2019-08-23 23:21:24 +01:00
Alina Beck
fbe4de347b extract suggestions menu into separate component 2019-08-23 22:30:05 +01:00
roschaefer
894a59ecc7 Fix flickering create-button 2019-08-23 20:05:08 +02:00
ogerly
63549c1101 Tests for create users with terms and conditions are ok 2019-08-23 19:37:23 +02:00
Alina Beck
cbb0d79331 put link bubble back in (wip) 2019-08-23 17:37:17 +01:00
Robert Schäfer
6cfa5fbdfc
Merge pull request #1371 from Human-Connection/fix_sentry_when_context_user_null 
Fix "cannot read property id of null" in staging
 2019-08-23 18:06:51 +02:00
Alina Beck
ee00a3b3df replace floating and bubble menu with menu bar 2019-08-23 15:49:20 +01:00
Wolfgang Huß
b8e391894e
Merge pull request #1372 from Human-Connection/451-lokalise-unlocalised-texts-20190823 
🍰 454 Lokalise unlocalised texts and fixes texts
 2019-08-23 16:26:26 +02:00
Wolfgang Huß
2600c69185 Change code after @mattwr18 suggestions 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-23 15:57:31 +02:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
roschaefer
123c30b301 Fix "cannot read property id of null" in staging 2019-08-23 14:53:52 +02:00
Wolfgang Huß
be981c7b78 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190823 2019-08-23 14:52:44 +02:00
Wolfgang Huß
a10e2e3a9b Make user profile follow(ed) lists exceeds 5 users and X more better translatable 
Slite adjustment of `more` to `more …`
 2019-08-23 14:37:52 +02:00
Robert Schäfer
b82743463e
Merge pull request #1368 from Human-Connection/1352-fix-update-post-resolver 
Fix UpdatePost resolver/validations
 2019-08-23 13:37:16 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
Robert Schäfer
9e3df325ab
Merge pull request #1370 from Human-Connection/test-es6-syntax 
Use ES6 syntax to avoid repetition
 2019-08-23 13:19:38 +02:00
ogerly
877b0ea77e Terms and conditions are handed over cleanly during registration 2019-08-23 13:17:54 +02:00
Matt Rider
79e6b56396 Use ES6 syntax to avoid repetition 2019-08-23 12:35:53 +02:00
Matt Rider
8555148e53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1352-fix-update-post-resolver 2019-08-23 12:19:19 +02:00
Matt Rider
cd5e492569 Await relation be added 2019-08-23 12:18:53 +02:00
Robert Schäfer
f4f98a95c9
Merge pull request #1356 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.0.1 
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend
 2019-08-23 11:46:57 +02:00