IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-19 03:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,542 Commits 5 Branches 2 Tags
Commit Graph

3739 Commits

Author SHA1 Message Date
ogerly
c1743ce1d0 fix: lint, test 2020-01-15 18:58:42 +01:00
ogerly
2e7f774679 fix: lint 2020-01-15 18:49:32 +01:00
ogerly
75753444ea fix: delete picture and thumbnail in post 2020-01-15 18:48:37 +01:00
mattwr18
9e639c23a7 Fix import for newly named/moved component 2020-01-15 18:20:12 +01:00
mattwr18
81cbb7a85c Refactor styling, fix naming convention 
- Emotions buttons were not displaying images correctly
- Follow vue guidelines for multiword naming convention
- Favor tokens over magic px numbers
 2020-01-15 17:37:54 +01:00
Alina Beck
eaf738c12b replace last instance of ds-button with base-button 2020-01-15 16:13:47 +03:00
Alina Beck
fcbe6125f3 refactor and use base-button in SearchableInput 2020-01-15 16:04:27 +03:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
Alina Beck
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons 
refactor(styleguide): migrate and redesign buttons
 2020-01-15 14:17:06 +03:00
mattwr18
661bb9f7cd
Merge pull request #2782 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.3 
build(deps-dev): bump @storybook/addon-actions from 5.3.2 to 5.3.3 in /webapp
 2020-01-15 11:40:32 +01:00
Alina Beck
c108603b8f fix tests and refactor Paginate component 2020-01-15 13:09:36 +03:00
Alina Beck
7c89404da0 fix lint errors in test 2020-01-15 12:15:03 +03:00
dependabot-preview[bot]
428d99aca3
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.2 to 5.3.3.
- [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.3/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 09:06:39 +00:00
mattwr18
fe86391712
Merge pull request #2781 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-8.0.2 
build(deps-dev): bump sass-loader from 8.0.0 to 8.0.2 in /webapp
 2020-01-15 10:04:46 +01:00
mattwr18
efe000de51
Merge pull request #2780 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/plugin-syntax-dynamic-import-7.8.3 
build(deps-dev): bump @babel/plugin-syntax-dynamic-import from 7.8.0 to 7.8.3 in /webapp
 2020-01-15 10:04:26 +01:00
Alina Beck
150d04080b follow @mattwr18 code review 2020-01-15 11:55:27 +03:00
Alina Beck
f53bcba13c use EmotionButton in filter menu 2020-01-15 11:42:12 +03:00
Alina Beck
90d1e50b9e refactor EmotionButton 2020-01-15 11:20:18 +03:00
ogerly
8edb551c15 ready to be merged or rebased 2020-01-15 07:40:01 +01:00
dependabot-preview[bot]
75e3668b1d
build(deps-dev): bump sass-loader from 8.0.0 to 8.0.2 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 8.0.0 to 8.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.0...v8.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 04:22:22 +00:00
dependabot-preview[bot]
1c542a89f9
build(deps-dev): bump @babel/plugin-syntax-dynamic-import in /webapp 
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel) from 7.8.0 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.8.0...v7.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 04:21:52 +00:00
dependabot-preview[bot]
a89f481464
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.2 to 5.3.3.
- [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.3/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 04:21:28 +00:00
ogerly
9d09dae2f4 slug from editor comands set 2020-01-14 18:36:35 +01:00
dependabot-preview[bot]
592274356c
build(deps-dev): bump @babel/preset-env from 7.7.7 to 7.8.3 in /webapp 
Bumps [@babel/preset-env](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 17:00:48 +00:00
Robert Schäfer
cfdf08bcb9
Merge pull request #2772 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.3 
build(deps-dev): bump @storybook/vue from 5.3.1 to 5.3.3 in /webapp
 2020-01-14 17:58:04 +01:00
mattwr18
0a843518a7
Merge pull request #2748 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.20.0 
build(deps-dev): bump eslint-plugin-import from 2.19.1 to 2.20.0 in /webapp
 2020-01-14 15:43:30 +01:00
Alina Beck
e9ad67d39b
Merge branch 'migrate-styleguide-buttons' into button-migration-fixes 2020-01-14 17:04:25 +03:00
dependabot-preview[bot]
09c40d9bea
build(deps-dev): bump @storybook/vue from 5.3.1 to 5.3.3 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.1 to 5.3.3.
- [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.3/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 12:49:46 +00:00
mattwr18
3913434c9c
Merge pull request #2771 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.3 
build(deps-dev): bump @storybook/addon-notes from 5.3.1 to 5.3.3 in /webapp
 2020-01-14 13:46:55 +01:00
mattwr18
fb7bf1f58d
Merge pull request #2769 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.8.3 
build(deps-dev): bump @babel/core from 7.7.7 to 7.8.3 in /webapp
 2020-01-14 13:46:29 +01:00
dependabot-preview[bot]
54415d0700
build(deps-dev): bump eslint-plugin-import in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.19.1 to 2.20.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.19.1...v2.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 10:40:53 +00:00
mattwr18
362c5edf62
Merge pull request #2768 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.6.0 
build(deps-dev): bump eslint-plugin-jest from 23.3.0 to 23.6.0 in /webapp
 2020-01-14 11:38:17 +01:00
dependabot-preview[bot]
326f4aa05a
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.1 to 5.3.3.
- [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.3/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 10:35:05 +00:00
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