11943 Commits

Author SHA1 Message Date
ogerly
f1831661e5 add my-groups page and setting link 2022-08-07 14:12:17 +02:00
Wolfgang Huß
504a9bcd49 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 2022-08-04 09:28:45 +02:00
Wolfgang Huß
5e0446e22c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-04 09:26:35 +02:00
Wolfgang Huß
fcca0f378d Implement 'Group' query, next step 2022-08-04 09:24:04 +02:00
Wolfgang Huß
63dce8503e
Merge pull request #5145 from Ocelot-Social-Community/5144-release-v1.1.0--implement-categories-again
chore: 🍰 Release v1.1.0 - Implement Categories Again
2022-08-04 05:42:54 +02:00
Wolfgang Huß
2107dd4be8 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud
# Conflicts:
#	backend/.env.template
#	webapp/.env.template
2022-08-03 15:56:10 +02:00
Wolfgang Huß
e758e1337d Release v1.1.0 - implement categories again 2022-08-03 15:24:42 +02:00
Wolfgang Huß
867b78dfa3 Implement 'Group' query, second step 2022-08-03 15:16:23 +02:00
Wolfgang Huß
c53bd68f4d
Merge pull request #5102 from Ocelot-Social-Community/make-categories-optional
feat: Make Categories Optional
2022-08-03 14:47:01 +02:00
Wolfgang Huß
94411648fd Implement 'Group' query, first step 2022-08-03 13:29:49 +02:00
Wolfgang Huß
cc44ee8ebc Refactor relations ':OWNS' and ':ADMINISTERS' to ':MEMBER_OF' with properties 2022-08-03 13:12:50 +02:00
Wolfgang Huß
520598c897 Implement 'description', 'groupType', and 'actionRadius' in 'CreateGroup' 2022-08-03 11:50:56 +02:00
Wolfgang Huß
45558f06dd Add comment about faking the 'gql' tag in the backend 2022-08-03 11:49:46 +02:00
ogerly
fd36da604f Merge branch 'make-categories-optional' into 5140-My-Groups-Page 2022-08-03 10:38:01 +02:00
ogerly
cf31f3c1d6 preparation for creating a new group 2022-08-03 10:26:08 +02:00
Wolfgang Huß
2c402ba25b Fix linting 2022-08-03 08:22:53 +02:00
Wolfgang Huß
a8a6acb9f7 Rename 'UserGroup' to 'UserRole' 2022-08-03 08:14:05 +02:00
Wolfgang Huß
ea0223b6f2 Rename 'UserGroup' to 'UserRole' 2022-08-03 07:59:00 +02:00
Wolfgang Huß
fc20143a65 Test groups creation in slugifyMiddleware 2022-08-03 07:51:29 +02:00
Wolfgang Huß
da2c7dc684 Add migration with fulltext indeces and unique keys for groups 2022-08-03 07:29:51 +02:00
Wolfgang Huß
4f1646509b Fix Group name slugification 2022-08-02 16:25:46 +02:00
Wolfgang Huß
f565e5fb6a Implement 'CreateGroup' with tests 2022-08-02 16:20:11 +02:00
Wolfgang Huß
162adfd776
Merge pull request #5101 from Ocelot-Social-Community/Tirokk-update-issue-templates
Update issue templates
2022-08-02 12:30:38 +02:00
Wolfgang Huß
9632d0f852 Fix file name from 'Groups.js' to singular 'Group.js' 2022-08-02 09:18:30 +02:00
Wolfgang Huß
52bffa426b Fix linting 2022-08-02 09:10:02 +02:00
Wolfgang Huß
bf9dd205ca Implement GQL for groups 2022-08-02 08:26:14 +02:00
Wolfgang Huß
7e7bbe769e Merge branch '4548-single-person-org' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-01 11:05:14 +02:00
Moriz Wahl
938f5ccdf9 fix all tests 2022-07-25 23:20:05 +02:00
Moriz Wahl
b71b20ae81 fix more tests 2022-07-25 23:04:12 +02:00
Moriz Wahl
5393c2aeaa fix some tests 2022-07-25 22:53:19 +02:00
Moriz Wahl
bc955003f7 add optional categories to teaser and post 2022-07-25 20:03:00 +02:00
Moriz Wahl
1b2509229c remove bad line in cypher 2022-07-25 19:22:17 +02:00
Moriz Wahl
28ddfde0e3 add categories active to .env, save categories on create 2022-07-25 19:02:08 +02:00
Moriz Wahl
e31f250ea5 env vatiable for CATEGORIES_ACTIVE and switch for categories in contribution form 2022-07-25 18:41:39 +02:00
Wolfgang Huß
2ac3a9f9e3
Update issue templates 2022-07-25 18:07:14 +02:00
Wolfgang Huß
458f17b3bb
Merge pull request #5097 from Ocelot-Social-Community/5093-fix-automatic-deployment
chore: 🍰 Betters Automatic Deployment To `stage.ocelot.social` On Push To `master` Branch
2022-07-21 18:23:59 +02:00
Wolfgang Huß
e93b7bdcf3 Remove temporarily push branch to this one as well in 'publish.yml' 2022-07-21 17:46:51 +02:00
Wolfgang Huß
6bc4663d24 Add a comment that deployment need to come up again regulerly 3m 10s 'publish.yml' 2022-07-21 17:46:20 +02:00
Wolfgang Huß
861de8edcb Add sleep for 4 minutes (240s) in 'publish.yml' 2022-07-21 17:15:58 +02:00
Wolfgang Huß
9d6a5d7700 Change temporarily push branch to this one as well in 'publish.yml' 2022-07-21 16:56:20 +02:00
Wolfgang Huß
da1135614d
Merge pull request #5095 from Ocelot-Social-Community/5094-release-v1.0.9
chore: 🍰 Release v1.0.9
2022-07-20 16:12:05 +02:00
Wolfgang Huß
6247734a32 Release v1.0.9 2022-07-20 14:42:38 +02:00
Wolfgang Huß
04e7957c0e
Merge pull request #5080 from Ocelot-Social-Community/5065-automatic-deployment-to-stage.ocelot.social-on-push-to-master-branch
chore: 🍰 Automatic Deployment To `stage.ocelot.social` On Push To `master` Branch
2022-07-20 14:28:39 +02:00
Wolfgang Huß
34e970474e
Merge pull request #5091 from Ocelot-Social-Community/5089-link-to-releases-version
change footer version-link
2022-07-20 14:12:48 +02:00
Wolfgang Huß
6c64352662 change back to publish just on master branch push 2022-07-20 13:53:09 +02:00
Wolfgang Huß
e2089f36b5 Accumulate Neo4j db 'clean.js' and 'seed.js' and make the node calls await with flag '--experimental-repl-await' in 'publish.yml' 2022-07-20 12:43:58 +02:00
Wolfgang Huß
5ffcfdaee2
Merge pull request #5090 from Ocelot-Social-Community/5087-neo4j-add-docu-for-importent-commands
docs: 🍰 Add Neo4j Docu For Important Commands
2022-07-20 10:38:45 +02:00
Wolfgang Huß
cb90ceeefc Stop waiting for rollout of 'webapp' and 'maintenance' in 'publish.yml' 2022-07-20 10:29:24 +02:00
Wolfgang Huß
d39f53359a Change timeout to wait for rollout status to '600s' in 'publish.yml' 2022-07-20 09:57:02 +02:00
Wolfgang Huß
884f777460 Change order of deployments and the timeout to wait for in 'publish.yml' 2022-07-20 09:26:11 +02:00