IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,529 Commits 5 Branches 2 Tags
Commit Graph

11529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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ß
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
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
ogerly
58e48cfe77 rebrand in config for scss and styleguide 2022-09-21 12:09:35 +02:00
ogerly
28c4740a98 add code if condition 2022-09-20 19:54:53 +02:00
ogerly
1fdee4058d fix yarn 2022-09-20 16:51:33 +02:00
ogerly
5974ff7c24 change footer links 2022-09-20 16:50:34 +02:00
ogerly
a1292ef9ff fix lint 2022-09-20 16:03:50 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +02:00
ogerly
bfcfb8462e resolve conflict 2022-09-20 10:29:37 +02:00
ogerly
8b62b624ac refactor header menu, add svg logos 2022-09-20 10:19:02 +02:00
ogerly
17891c93ae fix locales lint 2022-09-20 08:50:48 +02:00
Alexander Friedland
e4c3600ad6
Merge branch '5059-epic-groups' into 5344-add-group-members-management 2022-09-19 18:55:44 +02:00
ogerly
57a6e74d10 fix lint and locales 2022-09-19 18:50:53 +02:00
ogerly
7d5205e08b translation of the texts 2022-09-19 18:27:41 +02:00
Moriz Wahl
14b5435929
Merge pull request #5350 from Ocelot-Social-Community/category-tooltipps 
feat: 🍰 Tooltips For Topics
 2022-09-16 11:17:31 +02:00
ogerly
a5e0794ec8 style in groupList for locationName and radius 2022-09-15 13:13:51 +02:00
ogerly
bc8cba13b3 add location and location name for group 2022-09-15 12:38:59 +02:00
Wolfgang Huß
6f59ced9eb
Merge pull request #5335 from Ocelot-Social-Community/5059-groups/5318-group-profile-members-list-etc 
feat: 🍰 Group Profile Members List Etc
 2022-09-15 11:50:22 +02:00
Wolfgang Huß
017a764812
Merge pull request #5332 from Ocelot-Social-Community/5059-groups/5318-group-profile-second 
feat: 🍰 Implement Group Profile – Visibility
 2022-09-15 10:20:58 +02:00
Moriz Wahl
64153ea9e3 change delay of category tooltip to 1500 2022-09-15 10:04:26 +02:00
Moriz Wahl
ba9a6fd750
Update webapp/locales/de.json 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-15 09:25:46 +02:00
Wolfgang Huß
8469ecd792 Merge branch '5059-groups/5318-group-profile-second' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-members-list-etc 2022-09-14 16:31:31 +02:00
Wolfgang Huß
73b6b24b72 Refine 'convertObjectToCypherMapLiteral' with additional parameter 2022-09-14 16:30:09 +02:00
Wolfgang Huß
6af9e0cec0 Merge branch '5059-groups/5318-group-profile-second' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-members-list-etc 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
 2022-09-14 16:18:37 +02:00
Wolfgang Huß
7bb3a05b07 Clarify conversion to Cypher literal map for use as 'MATCH' parameter by making a resolver helper function 2022-09-14 16:10:55 +02:00
Wolfgang Huß
b7d4d506e3 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second 2022-09-14 14:32:27 +02:00
Wolfgang Huß
2d3d559eab Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-09-14 14:28:09 +02:00
Wolfgang Huß
210aebb829 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second 2022-09-14 14:27:01 +02:00