14639 Commits

Author SHA1 Message Date
Hannes Heine
44d1e98d64
Merge pull request #3081 from gradido/3007-transaction-list-page-style
feat(frontend): transaction list page change style for small device
2023-06-27 20:39:16 +02:00
Hannes Heine
409c74a3f3
Merge branch 'master' into 3007-transaction-list-page-style 2023-06-27 15:05:28 +02:00
Hannes Heine
39a826c37b
Merge pull request #3082 from gradido/2671-refactor-state-to-status
refactor(other): refactor state to status
2023-06-27 14:08:55 +02:00
Hannes Heine
e02c650174
Merge branch 'master' into 2671-refactor-state-to-status 2023-06-27 13:33:30 +02:00
Hannes Heine
c20d48571f
Merge pull request #3080 from gradido/3008-change-deny-button-color
feat(admin): change deny contribution btn-warning color and background-color to #e1a908
2023-06-27 11:38:13 +02:00
elweyn
45b3dc8295 Refactor state to status for contribution in admin. 2023-06-27 10:04:54 +02:00
elweyn
af60cc2638 Refactor state to status for contribution in frontend. 2023-06-27 10:04:40 +02:00
elweyn
48498ee729 Refactor state to status for contribution. 2023-06-27 10:04:21 +02:00
elweyn
9ceb5383cf Set cols from 12 to 6, px from 2 to 1 and remove offset. 2023-06-27 09:14:20 +02:00
elweyn
3af471aebb Change btn-warning color and background color to #e1a908 2023-06-26 20:00:24 +02:00
einhornimmond
5963ebb6a1
Merge pull request #3041 from gradido/iota3_bootstrap_hello_welt
feat(backend): bootstrap and Hello World Test
2023-06-20 20:56:25 +02:00
einhornimmond
d7ae14a8d7
Merge branch 'master' into iota3_bootstrap_hello_welt 2023-06-18 19:17:22 +02:00
einhornimmond
85e081e271 linter fixes 2023-06-18 17:58:12 +02:00
einhornimmond
797f8bf74e remove old code 2023-06-18 17:49:27 +02:00
einhornimmond
778664b7de increase coverage, replace null with undefined, try and catch on iota connection 2023-06-18 17:48:25 +02:00
einhornimmond
9d773fcd5a install rust build tools in base container, remove it in production container 2023-06-17 14:53:59 +02:00
einhornimmond
a128585123 refactor code and tests to as response to review 2023-06-17 12:07:49 +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