Wolfgang Huß
|
65431c2baf
|
Merge branch '5545-Footer-And-Header-Links-Configurable' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable
# Conflicts:
# webapp/components/Group/GroupMember.vue
|
2022-10-28 13:13:53 +02:00 |
|
Wolfgang Huß
|
27589a64ba
|
Fix target property in 'HeaderMenu.vue'
|
2022-10-28 13:08:39 +02:00 |
|
Wolfgang Huß
|
ed48656d8a
|
Revert to have header menu groups button again
|
2022-10-28 12:48:58 +02:00 |
|
Wolfgang Huß
|
b20b797d60
|
Fix target property in 'PageParamsLink.vue'
|
2022-10-28 12:48:27 +02:00 |
|
ogerly
|
9b7dc2cac7
|
fix lint
|
2022-10-28 12:27:04 +02:00 |
|
Wolfgang Huß
|
ffb508806b
|
Disable remove group member button, because this doesn't work yet
|
2022-10-28 12:10:57 +02:00 |
|
Wolfgang Huß
|
b45545decf
|
Adjust 'internalPageMixins'
|
2022-10-28 12:06:16 +02:00 |
|
Wolfgang Huß
|
f5f3fbeadb
|
Fix linting
|
2022-10-28 12:05:45 +02:00 |
|
ogerly
|
8c1c260418
|
menu filter clear position of buttons
|
2022-10-28 12:05:23 +02:00 |
|
Wolfgang Huß
|
00c10cc1a7
|
Refine footer links and donation link and fix their tests
|
2022-10-28 11:50:15 +02:00 |
|
ogerly
|
7578e03c6d
|
change hasttag search test color to #17b53f
|
2022-10-28 11:34:34 +02:00 |
|
Moriz Wahl
|
847775a3f4
|
fix: Comments on Posts in Groups in Webapp
|
2022-10-28 11:00:27 +02:00 |
|
Wolfgang Huß
|
9bf0e26731
|
Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable
|
2022-10-28 10:13:52 +02:00 |
|
Wolfgang Huß
|
6d3c7f0acb
|
Simplify usage of 'LOGOS.LOGO_HEADER_CLICK.externalLink.target'
|
2022-10-28 10:12:39 +02:00 |
|
Wolfgang Huß
|
6c45b1f3a1
|
Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable
|
2022-10-28 09:14:08 +02:00 |
|
Wolfgang Huß
|
ef97b4c388
|
Fix a merging left over with header logo click and fix functionallity on empty string targets
|
2022-10-28 09:11:01 +02:00 |
|
ogerly
|
709c9b1073
|
fix lint
|
2022-10-28 08:48:29 +02:00 |
|
ogerly
|
0c9fcaa5c6
|
test coverage to 64%
|
2022-10-28 08:47:55 +02:00 |
|
Wolfgang Huß
|
c30d27bd6c
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into Make-Header-Menu-To-Component
|
2022-10-28 08:09:26 +02:00 |
|
Wolfgang Huß
|
f6c98475b3
|
Merge pull request #5600 from Ocelot-Social-Community/5064-add-live-demo-do-main-readme
docs: 🍰 Add Live Demo To Main Readme
|
2022-10-27 21:25:39 +02:00 |
|
Moriz Wahl
|
5efb530d42
|
Merge pull request #5599 from Ocelot-Social-Community/comments-on-posts-in-groups
feat: Restrict Comments on Posts in Groups
|
2022-10-27 20:43:55 +02:00 |
|
Alexander Friedland
|
e55917c7c6
|
Merge pull request #5591 from Ocelot-Social-Community/4744-Missing-Space-On-Registration-Slider
fix: 🍰 Add Space In Register Box
|
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
|
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
|
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
|
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 |
|