12803 Commits

Author SHA1 Message Date
Hannes Heine
017140c672
Merge branch 'master' into 6066-group-query-sort-by-createdAt 2023-03-14 13:01:54 +01:00
Hannes Heine
dad1764a62
Merge pull request #6093 from Ocelot-Social-Community/5967-user-profil-show-more-following-user
fix(webapp): error in user profil on the 'show x more' button
b2.4.0-344
2023-03-14 13:01:24 +01:00
Hannes Heine
3864c8a8d6
Merge branch 'master' into 5967-user-profil-show-more-following-user 2023-03-14 12:05:29 +01:00
Hannes Heine
3e283bf0ce
Merge pull request #6109 from Ocelot-Social-Community/feat-filter-buttons
feat(webapp): filter button style change
b2.4.0-343
2023-03-14 11:57:19 +01:00
Hannes Heine
d0a71da633
Merge branch 'master' into feat-filter-buttons 2023-03-14 11:29:44 +01:00
mahula
623e12befe
Merge pull request #6125 from Ocelot-Social-Community/5972-devops-eliminate-annotations-for-e2e-tests
refactor(other): deactivate video recording & only upload screenshots, if tests fail for e2e tests
b2.4.0-342
2023-03-14 11:26:30 +01:00
Hannes Heine
014e537c51
Merge branch 'master' into 5972-devops-eliminate-annotations-for-e2e-tests 2023-03-14 10:54:02 +01:00
Hannes Heine
41e1c722ad
Merge branch 'master' into feat-filter-buttons 2023-03-14 10:52:29 +01:00
Hannes Heine
479232cd87
Merge pull request #6112 from Ocelot-Social-Community/5983-change-design-of-topics(categories)-of-post-teaser
fix(webapp): change icon color of active topics (categories) of post teaser
b2.4.0-341
2023-03-14 10:51:47 +01:00
mahula
00782a10ab
Merge branch 'master' into feat-filter-buttons 2023-03-14 10:43:10 +01:00
Wolfgang Huß
bf695ebd5b
Merge branch 'master' into 5983-change-design-of-topics(categories)-of-post-teaser 2023-03-14 10:05:50 +01:00
Hannes Heine
4041ceb5f8
Merge pull request #6059 from Ocelot-Social-Community/add-db-migrate-up-command-to-docu
docs(other): correct **/README.md
b2.4.0-340
2023-03-14 10:04:42 +01:00
Wolfgang Huß
b41794aab8
Merge branch 'master' into 5983-change-design-of-topics(categories)-of-post-teaser 2023-03-14 10:00:28 +01:00
Hannes Heine
2c13c07e46
Merge branch 'master' into add-db-migrate-up-command-to-docu 2023-03-14 09:32:06 +01:00
Wolfgang Huß
9d16d420af
Merge pull request #6110 from Ocelot-Social-Community/5627-fix-responsive-view-on-iphone
fix(webapp): fix `viewport``width=device-width` by removing it
b2.4.0-339
2023-03-14 08:32:33 +01:00
elweyn
eb396424ef Merge master. 2023-03-14 08:12:24 +01:00
Wolfgang Huß
2d0a60da58 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5627-fix-responsive-view-on-iphone 2023-03-14 07:39:31 +01:00
Wolfgang Huß
60e4ff28a7 Remove comment why 'viewport' has to be changed 2023-03-14 07:39:25 +01:00
mahula
d5d8597232 deactivate video recording in cypress 2023-03-13 20:46:59 +01:00
Markus
1730443e86
Merge pull request #6121 from Ocelot-Social-Community/6103-newsfeed-bigger-gap-between-posts
feat(webapp): on newsfeed add bigger y-gap between posts
b2.4.0-338
2023-03-13 20:43:09 +01:00
mahula
4b468903a3 remove video upload for e2e tests in github test workflow 2023-03-13 20:41:08 +01:00
mahula
10995665a1 configure screenshot upload to depend on e2e test failure in github test workflow 2023-03-13 20:39:22 +01:00
elweyn
0f64235bfb linting fixes 2023-03-13 16:17:47 +01:00
elweyn
fdf5b1403c fix linting rules 2023-03-13 15:37:28 +01:00
elweyn
43a96826e4 feat(webapp): change order of groups to new first 2023-03-13 15:27:46 +01:00
Markus
851679fe33 increased the y-Gap in the masonry-grid component for a better overview 2023-03-13 15:01:08 +01:00
Markus
529540bd73 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-03-13 14:45:43 +01:00
elweyn
b15d2ff252 Add user['Count'] to fetchAllConntections tests. 2023-03-13 14:10:16 +01:00
elweyn
644febaa0f Remove border radius of filterMenu background 2023-03-13 10:38:08 +01:00
elweyn
50e5a4e8aa Change margin on small screens 2023-03-13 10:31:32 +01:00
elweyn
6858fa58ab Add small margin to the top 2023-03-13 10:31:07 +01:00
elweyn
baa49414aa Use header-button component 2023-03-13 10:13:51 +01:00
elweyn
22f06de83d Create component for the filter buttons 2023-03-13 10:13:30 +01:00
elweyn
e7d43e5019 Fix linting 2023-03-13 07:38:48 +01:00
elweyn
ba6a05ff69 Upgrade filterButtonMenu size 2023-03-13 07:37:09 +01:00
elweyn
6b1a01f66f Change style of postsInMyGroups filter button 2023-03-13 07:36:26 +01:00
Hannes Heine
cfa53e5b84
Merge branch 'master' into feat-filter-buttons 2023-03-13 07:08:14 +01:00
Hannes Heine
0d9dbbe4da
Update backend/README.md 2023-03-13 07:06:43 +01:00
Hannes Heine
ecbaffc0de
Update backend/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-13 07:04:37 +01:00
elweyn
f34e419571 Fix linting. 2023-03-13 07:02:55 +01:00
8c900cd246
Merge pull request #6117 from Ocelot-Social-Community/dependabot/github_actions/peter-evans/repository-dispatch-2
Bump peter-evans/repository-dispatch from 1 to 2
b2.4.0-337
2023-03-12 00:35:13 +01:00
dependabot[bot]
42cfbe2d05
Bump peter-evans/repository-dispatch from 1 to 2
Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 1 to 2.
- [Release notes](https://github.com/peter-evans/repository-dispatch/releases)
- [Commits](https://github.com/peter-evans/repository-dispatch/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peter-evans/repository-dispatch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-11 02:57:44 +00:00
Markus
8c31546b3b
Merge pull request #6065 from Ocelot-Social-Community/5984-fix-gap-news-feed
fix(webapp): fix gap news feed
b2.4.0-336
2023-03-10 20:29:05 +01:00
Wolfgang Huß
4a446706ce
Merge branch 'master' into 5984-fix-gap-news-feed 2023-03-10 12:02:18 +01:00
Wolfgang Huß
8e874b67f6
Merge pull request #6115 from Ocelot-Social-Community/6069-change-shout-horn-on-posts-to-heart
feat(webapp): change shout icon `bullhorn` to `heart-o`
b2.4.0-335
2023-03-10 11:41:30 +01:00
Wolfgang Huß
59a6729171 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5984-fix-gap-news-feed 2023-03-10 11:22:55 +01:00
Wolfgang Huß
69ab2ec626 Fix linting 2023-03-10 11:10:29 +01:00
Wolfgang Huß
8a4ee7503c
Merge branch 'master' into 6069-change-shout-horn-on-posts-to-heart 2023-03-10 09:45:15 +01:00
Wolfgang Huß
eb9daebe52 Change 'viewport' on maintenance page as well and add comment 2023-03-09 20:13:56 +01:00
mahula
4807bde6f3
Merge pull request #6108 from Ocelot-Social-Community/5978-refactor-change-invite-code-button-and-menu-to-copy-invite-link
refactor(webapp): change invite code button and menu to copy invite link
b2.4.0-334
2023-03-09 19:11:47 +01:00