|
|
d23e1a5aad
|
removed obsolete todos
|
2023-06-20 10:42:39 +02:00 |
|
|
|
580c5940d2
|
covert public_key according to new standarts unhex/hex
|
2023-06-20 09:39:54 +02:00 |
|
|
|
a8407618bd
|
merge conflicts solved
|
2023-06-20 09:18:41 +02:00 |
|
|
|
d680a4b05f
|
Merge branch 'master' into federation-fix-database-public-key-length
|
2023-06-20 09:17:56 +02:00 |
|
Alexander Friedland
|
9c279aa515
|
Merge pull request #3049 from gradido/3048-change-the-info-text-on-the-start-page
feat(frontend): change the info text on the start page
|
2023-06-16 16:55:29 +02:00 |
|
Alexander Friedland
|
13dfcb0e35
|
Merge branch 'master' into 3048-change-the-info-text-on-the-start-page
|
2023-06-16 15:14:31 +02:00 |
|
|
|
b1f07c13c0
|
Merge pull request #3045 from gradido/eslint-dht-n
refactor(dht): eslint dht n
|
2023-06-16 14:40:18 +02:00 |
|
|
|
720e167f19
|
Merge branch 'master' into eslint-dht-n
|
2023-06-16 14:23:18 +02:00 |
|
|
|
24e60eb192
|
Merge pull request #3046 from gradido/eslint-dht-comments
refactor(dht): eslint dht comments
|
2023-06-16 14:22:57 +02:00 |
|
|
|
a7d01d1b6f
|
Merge branch 'master' into eslint-dht-comments
|
2023-06-16 14:10:12 +02:00 |
|
Alexander Friedland
|
28546787b1
|
Merge branch 'master' into 3048-change-the-info-text-on-the-start-page
|
2023-06-16 08:31:05 +02:00 |
|
Alexander Friedland
|
f9c7bf9cfc
|
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-06-16 08:30:47 +02:00 |
|
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 |
|
Alexander Friedland
|
f6a7a029e2
|
Merge branch 'master' into 3048-change-the-info-text-on-the-start-page
|
2023-06-16 05:30:34 +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
|
7becf9b3ab
|
Merge branch 'master' into eslint-dht-comments
|
2023-06-16 00:05:00 +02:00 |
|
clauspeterhuebner
|
e71c9085f0
|
Merge branch 'master' into eslint-dht-n
|
2023-06-16 00:04:44 +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 |
|
|
|
084ada6322
|
Merge branch 'master' into eslint-dht-n
|
2023-06-15 20:02:13 +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 |
|
