Wolfgang Huß
|
2aa85d7b05
|
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5344-add-group-members-management
# Conflicts:
# backend/src/db/graphql/groups.js
# backend/src/schema/resolvers/groups.js
# webapp/components/Group/GroupCard.vue
# webapp/components/Group/GroupForm.vue
# webapp/components/Group/GroupTeaser.vue
# webapp/graphql/groups.js
# webapp/locales/de.json
# webapp/locales/en.json
# webapp/pages/group/edit/_id.vue
|
2022-09-23 15:04:49 +02:00 |
|
Wolfgang Huß
|
48860b7c70
|
Add '/dns.values*-ME.yaml' to .gitignore
|
2022-09-23 12:39:00 +02:00 |
|
ogerly
|
02d1a441d2
|
fix lint backend
|
2022-09-23 10:51:36 +02:00 |
|
ogerly
|
beebcdbee7
|
Merge branch 'master' into 5344-add-group-members-management
|
2022-09-23 10:47:08 +02:00 |
|
ogerly
|
f1427b2528
|
fix lint
|
2022-09-23 10:45:38 +02:00 |
|
ogerly
|
3e1eb299b7
|
pull && resolve conflicts
|
2022-09-23 10:41:49 +02:00 |
|
ogerly
|
12a0ca59f8
|
fix lint && locales
|
2022-09-23 10:40:00 +02:00 |
|
ogerly
|
69620ca8d7
|
fix reviews
|
2022-09-23 10:38:21 +02:00 |
|
Wolfgang Huß
|
e757e3422e
|
Merge pull request #10 from Yunite-Net/release-v1.1.1
chore: 🍰 Release v1.1.1 – First Design Rebranding
|
2022-09-23 09:22:38 +02:00 |
|
Alexander Friedland
|
3d6c5e6f62
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:13:05 +02:00 |
|
Alexander Friedland
|
a9b1ab8e2c
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:10:31 +02:00 |
|
Alexander Friedland
|
b44ab6ff93
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:10:26 +02:00 |
|
Alexander Friedland
|
f764a5e840
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:10:21 +02:00 |
|
Alexander Friedland
|
5c134140f7
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:10:15 +02:00 |
|
Alexander Friedland
|
af6a7ee063
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:10:10 +02:00 |
|
Alexander Friedland
|
3ea522ff2a
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:10:03 +02:00 |
|
Alexander Friedland
|
d14fd3f47a
|
Update branding/constants/links.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:09:56 +02:00 |
|
Alexander Friedland
|
fcf2bba1e8
|
Update webapp/components/Group/GroupList.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:06:25 +02:00 |
|
Alexander Friedland
|
22f5c90a21
|
Update webapp/pages/group/edit/_id/members.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 09:00:07 +02:00 |
|
Alexander Friedland
|
4c55ca731e
|
Update webapp/pages/my-groups.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:59:45 +02:00 |
|
Alexander Friedland
|
c8dc0d99c0
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:57:27 +02:00 |
|
Wolfgang Huß
|
7edc3c8af8
|
Merge pull request #8 from Yunite-Net/7-refine-rebanding-deployment
chore: [WIP] 🍰 Refine Rebanding And Deployment
|
2022-09-23 08:56:48 +02:00 |
|
ogerly
|
3f59926a75
|
change neo4j image path docker-compose.yml
|
2022-09-23 08:53:20 +02:00 |
|
ogerly
|
58079c5b8e
|
merge ocelot master resolve conflicts
|
2022-09-23 08:50:00 +02:00 |
|
ogerly
|
0f27858284
|
resolve conflicts
|
2022-09-23 08:45:41 +02:00 |
|
Alexander Friedland
|
4753630418
|
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:49 +02:00 |
|
Alexander Friedland
|
15981750a7
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:34 +02:00 |
|
Alexander Friedland
|
10975f5551
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:24 +02:00 |
|
Alexander Friedland
|
522a9ff4c1
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:32:03 +02:00 |
|
Alexander Friedland
|
bf492ce9c3
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:31:46 +02:00 |
|
Alexander Friedland
|
c37aef89bc
|
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-23 08:31:36 +02:00 |
|
Wolfgang Huß
|
07cd6ab7e8
|
Merge pull request #71 from Ocelot-Social-Community/70-release-v1.1.1-228-58-fix-folder-name
chore: 🍰 Fix Folder Name From `branding/assets/styles/import` To `branding/assets/styles/imports`
|
2022-09-23 07:41:15 +02:00 |
|
Wolfgang Huß
|
e0b2b098cf
|
Fix folder name from branding/assets/styles/import to branding/assets/styles/imports
|
2022-09-23 07:20:14 +02:00 |
|
ogerly
|
8779bdc00e
|
resolve conflict
|
2022-09-22 21:23:30 +02:00 |
|
Alexander Friedland
|
94f5081c22
|
Merge pull request #68 from Ocelot-Social-Community/release-v1.1.1
chore: 🍰 Release v1.1.1-228 – Refactor Rebranding
|
2022-09-22 21:17:34 +02:00 |
|
ogerly
|
5f967f563a
|
update package.json to v1.1.1 -228
|
2022-09-22 20:48:40 +02:00 |
|
Wolfgang Huß
|
9ccafbd48b
|
Merge pull request #5392 from Ocelot-Social-Community/5391-release-v1.1.1-refactor-rebranding
Chore: 🍰 Release v1.1.1 – Refactor Rebranding
|
2022-09-22 20:44:37 +02:00 |
|
Wolfgang Huß
|
a618366619
|
Release v1.1.1 - refactor rebranding
|
2022-09-22 20:02:34 +02:00 |
|
ogerly
|
870fe89a80
|
refactor rebranding
|
2022-09-22 19:49:24 +02:00 |
|
Alexander Friedland
|
2ee8431ead
|
Merge pull request #5390 from Ocelot-Social-Community/5153-refactor-rebranding
chore: 🍰 Refactor Rebranding
|
2022-09-22 19:41:30 +02:00 |
|
ogerly
|
858739eaa0
|
fix review
|
2022-09-22 18:42:58 +02:00 |
|
ogerly
|
1af5ce9e30
|
add [200~.ds-footer a {scss token
|
2022-09-22 18:20:13 +02:00 |
|
ogerly
|
4045260fc3
|
remove console log, fix lint
|
2022-09-22 17:55:17 +02:00 |
|
ogerly
|
5f5c0faa1f
|
cleanup refactor rebranding
|
2022-09-22 17:52:03 +02:00 |
|
ogerly
|
0293fec7e7
|
step1 refactor rebranding
|
2022-09-22 16:51:48 +02:00 |
|
Moriz Wahl
|
a9cd661e63
|
add tets for posts in groups
|
2022-09-22 08:17:09 +02:00 |
|
Moriz Wahl
|
e748fcc623
|
add is member of group check to permission of create post
|
2022-09-22 08:16:44 +02:00 |
|
Moriz Wahl
|
4d480d3130
|
add post query
|
2022-09-22 08:16:06 +02:00 |
|
Wolfgang Huß
|
319ca0501e
|
Merge pull request #5368 from Ocelot-Social-Community/5059-groups/5318-group-profile-description-etc
feat: 🍰 Group Profile Description Etc
|
2022-09-21 18:11:18 +02:00 |
|
ogerly
|
58e48cfe77
|
rebrand in config for scss and styleguide
|
2022-09-21 12:09:35 +02:00 |
|