13208 Commits

Author SHA1 Message Date
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
Wolfgang Huß
fd62a03820 Add hint text to create and edit a post of a group 2023-03-09 18:06:14 +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
elweyn
89fd312220 feat(webapp): filter button style change 2023-03-09 14:35:15 +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
Moriz Wahl
bdc1cb33da Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-08 16:50:02 +01:00
Wolfgang Huß
b28a595ae4 Change group filter button text 2023-03-08 16:22:53 +01:00
Moriz Wahl
bd11c33f91
Merge branch 'master' into remove-user-from-group 2023-03-08 16:00:19 +01:00
d84d3d5f81
Merge branch 'master' into fix-deploy-branded 2023-03-08 14:59:36 +01:00
Wolfgang Huß
1a82a32b2e
Merge pull request #6056 from Ocelot-Social-Community/6030-remove-docker-compose-file-for-apple-m1
chore(other): remove apple m1 docker overrides
2023-03-08 14:58:09 +01:00
Wolfgang Huß
7c201eb648
Merge branch 'master' into 6030-remove-docker-compose-file-for-apple-m1 2023-03-08 14:12:37 +01:00
Hannes Heine
5e5c1fef04
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:34:35 +01:00
Hannes Heine
9f2211d7d1
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:34:25 +01:00
Hannes Heine
9162ae1192
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:34:14 +01:00
Hannes Heine
5460a81217
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:34:01 +01:00
Hannes Heine
92a74bd2a3
Update deployment/DOCKER_MORE_CLOSELY.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:33:47 +01:00
Hannes Heine
6a54e8cb1b
Update backend/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:33:34 +01:00
Hannes Heine
0ae1e47076
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:33:24 +01:00
Hannes Heine
b9a5de277e
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:32:48 +01:00
Hannes Heine
a24bca7d70
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:32:39 +01:00
Hannes Heine
0c6fd23f8a
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:32:31 +01:00
Hannes Heine
3c7d4df8ba
Update neo4j/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:32:20 +01:00
Hannes Heine
7d761363d5
Update backend/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:32:10 +01:00
Hannes Heine
3b724b8022
Update README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-08 09:32:03 +01:00
70354fa3e2
fix deploy branded 2023-03-08 09:21:44 +01:00
401152c2e8
Merge pull request #6083 from Ocelot-Social-Community/new-ocelot-workflows-publish-deploy
refactor(other): ocelot publish workflows
2023-03-08 00:43:44 +01:00
c7a850f3df
Merge branch 'master' into new-ocelot-workflows-publish-deploy 2023-03-07 22:39:18 +01:00
6aa1e39a8e
Merge pull request #6088 from Ocelot-Social-Community/lint_pr_only_on_pr_not_push
fix(other): lint pr only on pullrequest
2023-03-07 22:38:58 +01:00
Moriz Wahl
7fcb9a0ff6 use base button 2023-03-07 22:33:14 +01:00