ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,098 Commits 117 Branches 1,511 Tags
Commit Graph

12098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
e55917c7c6
Merge pull request #5591 from Ocelot-Social-Community/4744-Missing-Space-On-Registration-Slider 
fix: 🍰 Add Space In Register Box
b2.1.0-260 		2022-10-27 18:36:16 +02:00
Wolfgang Huß
09cb120f92 Add 'ds-spaces' to the other registration slider components 2022-10-27 16:03:13 +02:00
ogerly
533eef0f37 remove unused code 2022-10-27 15:46:41 +02:00
ogerly
75ff8f5eba fix lint 2022-10-27 15:30:06 +02:00
ogerly
20ca2eca39 change style for button position 2022-10-27 15:29:21 +02:00
ogerly
93add91e77 fix lint 2022-10-27 15:23:19 +02:00
ogerly
76ad2ec063 change <space-xx-small /> to <ds-space margin=xxx-small /> 2022-10-27 15:22:22 +02:00
ogerly
4c4e67bcf7 filter category save and all button in on line 2022-10-27 15:17:27 +02:00
Moriz Wahl
831cb20952
Merge pull request #5583 from Ocelot-Social-Community/update-group-avatar-on-upload 
fix: 🍰 Update Group Avatar After Upload
b2.1.0-259 		2022-10-27 14:51:33 +02:00
Wolfgang Huß
134a8099c8 Add live demo to main readme 2022-10-27 14:35:41 +02:00
ogerly
d0e298ad26 Merge branch 'Make-Header-Menu-To-Component' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu 2022-10-27 14:21:21 +02:00
Wolfgang Huß
18e9d5488a
Merge pull request #5593 from Ocelot-Social-Community/5580-make-donation-bar-configurable 
feat: 🍰 Make Donation Progress Bar Color Configurable
b2.1.0-258 		2022-10-27 14:14:25 +02:00
Moriz Wahl
5f4bf58dc6 feat: Restrict Comments on Posts in Groups 2022-10-27 14:06:42 +02:00
Wolfgang Huß
7db203db73
Merge pull request #5596 from Ocelot-Social-Community/5480-fix-edit-slug-of-group 
fix: 🍰 Bug In Edit Slug Of Group
b2.1.0-257 		2022-10-27 13:44:03 +02:00
Moriz Wahl
f8c4b74be1 when avatar is uploaded, the description is not present. Therefore no descriptionExcerpt should be created in middleware 2022-10-27 13:02:05 +02:00
Wolfgang Huß
c42c1b2ef6 Fix group slug tests 2022-10-27 12:28:37 +02:00
Wolfgang Huß
932572049b Fix not correct working change of slug in group settings 2022-10-27 12:27:51 +02:00
ogerly
8c7005f643 change font-size and filter icon size 2022-10-27 12:00:08 +02:00
ogerly
baaa61761d change width, oderBy slug_asc 2022-10-27 11:40:22 +02:00
Wolfgang Huß
b43d49bfa9 Make donation progress bar color configurable 2022-10-27 10:07:02 +02:00
ogerly
655f1a26c8 add space in register box 2022-10-27 09:18:47 +02:00
ogerly
613812e3e9 resolve conflict after merge Make-Header-Menu-To-Component 2022-10-27 09:06:57 +02:00
Alexander Friedland
34839b5311
Merge branch 'master' into Make-Header-Menu-To-Component 2022-10-27 09:03:26 +02:00
Alexander Friedland
c875148229
Update webapp/layouts/default.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-27 08:56:49 +02:00
Alexander Friedland
ac8490eb95
Update webapp/layouts/default.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-27 08:56:43 +02:00
ogerly
2ae5e26376 comment out unused menu 2022-10-27 08:51:40 +02:00
ogerly
bad97a2fca fix lint 2022-10-27 08:50:37 +02:00
ogerly
1dfdc61220 footer links target dynamic 2022-10-27 08:48:58 +02:00
ogerly
c62e49fef3 merge Make-Header-Menu-To-Component, resolve conflict 2022-10-27 08:27:19 +02:00
ogerly
31a4be9375 add target url dynamic 2022-10-27 08:24:20 +02:00
Wolfgang Huß
d4b921a25c
Merge pull request #5584 from Ocelot-Social-Community/5059-groups/5570-fix-group-teaser 
fix: 🍰 Fix Group Teaser
b2.1.0-256 		2022-10-27 08:10:47 +02:00
Wolfgang Huß
a69e155ef9 Fix slug indicator character '@' → '&' on the group teaser 2022-10-26 18:37:01 +02:00
Wolfgang Huß
73b91a5f04 Fix visibility of the role chip on the group teaser 2022-10-26 18:26:13 +02:00
Moriz Wahl
a6517ca0d8
Merge pull request #5582 from Ocelot-Social-Community/list-all-groups 
feat: 🍰 List All Groups
b2.1.0-255 		2022-10-26 18:13:23 +02:00
Moriz Wahl
594477f7bf fix: Update Group Avatar after Upload 2022-10-26 17:42:57 +02:00
Moriz Wahl
1cc663ed34 add spec for groups 2022-10-26 16:05:44 +02:00
Moriz Wahl
b183485237 fix locales 2022-10-26 15:17:36 +02:00
adrianrojek
a20f1e1bc4
Merge pull request #5579 from Ocelot-Social-Community/bug/issue#5550 
feat: 🍰 Header Logo Routing Update
b2.1.0-254 		2022-10-26 15:16:38 +02:00
Moriz Wahl
bbf625d525 remove comments 2022-10-26 15:15:08 +02:00
Moriz Wahl
1d21da46e0 add pagination buttons to group lists 2022-10-26 14:57:59 +02:00
Moriz Wahl
6ec8f05904 add pagination to Group query 2022-10-26 14:27:08 +02:00
Moriz Wahl
3bf26de650 rename route from my-groups to groups 2022-10-26 14:18:33 +02:00
Moriz Wahl
7f22b5fb62 add tab to group page to have all groups and my groups 2022-10-26 14:06:02 +02:00
Moriz Wahl
5b66edb387 add group count query 2022-10-26 13:49:25 +02:00
Wolfgang Huß
bdeb39edd1 Merge branch 'bug/issue#5550' of github.com:Ocelot-Social-Community/Ocelot-Social into bug/issue#5550 
# Conflicts:
#	webapp/constants/logos.js
 2022-10-26 11:45:04 +02:00
Wolfgang Huß
d9ed2ef2ca Implement that undefined logo click target is '_blank' as default 2022-10-26 11:43:29 +02:00
ar798ax
1b48ef619a lint fix 2022-10-26 11:12:37 +02:00
ar798ax
397b469f62 header logo routing update 2022-10-26 10:14:39 +02:00
Wolfgang Huß
6fa1ad3360
Merge pull request #5574 from Ocelot-Social-Community/5573-release-v2.1.0-groups 
chore: 🍰 Release v2.1.0
b2.1.0-253 2.1.0 		2022-10-25 16:32:44 +02:00
Wolfgang Huß
dc085e9e69 Release v2.1.0 2022-10-25 14:24:10 +02:00