ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
mattwr18
5c7a6ace08 Refactor 
- Move mouse events to nuxt-link
- use .native
- refactor deprecated slot syntax
 2020-01-20 10:04:30 +01:00
mattwr18
27c23fa9ac Improve styling of User.vue 
- Remove avatar class
- fix competing styles
- follow rscss guidlines
 2020-01-20 10:04:30 +01:00
mattwr18
905f34c827 Support use of initials, add tests, move component 
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
 2020-01-20 10:04:30 +01:00
mattwr18
068e2b4417 Fix styling, renaming classes 2020-01-20 10:04:30 +01:00
mattwr18
b090b1177f Migrate the bare minimum 
- follow @alina-beck PR review
 2020-01-20 10:04:30 +01:00
dependabot-preview[bot]
731fd1ad18
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.5 to 5.3.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.6/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 04:20:48 +00:00
Robert Schäfer
d3473050c4
Merge pull request #2725 from Human-Connection/2229_remove_obsolete_translation 
fix(translations): Remove duplicate and mistranslated item from code of conduct
 2020-01-17 22:28:10 +01:00
dependabot-preview[bot]
00665f789e
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.3 to 5.3.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.6/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 14:47:01 +00:00
Robert Schäfer
05a6cb2296
Merge pull request #2819 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.6 
build(deps-dev): bump @storybook/vue from 5.3.3 to 5.3.6 in /webapp
 2020-01-17 15:44:39 +01:00
dependabot-preview[bot]
1a82d0fd47
build(deps-dev): bump @storybook/vue from 5.3.3 to 5.3.6 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.3 to 5.3.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.6/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 10:33:43 +00:00
dependabot-preview[bot]
f8f3696837 build(deps-dev): bump @storybook/addon-a11y in /webapp (#2809) 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.3 to 5.3.5.
- [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.5/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:33:17 +01:00
dependabot-preview[bot]
26e849898f build(deps-dev): bump node-sass from 4.13.0 to 4.13.1 in /webapp (#2812) 
Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.13.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:31:53 +01:00
dependabot-preview[bot]
ac1470b397 build(deps-dev): bump @storybook/addon-notes in /webapp (#2816) 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.3 to 5.3.5.
- [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.5/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:30:42 +01:00
dependabot-preview[bot]
321baeb127
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.3 to 5.3.5.
- [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.5/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 04:20:32 +00:00
roschaefer
c22a6330aa refactor(translations): Fix keys for muting 
Provide the correct German translation. Remove "" and use `null` for
Italian. @mattwr18 we really have to make sure not to add empty strings
to our translations because we disable the fallback in that case. Also,
if we want, we could replace the other translations with `null` in order
to make sure that we have the better (though untranslated) explanation.

@mattwr18 I had a look into `notificationsMiddleware.js`. I think that
we can still keep the tests and the behaviour although there is no
`BLOCKED` relationship anymore, right?
 2020-01-16 20:56:12 +01:00
mattwr18
b53bf880ee Fix lint 2020-01-16 20:23:36 +01:00
roschaefer
c5a6919833 Merge remote-tracking branch 'origin/master' into 279-blacklist-users-content 2020-01-16 19:48:16 +01:00
roschaefer
4631db0a1b feat(webapp): Display deployed version in footer 
Remove VERSION file in favour of version entry in `package.json`. Parse
this version in our build server scripts.

This commit also introduces `standard-version` which we can use to
generate our `CHANGELOG.md` with `yarn run release`.

close #1831
 2020-01-16 19:24:55 +01:00
mattwr18
5eb42830fd Revert unintended changes to ContributionForm.spec 2020-01-16 15:47:55 +01:00
mattwr18
0a4defe36d Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 14:52:58 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
mattwr18
83491e15c8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 13:19:33 +01:00
mattwr18
3686a93878 Add nextTick to CreateUserAccount 
- there were changes that moved vue-test-utils from synchronous to
asynchronous, which means we need to use nextTick before checking
certain attributes.
 2020-01-16 13:15:35 +01:00
mattwr18
6877c9da91 Use new base-button, rename CSS class 2020-01-16 12:29:28 +01:00
mattwr18
3132ac14a1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-16 12:16:15 +01:00
Alexander Friedland
15bd6c5d48
Merge branch 'master' into 1188-Delete_teaser_image 2020-01-16 05:32:27 +01:00
ogerly
a8132d23da fix: spec, delete teasureImage 2020-01-15 20:18:36 +01:00
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