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
13,208 Commits 5 Branches 2 Tags
Commit Graph

13208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
c17bdea4c4
Update webapp/graphql/Fragments.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:54:48 +02:00
Moriz Wahl
9cffe4f275
Update webapp/components/generic/SearchGroup/SearchGroup.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:53:56 +02:00
Moriz Wahl
7102de6e52
Update webapp/components/generic/SearchGroup/SearchGroup.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:53:41 +02:00
Moriz Wahl
19aa01f83f
Update webapp/components/generic/SearchGroup/SearchGroup.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:53:22 +02:00
Moriz Wahl
6f4bde93f6
Update backend/src/schema/resolvers/searches.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:52:48 +02:00
Wolfgang Huß
05e4984df6 Merge branch '76-release-v2.0.0-groups-extend-rebranding-and-deployment' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable 
# Conflicts:
#	README.md
#	TODO-next-update.md
#	branding/constants/groups.js
#	branding/constants/headerMenu.js
#	branding/constants/logos.js
 2022-10-22 21:06:45 +02:00
Wolfgang Huß
ea51f73b64 Adjust the footer 2022-10-22 20:46:38 +02:00
Wolfgang Huß
c13b285992 Add header menu item 'Topic' 2022-10-22 20:31:32 +02:00
Wolfgang Huß
7ec3ee09df Adjust merge of groups branch by fixing header menu lacales idents 2022-10-22 20:26:31 +02:00
Wolfgang Huß
c2c66786a7 Merge branch '5059-epic-groups' of github.com:Yunite-Net/Yunite-Net-Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable 
# Conflicts:
#	.github/workflows/publish.yml
#	branding/constants/headerMenu.js
 2022-10-22 20:21:25 +02:00
Wolfgang Huß
9492162712 Set footer 2022-10-22 20:14:51 +02:00
Wolfgang Huß
b0ff413d83 Adjust and add constants files 2022-10-22 20:05:29 +02:00
Wolfgang Huß
4dca4269cb Change and correct readme's 2022-10-22 20:04:52 +02:00
Wolfgang Huß
f90d671245 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into search-groups 2022-10-22 18:07:35 +02:00
Moriz Wahl
c2617af23f add db:migrate up to CI 2022-10-22 15:28:01 +02:00
Wolfgang Huß
2b0ea92f09 Fix master merge by adding groups button to mobile menu 2022-10-22 12:30:48 +02:00
Wolfgang Huß
5434bbf6c6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-22 12:29:59 +02:00
Wolfgang Huß
2e50e616a7
Merge pull request #5502 from Ocelot-Social-Community/5059-groups/5501-add-group-link-to-posts-in-webapp 2022-10-22 11:13:25 +02:00
ogerly
15561cb94f fix lint 2022-10-22 09:36:18 +02:00
ogerly
401f59ae8d add header menu to component, central variabl for screen width 2022-10-22 09:35:27 +02:00
Wolfgang Huß
1421973a9f Fix Cypress test 'I_click_on_the_author.js' 2022-10-22 08:41:27 +02:00
ogerly
1406361cf0 change pixel mobile menu show by under 811px 2022-10-22 08:33:30 +02:00
Wolfgang Huß
23dbab9427
Merge pull request #5524 from Ocelot-Social-Community/4732-Put-Footer-Content-In-The-Menu-On-Mobil-Phones 
feat: 🍰 Mobile Footer Menu To Header Menu
 2022-10-22 08:15:00 +02:00
Moriz Wahl
d1b05b7e02 add groups to search result page 2022-10-21 18:35:21 +02:00
Moriz Wahl
57bbe4c6e8 allow search groups in permission middleware, add user id to search groups query 2022-10-21 18:34:48 +02:00
Moriz Wahl
2b8b50af48 add group hint to search hint 2022-10-21 17:59:11 +02:00
Moriz Wahl
61c2250c03 respect & symbol in searches 2022-10-21 17:54:25 +02:00
Moriz Wahl
522cd8ef9e search for groups 2022-10-21 17:52:33 +02:00
Moriz Wahl
add85ef49c add graphql for group search 2022-10-21 17:52:06 +02:00
Moriz Wahl
cb1e9f95e0 add headers for group search 2022-10-21 17:51:43 +02:00
Moriz Wahl
37babb5c7c Merge branch '5059-epic-groups' into search-groups 2022-10-21 16:59:13 +02:00
Moriz Wahl
3fb4146d62 Merge branch 'master' into 5059-epic-groups 2022-10-21 16:58:32 +02:00
Alexander Friedland
fc7bbede1d
Update webapp/components/PageFooter/PageFooter.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-21 13:44:22 +02:00
Alexander Friedland
f399fa11a1
Merge branch 'master' into 4732-Put-Footer-Content-In-The-Menu-On-Mobil-Phones 2022-10-21 13:42:26 +02:00
ogerly
bdf848b237 set this.windowWidth, and change computed showMobileMenu 2022-10-21 12:50:13 +02:00
ogerly
b467e6846a comment out headerMenu.js 2022-10-21 12:30:45 +02:00
ogerly
ef316d5c36 fix lint 2022-10-21 12:24:38 +02:00
ogerly
5f89017cea mobile menu check, delete topic 2022-10-21 12:23:41 +02:00
Wolfgang Huß
1f6b1f8710
Merge pull request #5525 from Ocelot-Social-Community/5523-make-click-on-logo-configurable 
feat: 🍰 Implement `LOGO_HEADER_CLICK` As Configuration
 2022-10-21 11:39:51 +02:00
Wolfgang Huß
9773a7b4ba Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp 2022-10-21 11:34:31 +02:00
Wolfgang Huß
46e4d1d945 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-21 11:30:41 +02:00
Wolfgang Huß
937954b6f6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-21 11:23:27 +02:00
Wolfgang Huß
1d9c24db24 Fix tests of group profile page 2022-10-21 11:12:32 +02:00
Wolfgang Huß
4f2ea8ef3c Refine and synchronize group slug on group profile with user slug on user profile 2022-10-21 11:12:05 +02:00
Wolfgang Huß
294da3048f Refine 'in' text between user slug and group slug in user teaser 2022-10-21 11:11:03 +02:00
Wolfgang Huß
daea147772 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5523-make-click-on-logo-configurable 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-21 10:40:56 +02:00
Moriz Wahl
dd19eadaf3
Merge pull request #5527 from Ocelot-Social-Community/category-filter-in-filter-menu 
refactor: 🍰 Category Filter In Filter Menu
 2022-10-21 08:29:21 +02:00
Alexander Friedland
e68952b17e
Merge pull request #5512 from Ocelot-Social-Community/5384-Group-Invitation 
feat: 🍰 Group Invitation
 2022-10-21 06:54:50 +02:00
ogerly
de33b2288d fix lint 2022-10-20 16:01:16 +02:00
ogerly
af5447e830 coverage 65.14%, add specs GroupList.spec, GroupMember.spec 2022-10-20 15:58:34 +02:00