12780 Commits

Author SHA1 Message Date
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
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
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
2023-03-14 10:51:47 +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
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
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
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
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
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
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
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
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`
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
2023-03-09 19:11:47 +01:00
Wolfgang Huß
3f875525f2 Change shout icon 'bullhorn' to 'heart-o' 2023-03-09 18:41:34 +01:00
Wolfgang Huß
0172d5bb3b
Merge branch 'master' into 5978-refactor-change-invite-code-button-and-menu-to-copy-invite-link 2023-03-09 18:23:34 +01:00
mahula
66e7edc2f8 linting 2023-03-09 16:03:48 +01:00
mahula
f5b3adc842 center button in invite link popover 2023-03-09 15:48:33 +01:00
mahula
c9d6e1a9ea add tooltip to invite button 2023-03-09 15:43:58 +01:00
Wolfgang Huß
5911831c6a
Merge pull request #6105 from Ocelot-Social-Community/6104-change-group-filter-texts
feat(webapp): change group filter button text
2023-03-09 15:31:04 +01:00
Wolfgang Huß
c965f3d29d Set color of active category icons to '$color-primary-inverse'
- Change background-color of active categories to '$color-primary-active'
2023-03-09 15:25:07 +01:00
Wolfgang Huß
cfb07809c7 Rename 'HcCategory' to 'Category' on main index page 2023-03-09 15:23:10 +01:00
Wolfgang Huß
b9d5fe449e Fix 'viewport' 'width=device-width' by removing it, because it does not work correctly for Safari on iOS 2023-03-09 14:35:02 +01:00
Wolfgang Huß
d10b8b7351
Merge branch 'master' into 6104-change-group-filter-texts 2023-03-09 14:24:48 +01:00
Moriz Wahl
0634a08316
Merge pull request #3922 from Ocelot-Social-Community/feature/mark-all-notification-as-read
feat(webapp): 🍰 allows mark all notifications as read
2023-03-09 13:59:02 +01:00
Markus
277654d9c5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-03-09 13:31:06 +01:00
Moriz Wahl
5bd831752d
Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-09 13:23:09 +01:00
mahula
9a59799b2b change copy text in invite button menu 2023-03-09 13:10:57 +01:00
mahula
cf6116b5d9 change locales for invitation link short description 2023-03-09 13:02:28 +01:00
Wolfgang Huß
8e7009c149
Merge branch 'master' into 6104-change-group-filter-texts 2023-03-09 11:04:37 +01:00
3d0035ec88
Merge pull request #6099 from Ocelot-Social-Community/fix-deploy-branded
fix(other): deploy branded - upload to dockerhub
2023-03-08 23:48:36 +01:00
9075798027
Merge branch 'master' into fix-deploy-branded 2023-03-08 23:07:56 +01:00
Moriz Wahl
c865b72fa3 refresh notifications after mark all as read, fix tests 2023-03-08 18:11:18 +01:00
Moriz Wahl
b64e35c69b fix typo 2023-03-08 17:11:57 +01:00
Moriz Wahl
c1fd3d51b5
Merge pull request #6072 from Ocelot-Social-Community/remove-user-from-group
feat(webapp): remove user from group
2023-03-08 16:50:33 +01:00