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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
beecd70d41
Merge pull request #2876 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.10.6 
build(deps): bump metascraper-author from 5.10.5 to 5.10.6 in /backend
 2020-01-23 10:36:56 +01:00
mattwr18
7386d4bde3
Merge pull request #2875 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.10.6 
build(deps): bump metascraper-description from 5.10.5 to 5.10.6 in /backend
 2020-01-23 10:36:26 +01:00
mattwr18
b4a557ed9b
Merge pull request #2874 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.10.6 
build(deps): bump metascraper-soundcloud from 5.10.5 to 5.10.6 in /backend
 2020-01-23 10:35:49 +01:00
dependabot-preview[bot]
d29ca0d9b1
build(deps): bump metascraper-youtube from 5.10.5 to 5.10.6 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 04:21:47 +00:00
dependabot-preview[bot]
4a0d745c78
build(deps): bump metascraper-author from 5.10.5 to 5.10.6 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [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.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 04:19:35 +00:00
dependabot-preview[bot]
59bec0c64a
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [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.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 04:19:06 +00:00
dependabot-preview[bot]
92d266e0cc
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 04:18:31 +00:00
mattwr18
2177f5e139
Merge pull request #2868 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-25.1.0 
build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /webapp
 2020-01-22 22:35:00 +01:00
mattwr18
07797d8f87
Merge pull request #2867 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.8 
build(deps-dev): bump @storybook/vue from 5.3.7 to 5.3.8 in /webapp
 2020-01-22 22:34:09 +01:00
Alina Beck
7c090cc3ed set z-index for UserTeaser only on PostCard 2020-01-22 18:09:44 +03:00
Alina Beck
0392826211 set avatar size to small in AvatarMenu and for Anonymous users 2020-01-22 18:05:00 +03:00
Alina Beck
38eec0fc5f rename Comment to CommentCard 2020-01-22 17:43:25 +03:00
Alina Beck
e7bf499d37 use BaseCard in Comment component and refactor 2020-01-22 17:37:32 +03:00
mattwr18
8accc62f18 Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-22 15:23:11 +01:00
dependabot-preview[bot]
2b52d7599c
build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 25.1.0.
- [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.9.0...v25.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 14:22:28 +00:00
mattwr18
a08d02b583
Merge pull request #2869 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-25.1.0 
build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /webapp
 2020-01-22 15:19:56 +01:00
dependabot-preview[bot]
8f88d03239
build(deps-dev): bump @storybook/vue from 5.3.7 to 5.3.8 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 13:07:47 +00:00
dependabot-preview[bot]
dff9f6ea84
build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 13:07:23 +00:00
mattwr18
0065f2b6c3
Merge pull request #2865 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.8 
build(deps-dev): bump @storybook/addon-actions from 5.3.7 to 5.3.8 in /webapp
 2020-01-22 14:05:06 +01:00
mattwr18
ba9b195939
Merge pull request #2863 from Human-Connection/dependabot/npm_and_yarn/backend/babel-jest-25.1.0 
build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /backend
 2020-01-22 14:04:51 +01:00
mattwr18
0ab19dde2a Insert missing closing parantheses breaking search 2020-01-22 13:55:57 +01:00
mattwr18
c6bfca312c Favor createdAt over timestamp 
- it's more human readable and consistent with all other nodes in
  production
 2020-01-22 13:31:48 +01:00
mattwr18
561889c530 Add migration to merge duplicate Locations 
- having duplicate Location nodes in the production database blocks us
  from adding a unique constraint, so that Locations are not created
which have the same id.
 2020-01-22 13:19:38 +01:00
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
ogerly
21fa211e0c test: specs not ok, lint is ok 2020-01-22 11:31:23 +01:00
ogerly
00c0397919 test: specs is not ok 2020-01-22 11:25:44 +01:00
Alina Beck
db422257e4 add BaseCard component 2020-01-22 12:59:46 +03:00
mattwr18
1de99511db Include BLOCKED users in search results 2020-01-22 10:43:30 +01:00
mattwr18
3354174a53 Fix muted user can still see my posts 2020-01-22 10:34:10 +01:00
dependabot-preview[bot]
f158e3e596
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 09:21:05 +00:00
mattwr18
2554add36a
Merge pull request #2861 from Human-Connection/dependabot/npm_and_yarn/expect-25.1.0 
build(deps-dev): bump expect from 24.9.0 to 25.1.0
 2020-01-22 10:18:13 +01:00
dependabot-preview[bot]
8a4d8a6cd8
build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /backend 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 08:44:44 +00:00
mattwr18
dfe149c8cf
Merge pull request #2866 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.8 
build(deps-dev): bump @storybook/addon-a11y from 5.3.7 to 5.3.8 in /webapp
 2020-01-22 09:44:15 +01:00
mattwr18
ec06bf6c13
Merge pull request #2864 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.8 
build(deps-dev): bump @storybook/addon-notes from 5.3.7 to 5.3.8 in /webapp
 2020-01-22 09:43:53 +01:00
mattwr18
da05da2a45
Merge pull request #2862 from Human-Connection/dependabot/npm_and_yarn/backend/jest-25.1.0 
build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /backend
 2020-01-22 09:42:38 +01:00
dependabot-preview[bot]
70f4491238
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 04:21:18 +00:00
dependabot-preview[bot]
d6b78e4794
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 04:20:09 +00:00
dependabot-preview[bot]
9326551885
build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 25.1.0.
- [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.9.0...v25.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 04:19:24 +00:00
dependabot-preview[bot]
bb79d1aa52
build(deps-dev): bump expect from 24.9.0 to 25.1.0 
Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/expect)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 04:18:34 +00:00
Robert Schäfer
5cd57a0cc5
docs(deployment): Explain how to setup metrics (#2825) 
* docs(deployment): Explain how to setup metrics

close #2411
close #2777

* Update docs with some info I found useful

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-01-21 23:19:17 +01:00
mattwr18
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
2df4e463f8 Update/Add translations for placeholder message 
- @alina-beck, I had a look at the Placeholder component and it's quite
  simple, but I guess migrating that is a separate PR, but I don't know
aobut adding more ds-placeholders, do you have some design ideas on what
could look better?
 2020-01-21 19:28:19 +01:00
mattwr18
bcae52180e Remove filter on posts for BLOCKED 2020-01-21 19:28:03 +01:00
mattwr18
901245b718
Merge pull request #2700 from Human-Connection/2675-migrate-avatar-component-2 
refactor(styleguide): Migrate Avatar component to monorepo
 2020-01-21 19:11:14 +01:00
mattwr18
c7ee90e980 Follow @roschaefer PR suggestions 
- As blocking is now reciprocal, we do not need another query, we can
  use neo4j-graphql-js magic to query for a BLOCKED relationship between
the postAuthor and the currentUser
 2020-01-21 18:50:46 +01:00
mattwr18
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content 
feat: Convert block/unblock to mute/unmute
 2020-01-21 17:05:09 +01:00
mattwr18
46343c923c Fix cypress tests after renamed variables 2020-01-21 17:03:50 +01:00
Alina Beck
24898f5fe2 quick fix tests relying on classes of child components 
changing class names in the UserTeaser leads to tests failing for other components, like SearchableInput and NotificationsTable – I just updated the classes but long-term it would be good to find a way to not rely on implementation details of child components – maybe just test if the child component is rendered?
 2020-01-21 17:07:00 +03:00