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
9,471 Commits 117 Branches 1,511 Tags
Commit Graph

3274 Commits

Author SHA1 Message Date
ogerly
8b7b1056ac fix: style change in modal deleteUserModal 2020-08-04 16:14:05 +02:00
ogerly
d2e6280059 Merge branch '17-Admin-Remove-user-profile' of https://github.com/Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-07-31 07:36:21 +02:00
Wolfgang Huß
a4e4575f19 Fix lint 2020-06-10 15:11:40 +02:00
adarsh-av13
2d66348c1b corrected code-of-conduct mail link 2020-06-08 00:32:21 +05:30
Wolfgang Huß
e33a190ffe Fix syntax 
- My conflict resolved on GitHub missed a bracket.
 2020-06-06 10:04:51 +02:00
Wolfgang Huß
cf3f9fa210
Merge branch 'master' into 3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 2020-06-06 09:50:49 +02:00
DriesCruyskens
a245fd2d50
Merge pull request #3589 from Human-Connection/2244-order-tags-in-cloud-alphabetically 
feat: 🍰 Alphabetically sorting tags using compute functions on index and more…
 2020-06-05 22:34:36 +02:00
Dries Cruyskens
38d7ab9661 Moved the sorting function to helper file to prevent duplicate code. 2020-06-04 00:18:51 +02:00
Dries Cruyskens
43a3b57dd9 Fixed linting issues and comments. 2020-05-30 03:20:50 +02:00
Dries Cruyskens
136e83afc2 Alphabetically sorting tags using compute functions on index and more-info page. Added test checking tags are present and shown alphabetically. 2020-05-30 03:10:11 +02:00
Dries Cruyskens
4ab7972a83 Inversed the aspect ratio to fix bug. 2020-05-29 18:26:23 +02:00
DriesCruyskens
4f18def21a
Fixed webapp unit test command. 2020-05-28 16:32:33 +02:00
Dries Cruyskens
abdc80727d Hero image height on post page is now set withouth having to wait for the image to load. Vue gives the image aspect ratio to css as a css variable, css then sets the correct height in fuction of the width. 2020-05-28 15:15:14 +02:00
Wolfgang Huß
c517c0fd45 Fix lint 2020-05-28 12:04:26 +02:00
Wolfgang Huß
dcc5b74038 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-05-28 10:52:24 +02:00
Wolfgang Huß
5e1a538094 Fix locales 2020-05-28 10:52:11 +02:00
Wolfgang Huß
a99ee763e6 Upgrade to v0.6.1 2020-05-04 12:40:34 +02:00
Wolfgang Huß
9aacb22a58
Merge pull request #3293 from Human-Connection/1741-follow-lists 
feat: FollowerList [1741]
 2020-04-20 13:01:29 +02:00
Raphael Beer
e70faa0a2d
Review: user-teasers as unordered list 2020-04-19 17:58:22 +02:00
Raphael Beer
97a30ad8f8
Review: more cut off user-teaser vsisible 2020-04-16 20:15:10 +02:00
Raphael Beer
32e5801d20
Merge pull request #3356 from Human-Connection/2727-fix-disappearing-embed-text 
fix: Text of editor embeds disappearing on click [2727]

Quick fix to at least stop the text from disappearing. Embeds need a general overhaul, which is being tracked in #3395
 2020-04-16 12:48:56 +02:00
Raphael Beer
ee33731178
Review: test improvements 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2020-04-15 23:32:54 +02:00
dependabot-preview[bot]
fb95c7902d
build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.1 to 3.5.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.5.1...v3.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-13 04:18:50 +00:00
Robert Schäfer
cd0fdb8c09
Merge pull request #3467 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.12.0 
build(deps): bump date-fns from 2.11.1 to 2.12.0 in /webapp
 2020-04-11 17:09:15 +02:00
dependabot-preview[bot]
b9aaafa01c
build(deps): bump date-fns from 2.11.1 to 2.12.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.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.11.1...v2.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:25:39 +00:00
Raphael Beer
30f66c3e14
Review: storybook 2020-04-10 00:21:31 +02:00
Raphael Beer
e018e2ead9
Review: add hasMore() computed value + 
Replacing varying conditions for same
  logic with computed value `hasMore`.
 2020-04-09 23:52:18 +02:00
Raphael Beer
b3f1137006
Review: fix styles 2020-04-09 23:39:47 +02:00
Raphael Beer
2c7ca87acc
Review: lint 2020-04-09 23:16:37 +02:00
Raphael Beer
7ff9d617d6
Review: remove showing both types in stories 2020-04-09 23:16:37 +02:00
Raphael Beer
38233da6d0
review: apply suggestions 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2020-04-09 23:01:54 +02:00
dependabot-preview[bot]
101dfd7278
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.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/v25.2.7...v25.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 10:55:44 +00:00
dependabot-preview[bot]
b131e41133
build(deps-dev): bump babel-jest from 25.2.6 to 25.3.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.6 to 25.3.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.3.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 06:57:24 +00:00
mattwr18
941dd97592
Merge pull request #3446 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.3.1 
build(deps-dev): bump @vue/cli-shared-utils from 4.3.0 to 4.3.1 in /webapp
 2020-04-08 15:11:58 +02:00
dependabot-preview[bot]
34a856a98f
build(deps-dev): bump css-loader from 3.5.0 to 3.5.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.0 to 3.5.1.
- [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.5.0...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-08 04:23:52 +00:00
dependabot-preview[bot]
ce79747cc5
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.3.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-08 04:22:44 +00:00
mattwr18
ca5c1a5516 chore: update variable to avoid validation error 
- test was throwing a validation error for count as searchResults was
  setting commentCount instead of commentsCount
 2020-04-07 15:41:47 +02:00
Alina Beck
797efe0a60 use CounterIcon component to show counts 
- also adds a 'soft' variant to CounterIcon to make it more adaptable
 2020-04-07 15:41:47 +02:00
mattwr18
668159fa5e fix(frontend): update tests with new CSS selectors 2020-04-07 15:41:45 +02:00
mattwr18
ff44fdb12c refactor: favor CSS over syleguide components 2020-04-07 15:41:06 +02:00
mattwr18
5cc3ef5faa
Merge pull request #3411 from Human-Connection/remove-unused-package 
chore: removed unused fuse.js
 2020-04-07 15:20:22 +02:00
dependabot-preview[bot]
f8f9e6185f
build(deps-dev): bump css-loader from 3.4.2 to 3.5.0 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.2 to 3.5.0.
- [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.2...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-07 04:24:24 +00:00
dependabot-preview[bot]
f4744dc36a
build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.2...2.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 12:52:15 +00:00
mattwr18
4397f70642
Merge pull request #3422 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook-design-token-0.7.2 
build(deps-dev): bump storybook-design-token from 0.7.0 to 0.7.2 in /webapp
 2020-04-06 14:49:11 +02:00
mattwr18
8654b2cea0
Merge pull request #3424 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-4.0.0 
build(deps-dev): bump eslint-loader from 3.0.3 to 4.0.0 in /webapp
 2020-04-06 13:07:31 +02:00
dependabot-preview[bot]
1359cafcd0
build(deps-dev): bump eslint-loader from 3.0.3 to 4.0.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 04:28:41 +00:00
dependabot-preview[bot]
fd705d057a
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.2.3 to 4.3.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.3.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 04:28:03 +00:00
dependabot-preview[bot]
fe45e6f253
build(deps-dev): bump storybook-design-token in /webapp 
Bumps [storybook-design-token](https://github.com/UX-and-I/storybook-design-token) from 0.7.0 to 0.7.2.
- [Release notes](https://github.com/UX-and-I/storybook-design-token/releases)
- [Commits](https://github.com/UX-and-I/storybook-design-token/compare/v0.7.0...v0.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 04:27:31 +00:00
dependabot-preview[bot]
421276c06b
build(deps-dev): bump jest from 25.2.4 to 25.2.7 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 25.2.4 to 25.2.7.
- [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/v25.2.4...v25.2.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-03 18:53:01 +00:00
mattwr18
88030b80bf
Merge pull request #3407 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook-design-token-0.7.0 
build(deps-dev): bump storybook-design-token from 0.5.1 to 0.7.0 in /webapp
 2020-04-03 11:49:22 +02:00