16408 Commits

Author SHA1 Message Date
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
b2.4.0-331
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
b2.4.0-330
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
b2.4.0-329
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
b2.4.0-328
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
b2.4.0-327
2023-03-07 22:38:58 +01:00
Moriz Wahl
7fcb9a0ff6 use base button 2023-03-07 22:33:14 +01:00
95790f3a45
Merge branch 'master' into lint_pr_only_on_pr_not_push 2023-03-07 21:59:14 +01:00
9bf9d0b5fd
Merge branch 'master' into new-ocelot-workflows-publish-deploy 2023-03-07 21:58:59 +01:00
829a8c1207
Merge pull request #6096 from Ocelot-Social-Community/dependabot_no_rebase
fix(other): dependabot do not rebase
b2.4.0-326
2023-03-07 21:58:38 +01:00
e00c2dd8dd
Merge branch 'master' into lint_pr_only_on_pr_not_push 2023-03-07 18:01:32 +01:00
a0f782eb53
Merge branch 'master' into dependabot_no_rebase 2023-03-07 16:09:30 +01:00
ace8b8637f
dont rebase automatically to avoid workflow slots beeing used 2023-03-07 16:08:32 +01:00
Moriz Wahl
5538ef93db
Merge pull request #6091 from Ocelot-Social-Community/filter-posts-in-my-groups
feat(backend): filter posts in my groups
b2.4.0-325
2023-03-07 16:01:29 +01:00
Moriz Wahl
0da3691757
Merge branch 'master' into filter-posts-in-my-groups 2023-03-07 13:56:03 +01:00
Hannes Heine
cde40b8274
Update CONTRIBUTING.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-07 13:34:47 +01:00
Hannes Heine
cec9276a0f
Update CONTRIBUTING.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-07 13:34:36 +01:00
Hannes Heine
2bab4b5b53
Merge pull request #6022 from Ocelot-Social-Community/5152-remove-helper-jest-gql-function
refactor(backend): withdraw mock of gql and replace with graphql-tag function
b2.4.0-324
2023-03-07 13:33:54 +01:00
Moriz Wahl
f75059b830
Merge branch 'master' into filter-posts-in-my-groups 2023-03-07 13:30:02 +01:00
elweyn
0b7e0fbc4b Change Infinity to exact count. 2023-03-07 13:16:38 +01:00
Wolfgang Huß
7f3244db12
Merge branch 'master' into 6030-remove-docker-compose-file-for-apple-m1 2023-03-07 11:50:07 +01:00
Hannes Heine
438dc73dcd
Merge branch 'master' into 5152-remove-helper-jest-gql-function 2023-03-07 09:09:52 +01:00
sushidave
4d6b22754e
Merge pull request #6090 from Ocelot-Social-Community/sushidave-updated-main-readme
docs(other): update readme.md
b2.4.0-323
2023-03-06 20:19:44 +01:00
sushidave
aba74cd5c6
Change order of sections 2023-03-06 19:08:29 +01:00
sushidave
ec77da7ad3
Update README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-06 19:06:28 +01:00
Wolfgang Huß
b959a555d2
Merge branch 'master' into sushidave-updated-main-readme 2023-03-06 18:50:34 +01:00