13125 Commits

Author SHA1 Message Date
ogerly
e0b93ae796 Merge remote-tracking branch 'origin/fix-category-filter-buttons' into merge-all-events 2023-04-26 09:00:47 +02:00
ogerly
b6ffdab321 refactor post event 2023-04-26 08:56:57 +02:00
Moriz Wahl
153ef7ae14 test getters and setters for post type filters 2023-04-25 22:12:41 +02:00
ogerly
2c5576f8a1 fix lint, fix locales 2023-04-25 22:11:25 +02:00
ogerly
fad1ab212e locales, style, events 2023-04-25 22:03:05 +02:00
Moriz Wahl
fa4ecaa3f6 filter by post type 2023-04-25 22:02:44 +02:00
Moriz Wahl
fcfce54563 fix(webapp): category filter buttons 2023-04-25 21:08:47 +02:00
ogerly
ef0ee1ec0d Merge branch '6044-Add-create-New-Event' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 6044-Add-create-New-Event 2023-04-25 21:05:04 +02:00
ogerly
fbdb6ca074 show all event datas in post 2023-04-25 21:04:58 +02:00
72ae881d9a
fixed undefined post problem 2023-04-25 21:03:24 +02:00
ogerly
051c7acd4f Merge branch 'feature-visualistion-event-post' into 6044-Add-create-New-Event 2023-04-25 20:15:08 +02:00
ogerly
c265300b53 Merge branch 'event-master' into 6044-Add-create-New-Event 2023-04-25 20:14:41 +02:00
ogerly
43728dd0a5 flex system for eventdatas in post 2023-04-25 19:57:48 +02:00
Moriz Wahl
81b4bc7e22
Merge pull request #6262 from Ocelot-Social-Community/recover-missing-commit
fix(backend): recover missing commit
2023-04-25 19:45:40 +02:00
Moriz Wahl
fc727e6727 add eventEnd 2023-04-25 19:11:46 +02:00
Moriz Wahl
71d8d4f0b4 fix(backend): recover missing changes 2023-04-25 19:02:01 +02:00
ogerly
c930dd6d52 last step construct 2023-04-25 18:45:23 +02:00
ogerly
bc008ddb86 teaser event green 2023-04-25 16:18:40 +02:00
ogerly
bd8ea66922 resolve conflict 2023-04-25 15:28:43 +02:00
ogerly
5387c16fd5 ribbonText 2023-04-25 15:23:02 +02:00
Moriz Wahl
65ad2a72ad postType not in fragment 2023-04-25 15:09:36 +02:00
Moriz Wahl
97632a08fd Merge branch 'event-master' into 6044-Add-create-New-Event 2023-04-25 14:36:34 +02:00
Moriz Wahl
06929e7053 rebase on event master 2023-04-25 14:32:50 +02:00
Moriz Wahl
5512482a66 Merge branch 'master' into event-master 2023-04-25 14:30:32 +02:00
ogerly
032b65fb92 teasr 2 2023-04-25 14:24:31 +02:00
ogerly
affc392b10 teasr 2023-04-25 14:05:17 +02:00
24cbd33f83
Merge pull request #6256 from Ocelot-Social-Community/fix-search-3-chars
fix(webapp): fix search for 3 chars
2023-04-25 14:03:39 +02:00
Moriz Wahl
b327cae02d
Merge pull request #6255 from Ocelot-Social-Community/filter-events
feat(backend): filter posts by post type
2023-04-25 13:49:35 +02:00
ogerly
04d642a4da Merge branch 'fix-post-type-on-notifications' into 6044-Add-create-New-Event 2023-04-25 13:21:51 +02:00
Moriz Wahl
3e14c1220d fix(backned): post type on notifications 2023-04-25 12:41:33 +02:00
ogerly
8dfb22e7a5 merge event-master 2023-04-25 12:35:54 +02:00
bbe77c7ddd
Merge branch 'master' into fix-search-3-chars 2023-04-25 12:02:43 +02:00
Moriz Wahl
e68d8b00fc
Merge pull request #6240 from Ocelot-Social-Community/save-location-address
feat(backend): save location address
2023-04-25 12:01:37 +02:00
c2828a31de
word length limitation set to minimum 2 2023-04-25 12:01:10 +02:00
Moriz Wahl
7b5a88187b
Merge pull request #6242 from Ocelot-Social-Community/group-posts-cannot-be-pinned
fix(backend): group posts cannot be pinned
2023-04-25 12:00:48 +02:00
9198ec9a12
ensure 3 characters minimum 2023-04-25 11:47:30 +02:00
ogerly
e012dbd4c4 Merge branch 'master' into 6044-Add-create-New-Event 2023-04-25 09:26:44 +02:00
ogerly
76eb8757cb merge event master + changes 2023-04-25 09:17:03 +02:00
c88cbdc9d8
last lint 2023-04-25 04:41:43 +02:00
23588c02ec
more lint fixes 2023-04-25 04:24:34 +02:00
e228b42cc4
lint 2023-04-25 04:16:19 +02:00
efff3625a9
properly diferentiate between clearbale search and text hints 2023-04-25 04:07:26 +02:00
6102ce2fff
more lint fix 2023-04-25 04:05:43 +02:00
5c23815a36
lint fixes 2023-04-25 03:50:06 +02:00
536ef92132
more simplifications 2023-04-25 03:44:51 +02:00
4a5c56203b
simplified searchableInput further - fixed on Enter 2023-04-25 02:44:46 +02:00
c7fbe9beef
removed test for onDelete event 2023-04-25 02:36:01 +02:00
33d5758686
removed comments 2023-04-25 02:35:43 +02:00
6025706b4b
fix searchableInput field component to properly retrigger search on delete, clear properly etc 2023-04-25 02:19:50 +02:00
ca24cf4405
simplyfy logic, use language ahortcuts 2023-04-25 02:19:15 +02:00