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

9457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dries Cruyskens
51efbe4e29 Added extra check if user property is not null to prevent errors. 2020-06-26 17:05:02 +02:00
Dries Cruyskens
eef33a27a8 Fixed the profile header not showing when it's not present. 2020-06-25 18:27:59 +02:00
Wolfgang Huß
c6ec32b326 Add clean database 
- Because of a sometimes failing test.
 2020-06-25 13:33:45 +02:00
Wolfgang Huß
927e389b3a Fix Cypress test 
- Change `profile-header` to `profile-header-card`.
 2020-06-25 13:23:22 +02:00
Dries Cruyskens
dcaa2cf07b A profile header now has a max height of 250px (instead of fixed) and shrinks vertically when the profile picture is not tall enough to fill 250px. Changed css class to be more specific. 2020-06-23 17:22:44 +02:00
Dries Cruyskens
977156c591 Fixed test naming mistake. 2020-06-23 16:10:28 +02:00
Dries Cruyskens
9819992eb0 Capitalized test file. 2020-06-23 16:09:43 +02:00
Dries Cruyskens
4f18df1498 Added async await. 2020-06-23 16:07:02 +02:00
Dries Cruyskens
ad4862eb3a Fixed double space in french locale. 2020-06-23 15:36:29 +02:00
Dries Cruyskens
e40eda6cf9 Made profile avatar/header success-toast text more specific in all locales. 2020-06-23 15:23:59 +02:00
Dries Cruyskens
213ce12f70 Clean database before all tests to remove unwanted artefacts. 2020-06-13 18:16:10 +02:00
Dries Cruyskens
0b8deba435 Removed the profile header seed for a Jenny Rostock. 2020-06-12 19:05:39 +02:00
Dries Cruyskens
ca00968444 Added integration tests for uploading and displaying a user's profile header image. Adjusted existing tests for the profile image to make them more distinct. 2020-06-12 18:30:46 +02:00
Dries Cruyskens
f62efe39fa Made profile header component that supports uploading and displaying a header image and added it to the profile page. Added locales in all languages for a succesful or failed upload toast. Included test for the new userProfileHeader component. Updated the gql model to include the profileHeader. 2020-06-12 18:28:40 +02:00
Dries Cruyskens
a551959b79 Added backend support for a user's profile header image: added type in gql schema, resolvers, models and database seed. Also added tests everywhere a user's profile avatar is also tested. 2020-06-12 18:18:33 +02:00
Wolfgang Huß
c113fde014
Merge pull request #3583 from Human-Connection/3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 
feat: 🍰 Hero image height on post page is now set without having to wait for…
 2020-06-06 11:52:34 +02:00
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
Wolfgang Huß
9716bbb07c
Merge pull request #3584 from Human-Connection/3566-wrong-unit-test-command-in-webapp-documentation 
fix: Fixed webapp unit test command.
 2020-06-03 16:02:08 +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ß
c9dc7d9b5e
Merge pull request #3525 from Human-Connection/updgrade-to-v0.6.1 
chore: Upgrade to v0.6.1
 2020-05-04 13:31:25 +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
Robert Schäfer
a9111973c8
Merge pull request #3475 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.5.2 
build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in /webapp
 2020-04-13 16:52:32 +02:00
mattwr18
08f2f1e4b4
Merge pull request #3472 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.20 
build(deps): bump apollo-link-context from 1.0.19 to 1.0.20 in /backend
 2020-04-13 09:13:58 +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
dependabot-preview[bot]
9af0fe01ce
build(deps): bump apollo-link-context from 1.0.19 to 1.0.20 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.19 to 1.0.20.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-context@1.0.19...apollo-link-context@1.0.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-13 04:14:52 +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
Robert Schäfer
dbf558faf7
Merge pull request #3459 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-25.3.0 
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /webapp
 2020-04-11 17:09:09 +02:00
Robert Schäfer
1f88dc2f57
Merge pull request #3464 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.12.0 
build(deps-dev): bump date-fns from 2.11.1 to 2.12.0
 2020-04-11 17:09:04 +02:00
Robert Schäfer
b047a3d74f
Merge pull request #3465 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.17 
build(deps): bump apollo-link-http from 1.5.16 to 1.5.17 in /backend
 2020-04-11 17:08:56 +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
dependabot-preview[bot]
10e2ed1800
build(deps): bump apollo-link-http from 1.5.16 to 1.5.17 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.16 to 1.5.17.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.16...apollo-link-http@1.5.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:18:51 +00:00
dependabot-preview[bot]
15271a9f89
build(deps-dev): bump date-fns from 2.11.1 to 2.12.0 
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:15:37 +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