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

3556 Commits

Author SHA1 Message Date
dependabot-preview[bot]
e3199ee486
build(deps-dev): bump @babel/core from 7.7.7 to 7.8.3 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.7 to 7.8.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.7.7...v7.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 10:34:43 +00:00
mattwr18
e172f98f6e
Merge pull request #2759 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.2 
build(deps-dev): bump @storybook/addon-a11y from 5.2.8 to 5.3.2 in /webapp
 2020-01-14 11:32:21 +01:00
dependabot-preview[bot]
0966b7d5e4
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.3.0 to 23.6.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.3.0...v23.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 04:22:44 +00:00
dependabot-preview[bot]
d3c9566913
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.8 to 5.3.2.
- [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.2/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 04:19:56 +00:00
dependabot-preview[bot]
2d6e54c544
build(deps): [security] bump serialize-javascript in /webapp 
Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) from 2.1.0 to 2.1.2. **This update includes a security fix.**
- [Release notes](https://github.com/yahoo/serialize-javascript/releases)
- [Commits](https://github.com/yahoo/serialize-javascript/compare/v2.1.0...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 04:17:59 +00:00
mattwr18
84e475fd8a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-13 21:22:58 +01:00
dependabot-preview[bot]
d0124bf2b4
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.8 to 5.3.2.
- [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.2/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 16:13:12 +00:00
Robert Schäfer
be0636535f
Merge pull request #2746 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/plugin-syntax-dynamic-import-7.8.0 
build(deps-dev): bump @babel/plugin-syntax-dynamic-import from 7.7.4 to 7.8.0 in /webapp
 2020-01-13 17:09:58 +01:00
mattwr18
fb74a8a7f0
Merge pull request #2747 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.4.2 
build(deps-dev): bump css-loader from 3.4.1 to 3.4.2 in /webapp
 2020-01-13 14:33:45 +01:00
mattwr18
f7b86a6285
Merge pull request #2742 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.1 
build(deps-dev): bump @storybook/addon-notes from 5.2.8 to 5.3.1 in /webapp
 2020-01-13 14:32:33 +01:00
dependabot-preview[bot]
e53f24b853
build(deps-dev): bump @babel/plugin-syntax-dynamic-import in /webapp 
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel) from 7.7.4 to 7.8.0.
- [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.7.4...v7.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 13:27:48 +00:00
mattwr18
38d451ae7d
Merge pull request #2740 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.9.3 
build(deps): bump @nuxtjs/axios from 5.9.2 to 5.9.3 in /webapp
 2020-01-13 10:18:39 +01:00
dependabot-preview[bot]
6f3f6b37ba
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.2.8 to 5.3.1.
- [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.1/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 09:17:54 +00:00
dependabot-preview[bot]
b1617b660c
build(deps-dev): bump css-loader from 3.4.1 to 3.4.2 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.1...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 04:23:14 +00:00
dependabot-preview[bot]
87153a1cb6
build(deps): bump @nuxtjs/axios from 5.9.2 to 5.9.3 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.2...v5.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 04:20:53 +00:00
dependabot-preview[bot]
73f690e5d0
build(deps-dev): bump @storybook/vue from 5.2.8 to 5.3.1 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.8 to 5.3.1.
- [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.1/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 04:20:36 +00:00
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
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
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
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users 
🍰 Search For Users
 2020-01-10 13:59:44 +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
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
mattwr18
dae1062ad0 Use node LTS in production 2020-01-09 13:33:05 +01: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
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
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
04e5ecc87d fix tests and lint errors 2020-01-09 13:48:30 +05:30
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +05:30
dependabot-preview[bot]
1a15dd4db5
build(deps): bump node from 13.5.0-alpine to 13.6.0-alpine in /webapp 
Bumps node from 13.5.0-alpine to 13.6.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-09 04:19:10 +00:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
Alina Beck
be30b55f65 fix styling of terms-and-conditions button 2020-01-08 14:31:37 +05:30
Alina Beck
53a504010c allow overflow for notifications counter 2020-01-08 14:28:21 +05:30
Alina Beck
5d2af860db wrap create-post link around button on user profile 2020-01-08 13:53:02 +05:30
Alina Beck
cc38fa2b0a make content-menu clickable on post-card 2020-01-08 13:49:07 +05:30
Alexander Friedland
25ac9b6cef
Merge pull request #2678 from Human-Connection/2659-text-change-for-signup 
Changes Text For SignUp
 2020-01-07 21:47:20 +01:00
Alexander Friedland
9c3f0f3d29
Merge pull request #2655 from Human-Connection/erhardtstiefel-patch-10-1 
Update de.json
 2020-01-07 21:45:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
ogerly
223d1ca3c0 remove console 2020-01-07 06:02:19 +01:00