14580 Commits

Author SHA1 Message Date
Wolfgang Huß
903375ca61 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6661-fix-backup-script-for-neo4j-v4 2023-09-01 12:35:09 +02:00
dependabot[bot]
5fb223fe7f
Bump expect from 29.6.1 to 29.6.4
Bumps [expect](https://github.com/jestjs/jest/tree/HEAD/packages/expect) from 29.6.1 to 29.6.4.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.4/packages/expect)

---
updated-dependencies:
- dependency-name: expect
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-26 01:53:08 +00:00
Wolfgang Huß
b3fc704b93 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/babel/preset-env-7.22.9
# Conflicts:
#	package.json
2023-08-24 16:00:14 +02:00
Wolfgang Huß
84ff6c15e9
Merge pull request #6573 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/core-7.22.9
build(other): bump @babel/core from 7.22.8 to 7.22.9
b3.0.2-541
2023-08-24 15:52:38 +02:00
Wolfgang Huß
3928b6be10
Merge branch 'master' into dependabot/npm_and_yarn/babel/core-7.22.9 2023-08-24 11:58:30 +02:00
Wolfgang Huß
1e4a290e4f
Merge pull request #6692 from Ocelot-Social-Community/6691-add-using-DKIM-by-nodemailer
feat(backend): implement dkim config for nodemailer
b3.0.2-540
2023-08-23 15:38:47 +02:00
Wolfgang Huß
bec27daea7 Refine new configuration for DKIM to 'TODO-next-update.md' 2023-08-23 15:02:15 +02:00
Wolfgang Huß
90ab066caf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6691-add-using-DKIM-by-nodemailer 2023-08-23 14:59:01 +02:00
Wolfgang Huß
a3a6719d00 Add new configuration for DKIM to 'TODO-next-update.md' 2023-08-23 14:58:40 +02:00
Wolfgang Huß
923f87bde0
Merge pull request #6694 from Ocelot-Social-Community/6665-filtermenu-mobile-bug
fix(webapp): filtermenu mobile bug
b3.0.2-539
2023-08-23 13:48:38 +02:00
Wolfgang Huß
d13aaebb76
Merge branch 'master' into 6665-filtermenu-mobile-bug 2023-08-23 11:51:36 +02:00
Wolfgang Huß
481c78c6c4
Merge pull request #6693 from Ocelot-Social-Community/6675-fix-duoble-api-in-avatar-url
fix(webapp): fix proxyapiurl in chat rooms for the avatars
b3.0.2-538
2023-08-23 11:51:23 +02:00
Wolfgang Huß
843b5ad505
Merge branch 'master' into 6675-fix-duoble-api-in-avatar-url 2023-08-23 10:28:48 +02:00
Wolfgang Huß
2f4ba3e8c0
Merge pull request #6698 from Ocelot-Social-Community/6687-groups-map
fix(webapp): fix the group link in the map
b3.0.2-537
2023-08-23 10:27:08 +02:00
Wolfgang Huß
c6b1d663c1 Shorten code of DKIM config for Nodemailer to the solution used otherwise in code 2023-08-22 14:55:47 +02:00
Wolfgang Huß
9f5d32e527 Write documentation for DKIM e-mail setting 2023-08-22 14:39:37 +02:00
Wolfgang Huß
cd206c238a Cleanup 2023-08-21 13:44:29 +02:00
Wolfgang Huß
f866f37bc8 Add 'SMTP_SECURE' to '.env.template' of backend 2023-08-21 13:44:17 +02:00
Wolfgang Huß
28665bd175 Refine DKIM config for Nodemailer 2023-08-21 12:33:39 +02:00
Javier López
be604cc945 fix:[6687] update the groups link in map 2023-08-20 23:48:14 +02:00
Markus
a0434143ca [fix] fixed ui issues for filter mobile view 2023-08-18 15:28:27 +02:00
Markus
7c65188b42 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-08-18 15:06:07 +02:00
entermex
bd688ecd6b Fix: proxyApiUrl in chat rooms for the avatars 2023-08-18 11:43:28 +02:00
Wolfgang Huß
be4d34228d Implement DKIM config for Nodemailer 2023-08-17 17:26:59 +02:00
Wolfgang Huß
931b728c33
Merge pull request #6674 from Ocelot-Social-Community/release-v3.0.2-fix-chat-avatar-error-and-wrong-font-in-network
chore(release): release v3.0.2 – fix chat avatar error and wrong font in network
b3.0.2-536 3.0.2
2023-08-11 14:56:29 +02:00
Wolfgang Huß
7bcad81785 Release v3.0.2 2023-08-11 14:22:13 +02:00
Wolfgang Huß
e1b14f09dc
Merge pull request #6672 from Ocelot-Social-Community/6669-fix-having-wrong-chat-font-as-default-in-network
fix(webapp): fix wrong font in whole network comming from chat component
b3.0.1-535
2023-08-11 13:11:14 +02:00
Wolfgang Huß
d345bf0bba Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6669-fix-having-wrong-chat-font-as-default-in-network 2023-08-11 12:34:42 +02:00
Wolfgang Huß
5b954197dc Remove font 'Quicksand' from the chat
- Set style of chat component to 'scoped'
2023-08-11 12:27:21 +02:00
Wolfgang Huß
120b6e69e1
Merge pull request #6671 from Ocelot-Social-Community/6668-fix-avatar-null-on-add-room-and-room-refetchj
fix(webapp): fix 'm.avatar is null' error message
b3.0.1-534
2023-08-11 12:12:23 +02:00
Wolfgang Huß
2c123313ed Fix 'm.avatar is null' error message 2023-08-11 11:14:47 +02:00
Wolfgang Huß
9c934c2a17
Merge pull request #6667 from Ocelot-Social-Community/release-v3.0.1
chore(release): release v3.0.1 – fix chat avatars
b3.0.1-533 3.0.1
2023-08-09 13:27:21 +02:00
Wolfgang Huß
0daeb5b957 Releasde v3.0.1 – fix chat avatars 2023-08-09 11:52:59 +02:00
Hannes Heine
f933bd20ad
Merge pull request #6660 from Ocelot-Social-Community/try-to-fix-avatars
fix(webapp): try to fix avatars
b3.0.0-532
2023-08-09 11:24:31 +02:00
7e697d7f9d
lint fixes 2023-08-08 22:22:11 +02:00
5c1ab88012
conditional url replacement 2023-08-08 22:21:24 +02:00
Wolfgang Huß
2f587afb5e Fix backup script for neo4j v4
Co-Authored-By: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-08-08 14:15:40 +02:00
elweyn
b591820eb6 Fix avatar in Room. 2023-08-08 07:56:02 +02:00
6f43321aba
try to fix avatars 2023-08-07 15:56:56 +02:00
Wolfgang Huß
a847879f81
Merge pull request #6658 from Ocelot-Social-Community/release-v3.0.0
chore(other): release v3.0.0
b3.0.0-531 3.0.0
2023-08-07 12:05:09 +02:00
Wolfgang Huß
28e9ab3f39 Release v3.0.0 2023-08-07 11:07:11 +02:00
Hannes Heine
fb0b29e589
Update webapp/jsconfig.json
Co-authored-by: mahula <lenzmath@posteo.de>
2023-08-04 07:10:15 +02:00
mahula
e8bffd71e2
Merge pull request #6652 from Ocelot-Social-Community/fix-missing-locales
fix(webapp): add missing locales
b2.7.0-530
2023-08-02 13:25:24 +02:00
mahula
d57ff2d4ef set back notification text 2023-08-02 12:52:39 +02:00
Wolfgang Huß
002d4737aa
Merge branch 'master' into fix-missing-locales 2023-08-02 12:17:29 +02:00
Wolfgang Huß
f5094e9ff9
Merge pull request #6656 from Ocelot-Social-Community/6655-fix-labels-of-some-filter-buttons
fix(webapp): fix wrong labels in filter menu buttons
b2.7.0-529
2023-08-02 12:17:14 +02:00
Markus
18837b483a Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-08-02 11:43:05 +02:00
Wolfgang Huß
359101bb4c Fix wrong labels in filter menu buttons 2023-08-02 11:36:40 +02:00
mahula
60c927612b
Merge branch 'master' into fix-missing-locales 2023-08-02 10:31:24 +02:00
mahula
4edf3f21cc
Merge branch 'master' into 6376-refactor-cypress-upgrad-all-relevant-packages-to-current-versions 2023-08-02 08:57:53 +02:00