14581 Commits

Author SHA1 Message Date
Alexander Friedland
7c78f01edd
Merge pull request #2959 from gradido/2892-Frontend-multiple-auto-logout-messages
fix(frontend): auto logout messages autohide time 5000
2023-06-16 06:06:57 +02:00
Alexander Friedland
732a083aab
Merge branch 'master' into 2892-Frontend-multiple-auto-logout-messages 2023-06-16 05:32:21 +02:00
b27393f6e7
Merge pull request #3024 from gradido/federation-introduce-private-key-in-community-table
feat(federation): introduce private key in community table
2023-06-16 02:23:29 +02:00
clauspeterhuebner
d060acaba2
Merge branch 'master' into federation-introduce-private-key-in-community-table 2023-06-16 00:02:25 +02:00
09faa30aab
Merge pull request #3035 from gradido/remove-klicktipp-middleware
refactor(backend): removed klicktipp middleware and replace it with a function
2023-06-15 20:17:42 +02:00
6c8a56cece
Merge branch 'master' into remove-klicktipp-middleware 2023-06-15 20:02:46 +02:00
b1f39088d3
Merge pull request #3059 from gradido/admin-order-usersearch-desc
feat(admin): order user search desc, fix pagination
2023-06-15 20:02:19 +02:00
c7f316f61c
Merge branch 'master' into remove-klicktipp-middleware 2023-06-15 19:55:19 +02:00
431d072f23
Merge branch 'master' into admin-order-usersearch-desc 2023-06-15 16:01:47 +02:00
f71189c93e
Merge pull request #3039 from gradido/eslint-database-eslint-comments
refactor(database): eslint database eslint comments
2023-06-15 16:01:29 +02:00
215558b4d8
Merge branch 'master' into eslint-database-eslint-comments 2023-06-15 15:44:42 +02:00
5cea4276c7
Merge pull request #3038 from gradido/eslint-database-import
refactor(database): eslint database import
2023-06-15 15:44:18 +02:00
67d9b24723
Merge branch 'master' into eslint-database-import 2023-06-15 15:21:36 +02:00
e8528ccbb8
fixed unit tests 2023-06-15 15:18:05 +02:00
Hannes Heine
7137ba4480
Merge pull request #2938 from gradido/2473-feature-emails-further-design-of-html-emails
feat(backend): apply design template to HTML e-mails
2023-06-15 15:14:33 +02:00
df60b120c8
Merge branch 'master' into admin-order-usersearch-desc 2023-06-15 15:04:35 +02:00
Hannes Heine
80b742f6cd
Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails 2023-06-15 15:00:02 +02:00
7ee32e6f95
Merge pull request #3037 from gradido/eslint-database-n
refactor(database): eslint database n
2023-06-15 14:59:52 +02:00
417712ab9a
Merge branch 'master' into eslint-database-n 2023-06-15 14:45:30 +02:00
6be103e6b3
Merge pull request #3032 from gradido/sodium-native-new-pr
refactor(backend): sodium native with types
2023-06-15 14:45:03 +02:00
f179cff2cf
Merge branch 'master' into sodium-native-new-pr 2023-06-15 14:32:27 +02:00
a76d54d6b0
Merge branch 'master' into remove-klicktipp-middleware 2023-06-15 14:30:13 +02:00
443bd2f499
Merge branch 'master' into eslint-database-import 2023-06-15 14:27:34 +02:00
b92eebe594
Merge branch 'master' into federation-introduce-private-key-in-community-table 2023-06-15 14:24:31 +02:00
68706e41ae
Merge pull request #3023 from gradido/federation-expose-privateKey-to-writeHomeCommunity
refactor(federation): expose private key to write home community
2023-06-15 14:24:10 +02:00
Hannes Heine
77ea9e1c62
Update backend/src/locales/de.json
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-06-15 14:14:29 +02:00
elweyn
46fb5c0e63 Remove todo has been done with attachments. 2023-06-15 14:13:25 +02:00
clauspeterhuebner
2e3fdd865b
Merge branch 'master' into eslint-database-eslint-comments 2023-06-15 14:02:11 +02:00
clauspeterhuebner
29187e790d
Merge branch 'master' into eslint-database-import 2023-06-15 14:01:53 +02:00
clauspeterhuebner
86330c5012
Merge branch 'master' into eslint-database-n 2023-06-15 14:01:29 +02:00
clauspeterhuebner
b319b1a533
Merge branch 'master' into sodium-native-new-pr 2023-06-15 14:00:08 +02:00
clauspeterhuebner
15badc2beb
Merge branch 'master' into federation-expose-privateKey-to-writeHomeCommunity 2023-06-15 13:51:05 +02:00
elweyn
414640048f change location of eslint-disable. 2023-06-15 13:44:49 +02:00
Hannes Heine
2ccb2c7ed4
Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails 2023-06-15 11:43:40 +02:00
63b2770ff1
lint fixes backend 2023-06-14 13:52:02 +02:00
2ffaaa8bd4
fix pagination & adjust to new searchUser query 2023-06-14 13:45:21 +02:00
59a16a8c46
refactor query 2023-06-14 13:45:02 +02:00
360dcc1ebe
include order in typeorm query 2023-06-14 13:44:54 +02:00
e412265b3a
refactor user resolver 2023-06-14 13:44:01 +02:00
0ca1f1ac29
Merge pull request #3042 from gradido/eslint-dht-base
refactor(dht): eslint dht base configuration
2023-06-14 12:34:33 +02:00
2d2f4209ff
Merge branch 'master' into eslint-dht-base 2023-06-14 12:15:55 +02:00
7079aad4b3
Merge branch 'master' into federation-expose-privateKey-to-writeHomeCommunity 2023-06-14 12:00:59 +02:00
0e6ae70c8d
Merge pull request #3047 from gradido/eslint-federation-base
refactor(federation): eslint federation base configuration
2023-06-12 12:04:09 +02:00
e7454cf219
Merge branch 'master' into eslint-federation-base 2023-06-12 11:49:12 +02:00
8d8521eb25
Merge branch 'master' into eslint-dht-base 2023-06-12 11:28:16 +02:00
0f285175d6
Merge pull request #3036 from gradido/eslint-database-base
refactor(database): eslint database base configuration
2023-06-12 11:27:58 +02:00
14a93712cd
Merge branch 'master' into eslint-database-base 2023-06-12 11:15:56 +02:00
908e1e3ffe
Merge pull request #3043 from gradido/dht-for-lint-pr
feat(workflow): dht as package for lint pr workflow
2023-06-12 11:15:32 +02:00
2c75cbeee4
Merge branch 'master' into dht-for-lint-pr 2023-06-12 11:02:27 +02:00
873af6d180
Merge branch 'master' into federation-expose-privateKey-to-writeHomeCommunity 2023-06-09 14:28:54 +02:00