14556 Commits

Author SHA1 Message Date
Markus
9849a13999 [fix] @ mentions in chat now redirect to user page 2023-07-28 14:35:43 +02:00
Markus
44656c7aba Merge branch 'master' into 6500-refactor-filter-menu 2023-07-28 14:08:37 +02:00
Markus
568e314926 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-28 14:08:26 +02:00
Markus
cbf93628a5 [feature] have all button for source filter option 2023-07-28 14:05:26 +02:00
Markus
c6a1c1a8c8 changed label text for event filter component 2023-07-28 13:26:51 +02:00
Markus
8c9706505a Merge branch '6500-refactor-filter-menu' of github.com:Ocelot-Social-Community/Ocelot-Social into 6500-refactor-filter-menu 2023-07-28 13:22:22 +02:00
elweyn
8346d31cb8 fix(webapp): add jsconfig.json to navigate in webapp. 2023-07-27 09:53:34 +02:00
mahula
69aa616012
Merge pull request #6643 from Ocelot-Social-Community/6642-fix-create-event-typing-issues
fix(webapp): fix create event typing issues
b2.7.0-526
2023-07-27 09:32:44 +02:00
Wolfgang Huß
11a1256b0e
Merge branch 'master' into 6642-fix-create-event-typing-issues 2023-07-26 17:17:25 +02:00
Wolfgang Huß
5696d374e5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6500-refactor-filter-menu 2023-07-26 14:58:41 +02:00
Wolfgang Huß
0e948fc2e3 Change filter menu save button label to 'Save topics' 2023-07-26 14:58:30 +02:00
Hannes Heine
0bc8e9dfb4
Merge pull request #6641 from Ocelot-Social-Community/6622-mini-chat-dynamic-header
fix(webapp): mini chat: dynamic header buttons
b2.7.0-525
2023-07-26 14:50:58 +02:00
elweyn
d07dbe14a9 Change click event layer from div to button. 2023-07-26 14:21:05 +02:00
Wolfgang Huß
7443c60d40 Fix create event typing issues 2023-07-26 14:10:15 +02:00
elweyn
ad74448696 Fix linting. 2023-07-26 14:00:59 +02:00
elweyn
fd33f11ab4 Merge branch 'master' into 6622-mini-chat-dynamic-header 2023-07-26 13:57:18 +02:00
Hannes Heine
0eb6a540f6
Merge pull request #6639 from Ocelot-Social-Community/6636-search-trigger-after-3-chars
fix(webapp): start search of user after three characters (chat new room, add group member)
b2.7.0-524
2023-07-26 13:54:35 +02:00
elweyn
790ce71122 Change the button style to small, change position. 2023-07-26 13:43:51 +02:00
elweyn
3e1ed4f1db Change color of scroll icon color & scroll counter color. 2023-07-26 13:37:30 +02:00
Wolfgang Huß
6f02a87355
Merge branch 'master' into 6636-search-trigger-after-3-chars 2023-07-26 13:21:21 +02:00
Hannes Heine
d9ef74dfc1
Merge pull request #6559 from Ocelot-Social-Community/6443-refactor-create-post-page
refactor(webapp): updated/refactored ui of create post page
b2.7.0-523
2023-07-26 13:06:01 +02:00
elweyn
618e4c7a67 Change icons to base-buttons 2023-07-26 12:59:25 +02:00
elweyn
2706fbfaf4 Import svg from Nitro-Styleguide. 2023-07-26 12:58:19 +02:00
elweyn
f9c71bad74 Start search after three characters. 2023-07-26 11:17:05 +02:00
elweyn
b089c1652d Remove console.log entry. 2023-07-26 11:07:11 +02:00
elweyn
fa286139c4 Fix unit test structure search of OrderByFilter. 2023-07-26 11:06:47 +02:00
Hannes Heine
7f06d71f6a
Merge branch 'master' into 6443-refactor-create-post-page 2023-07-26 10:53:04 +02:00
Hannes Heine
fa569a7172
Merge branch 'master' into 6500-refactor-filter-menu 2023-07-24 07:44:16 +02:00
Wolfgang Huß
a5578e4ff4
Merge pull request #6624 from Ocelot-Social-Community/fix-code-in-editor-component
fix(webapp): fix code in editor component
b2.7.0-522
2023-07-21 10:08:00 +02:00
Wolfgang Huß
d57e3aa0f3 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into fix-code-in-editor-component 2023-07-21 07:27:19 +02:00
Hannes Heine
3352dbd1fd
Merge pull request #6621 from Ocelot-Social-Community/fix-security-subscriptions
fix(backend): security subscriptions
b2.7.0-521
2023-07-20 18:38:16 +02:00
26730cd027
Merge branch 'master' into fix-security-subscriptions 2023-07-20 17:59:30 +02:00
a16fce1acf
Merge pull request #6620 from Ocelot-Social-Community/fix-message-me-color
fix(webapp): change the background color of my messages to the same color as side menu
b2.7.0-520
2023-07-20 17:59:17 +02:00
Hannes Heine
427390f54d
Merge branch 'master' into fix-message-me-color 2023-07-20 17:11:39 +02:00
fbd2b08737
Merge branch 'master' into fix-security-subscriptions 2023-07-20 17:11:20 +02:00
9264e6b471
Merge pull request #6619 from Ocelot-Social-Community/6610-change-general-search-hint
feat(webapp): change general search hint
b2.7.0-519
2023-07-20 17:11:05 +02:00
Hannes Heine
6ab4b016ea
Merge branch 'master' into fix-message-me-color 2023-07-20 17:01:41 +02:00
elweyn
fa9b839081 Remove client customizing. 2023-07-20 16:56:33 +02:00
Wolfgang Huß
cf8c224062 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6593-@all-mention-for-network-admins 2023-07-20 16:53:36 +02:00
elweyn
69394d800b Change default ocelot badge color to text-color-inverted. 2023-07-20 16:53:10 +02:00
elweyn
39eef13a51 Change the ocelot chat room badge color 2023-07-20 16:45:44 +02:00
5051640435
Merge branch 'master' into 6610-change-general-search-hint 2023-07-20 16:21:31 +02:00
34a92c6297
Merge pull request #6618 from Ocelot-Social-Community/6592-chat-component-+-button-open-search
feat(webapp): chat component + button open search
b2.7.0-518
2023-07-20 16:21:09 +02:00
Wolfgang Huß
b26e454562 Fix linting 2023-07-20 15:42:40 +02:00
Wolfgang Huß
65e5545c9a Test branding 2023-07-20 15:40:21 +02:00
Wolfgang Huß
db3c625dfb Revert general change of PR 2023-07-20 15:39:11 +02:00
elweyn
074711dd90 Fix: order createdAt_desc & lastMessageAt_desc 2023-07-20 14:31:57 +02:00
elweyn
21124bcd71 Fix: Order of rooms. 2023-07-20 14:18:25 +02:00
604e1d8465
subscription roomCountUpdated security fix 2023-07-20 13:44:23 +02:00
f7c381efd8
subscription chatMessageAdded security fix 2023-07-20 13:44:04 +02:00