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
10,123 Commits 5 Branches 2 Tags
Commit Graph

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
966cdc9574 fix #2229 
I have to agree with @vbelolapotkov here. First of all the translation
for German an English does not match and second it does not make an awful
lot of sense to have "Report these actions" twice in the list. The
English translation "Advocacy or encouragement to these behaviors."
probably belongs into the section before.
 2020-01-12 17:35:31 +01:00
Robert Schäfer
4d604368d7
Merge pull request #2552 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.11.0 
build(deps): bump nuxt from 2.10.2 to 2.11.0 in /webapp
 2020-01-11 02:52:42 +01:00
roschaefer
3781ba5d2e Fix LoginForm test and lints 2020-01-11 01:48:19 +01:00
roschaefer
8c29ad947b Update vue-test-utils and follow updated docs 
https://vue-test-utils.vuejs.org/guides/#writing-asynchronous-tests-using-nexttick-new
 2020-01-11 00:37:22 +01:00
roschaefer
6a0bdc02aa Update vue-template-compiler in package.json 
This will make https://github.com/Human-Connection/Human-Connection/pull/2526
obsolete.
 2020-01-10 19:57:29 +01:00
roschaefer
6087f8a63a Run yarn upgrade vue-template-compiler 
@mattwr18 apparently `nuxt` and `vue-template-compiler` need to be
updated simultaneously.
 2020-01-10 19:54:02 +01:00
dependabot-preview[bot]
3d6ab8384b build(deps): bump nuxt from 2.10.2 to 2.11.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.2 to 2.11.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.10.2...v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 19:52:34 +01:00
Robert Schäfer
9a0234f340
Merge pull request #2724 from Human-Connection/update-yarn-lock 
Update yarn.lock after dependabot update
 2020-01-10 19:41:37 +01:00
mattwr18
2e3fad7d27
Merge pull request #2657 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.9.2 
build(deps): bump @nuxtjs/axios from 5.8.0 to 5.9.2 in /webapp
 2020-01-10 19:08:54 +01:00
mattwr18
a1defad387
Merge pull request #2722 from Human-Connection/update-to-version-0.2.1 
Update to version 0.2.1
 2020-01-10 16:51:03 +01:00
mattwr18
cfe0320e4f Update yarn.lock after dependabot update 2020-01-10 16:44:09 +01:00
mattwr18
55443e2eb5 Update to version 0.2.1 2020-01-10 16:18:05 +01:00
mattwr18
e78beb3b79 v0.2.1 2020-01-10 16:17:19 +01:00
mattwr18
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users 
🍰 Search For Users
 2020-01-10 13:59:44 +01:00
mattwr18
365acdc41e
Merge pull request #2713 from Human-Connection/2712-lock-node-version-dockerfiles 
Use node LTS in production
 2020-01-10 13:02:02 +01:00
mattwr18
c53d4d3aed
Merge pull request #2718 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.16 
build(deps): bump apollo-server from 2.9.15 to 2.9.16 in /backend
 2020-01-10 12:58:28 +01:00
mattwr18
84780013f4 Fix cypress tests/start refactor search story 
- Cannot use data-test in cypress tests as we use production image and
data-test are removed to minimize the image. Select based on styleguide
input's class

- Story is still not working because of filter dateTime and
$i18n.locale(), we can fix this later.

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2020-01-10 12:52:54 +01:00
mattwr18
b2db5e6057 Skip tests for DonationsInfo 
- the functionality it's testing has been suspended. If we add back that
functionality, we should refactor the tests/stop skipping.
- Or maybe we can remove them in a separate PR??
 2020-01-10 10:35:12 +01:00
Moriz Wahl
e6f1672067 cypress matcher modified 2020-01-10 10:22:16 +01:00
mattwr18
68b2fb2361
Merge pull request #2715 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.11.5 
build(deps): bump neo4j-graphql-js from 2.11.4 to 2.11.5 in /backend
 2020-01-10 10:11:39 +01:00
dependabot-preview[bot]
6afdb546df
build(deps): bump apollo-server from 2.9.15 to 2.9.16 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.15 to 2.9.16.
- [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.9.15...apollo-server@2.9.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 09:09:32 +00:00
mattwr18
e00fde5650
Merge pull request #2720 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.16 
build(deps-dev): bump apollo-server-testing from 2.9.15 to 2.9.16 in /backend
 2020-01-10 10:08:48 +01:00
mattwr18
8503546c15
Merge pull request #2719 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-17.0.2 
build(deps): bump @hapi/joi from 17.0.0 to 17.0.2 in /backend
 2020-01-10 10:08:04 +01:00
mattwr18
4a607d491e
Merge pull request #2717 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.16 
build(deps): bump apollo-server-express from 2.9.15 to 2.9.16 in /backend
 2020-01-10 10:07:31 +01:00
mattwr18
b35ac612f0
Merge pull request #2716 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.9.5 
build(deps): bump metascraper-url from 5.8.13 to 5.9.5 in /backend
 2020-01-10 10:07:05 +01:00
Moriz Wahl
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
dependabot-preview[bot]
8e8dfabbc8
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.15 to 2.9.16.
- [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.9.15...apollo-server-testing@2.9.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 04:19:07 +00:00
dependabot-preview[bot]
55e510baea
build(deps): bump @hapi/joi from 17.0.0 to 17.0.2 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 17.0.0 to 17.0.2.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Commits](https://github.com/hapijs/joi/compare/v17.0.0...v17.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 04:18:39 +00:00
dependabot-preview[bot]
84df7b5a0a
build(deps): bump apollo-server-express in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.9.15 to 2.9.16.
- [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.9.15...apollo-server-express@2.9.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 04:18:05 +00:00
dependabot-preview[bot]
b782a410d3
build(deps): bump metascraper-url from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 04:17:05 +00:00
dependabot-preview[bot]
bbd2a788bc
build(deps): bump neo4j-graphql-js from 2.11.4 to 2.11.5 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.11.4 to 2.11.5.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-10 04:16:34 +00:00
mattwr18
fde8540d0b
Merge pull request #2706 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.9.0 
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /backend
 2020-01-09 16:27:42 +01:00
mattwr18
7a400f2da4
Merge pull request #2703 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.9.5 
build(deps): bump metascraper-lang from 5.8.13 to 5.9.5 in /backend
 2020-01-09 16:27:26 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
mattwr18
fc567b9d84 Remove Content.feature 
- Muting a user means I cannot see their content, they can still see
mine
- Even for blocking, we want a blocked user to be able to see the
content just not interact with it.
 2020-01-09 13:47:30 +01:00
mattwr18
dae1062ad0 Use node LTS in production 2020-01-09 13:33:05 +01:00
dependabot-preview[bot]
08099274ef
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.8.1 to 2.9.0.
- [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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 12:25:14 +00:00
dependabot-preview[bot]
70204c27eb
build(deps): bump metascraper-lang from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 12:23:13 +00:00
mattwr18
36dadfb4c1
Merge pull request #2711 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.9.0 
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /webapp
 2020-01-09 13:22:56 +01:00
mattwr18
bf9f71d776
Merge pull request #2697 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.9.5 
build(deps): bump metascraper-logo from 5.8.13 to 5.9.5 in /backend
 2020-01-09 13:21:29 +01:00
mattwr18
3514a5b6ab
Merge pull request #2694 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.9.5 
build(deps): bump metascraper-title from 5.8.13 to 5.9.5 in /backend
 2020-01-09 13:21:15 +01:00
mattwr18
40ff5fb690
Merge pull request #2690 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.9.5 
build(deps): bump metascraper-description from 5.8.15 to 5.9.5 in /backend
 2020-01-09 13:21:00 +01:00
Robert Schäfer
aba14a6704
Merge pull request #2708 from Human-Connection/dependabot/docker/webapp/node-13.6.0-alpine 
build(deps): bump node from 13.5.0-alpine to 13.6.0-alpine in /webapp
 2020-01-09 11:34:56 +01:00
Alina Beck
70d632e392 use scss tokens for counter icon and loading spinner 2020-01-09 14:47:14 +05:30
dependabot-preview[bot]
61e6868c18
build(deps): bump date-fns from 2.8.1 to 2.9.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.8.1 to 2.9.0.
- [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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 09:09:42 +00:00
dependabot-preview[bot]
c975006e02
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.8.15 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.15...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 09:09:34 +00:00
dependabot-preview[bot]
af5aaf5b42
build(deps): bump metascraper-logo from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 09:08:50 +00:00
dependabot-preview[bot]
3dcdd8d1b2
build(deps): bump metascraper-title from 5.8.13 to 5.9.5 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 09:08:46 +00:00
mattwr18
770b2c6d7a
Merge pull request #2709 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.11.0 
build(deps): bump @sentry/node from 5.10.2 to 5.11.0 in /backend
 2020-01-09 10:08:44 +01:00
mattwr18
fffa03127c
Merge pull request #2707 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.9.5 
build(deps): bump metascraper-audio from 5.8.13 to 5.9.5 in /backend
 2020-01-09 10:08:06 +01:00