Moriz Wahl
|
6f8da4202a
|
Merge branch 'master' into refactor-balance-model
|
2022-04-20 12:01:55 +02:00 |
|
Alexander Friedland
|
897c39c85c
|
Merge pull request #1752 from gradido/1751-Make-GTT-visible-only-if-explicitly-clicked
1751 make gdt visible only if explicitly clicked
|
2022-04-19 15:31:50 +02:00 |
|
|
|
7647a0dccc
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-19 15:13:14 +02:00 |
|
ogerly
|
2ddf9cb33b
|
fixed GdtBalance in tab visible
|
2022-04-19 15:08:53 +02:00 |
|
Alexander Friedland
|
c1820983e9
|
Merge pull request #1744 from gradido/1668-Admin-make-User-Details-tabbed
add Tab system from bootstrap in SearchUserTable Userdata
|
2022-04-19 14:46:07 +02:00 |
|
ogerly
|
119b8a84c9
|
fixed review requests
|
2022-04-19 13:53:14 +02:00 |
|
Alexander Friedland
|
9a80bc54c8
|
Merge branch 'master' into 1668-Admin-make-User-Details-tabbed
|
2022-04-19 13:52:19 +02:00 |
|
Moriz Wahl
|
a2a2e493f0
|
Merge branch 'master' into refactor-balance-model
|
2022-04-19 13:36:26 +02:00 |
|
Alexander Friedland
|
1f6971d2b7
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-19 13:34:28 +02:00 |
|
|
|
111b32cb11
|
Merge pull request #1789 from gradido/certbot_troubleshoot
Fix: Certbot renewal
|
2022-04-19 13:00:31 +02:00 |
|
|
|
f1d559c743
|
Merge branch 'master' into certbot_troubleshoot
|
2022-04-19 12:52:51 +02:00 |
|
ogerly
|
7cae264f13
|
fixed test updateGdt on click on tab
|
2022-04-19 12:25:09 +02:00 |
|
Moriz Wahl
|
1b0f53ca64
|
Merge branch 'master' into refactor-balance-model
|
2022-04-19 11:10:24 +02:00 |
|
Wolfgang Huß
|
70362ace2a
|
Merge pull request #1765 from gradido/1734-emails-get-wallet-link
🍰 Add Wallet Link To Mails
|
2022-04-19 11:10:08 +02:00 |
|
Wolfgang Huß
|
d0215f2885
|
Update backend/src/mailer/text/transactionReceived.ts
- Follow Ulf's suggestion.
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-04-19 10:03:56 +02:00 |
|
Moriz Wahl
|
6d2033abd2
|
no interface
|
2022-04-19 08:36:38 +02:00 |
|
|
|
7b4d801652
|
some typo
|
2022-04-18 14:29:26 +02:00 |
|
|
|
928e0ae372
|
describe how to debug certbot trouble and reconnect an existing certificate with nginx config
|
2022-04-18 14:26:46 +02:00 |
|
ogerly
|
17f8a47f7f
|
add ref in childComponent and refs on click tab
|
2022-04-15 07:47:39 +02:00 |
|
ogerly
|
dfc4a7ddde
|
remove mounted
|
2022-04-15 07:47:39 +02:00 |
|
Alexander Friedland
|
06cd75e8dd
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-15 07:47:26 +02:00 |
|
Wolfgang Huß
|
942e39534b
|
Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link
|
2022-04-14 15:16:36 +02:00 |
|
ogerly
|
59cca07681
|
fixed yarn lint
|
2022-04-14 14:26:29 +02:00 |
|
Wolfgang Huß
|
8205e88b2f
|
Comply Ulf's suggestions
|
2022-04-14 14:19:40 +02:00 |
|
ogerly
|
8b8b28c188
|
add deleteAt status on transaction-lik list
|
2022-04-14 13:53:22 +02:00 |
|
Alexander Friedland
|
b7f40a1a54
|
Merge branch 'master' into 1668-Admin-make-User-Details-tabbed
|
2022-04-14 13:43:45 +02:00 |
|
ogerly
|
b1ccf1bf14
|
add locales for tabs in userdatas adminarea
|
2022-04-14 12:37:40 +02:00 |
|
Alexander Friedland
|
f0236fdb93
|
Merge pull request #1661 from gradido/1633-Display-QR-Code-on-link-in-transaction-list
1633 display qr code on link in transaction list
|
2022-04-14 11:56:34 +02:00 |
|
Alexander Friedland
|
5e7e8fcb9b
|
Delete gdd-coin-sw.png
|
2022-04-14 11:46:51 +02:00 |
|
Alexander Friedland
|
672496499c
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-14 11:22:27 +02:00 |
|
Alexander Friedland
|
c4fd4bff63
|
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-04-14 10:17:25 +02:00 |
|
Alexander Friedland
|
747df97249
|
Merge pull request #1756 from gradido/1755-insert-additional-set-when-redeeming
1755 insert additional text when redeeming
|
2022-04-14 10:16:49 +02:00 |
|
ogerly
|
26fd677098
|
resolve conflict
|
2022-04-14 09:49:08 +02:00 |
|
ogerly
|
703a46779d
|
change qr-code image to color variant
|
2022-04-14 09:40:35 +02:00 |
|
Alexander Friedland
|
4098f030ff
|
delete video
das sollte hier eigentlichnicht sein. sorry
|
2022-04-13 13:32:59 +02:00 |
|
Wolfgang Huß
|
ad0f3a8be4
|
Add test for existence of e-mail link to overview page
|
2022-04-13 10:36:39 +02:00 |
|
Wolfgang Huß
|
f94dc967c0
|
Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link
# Conflicts:
# backend/src/graphql/resolver/TransactionResolver.ts
|
2022-04-13 10:26:49 +02:00 |
|
ogerly
|
9a0e2aca5b
|
Merge branch '1763-remove-qr-code-from-profile-remove-unused-libraries' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-04-13 09:25:09 +02:00 |
|
ogerly
|
644369e367
|
merge 1763-remove-qr-code-from-profile-remove-unused-libraries
|
2022-04-13 09:23:55 +02:00 |
|
ogerly
|
3f7a0d901e
|
remove unused package vue-qrcode
|
2022-04-13 09:23:55 +02:00 |
|
ogerly
|
7bdaa4256f
|
add new image coin - black white
|
2022-04-13 09:23:55 +02:00 |
|
Alexander Friedland
|
934b5a2715
|
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-04-13 07:31:08 +02:00 |
|
Moriz Wahl
|
034fa5e7a9
|
add math minus, add minus operator if decay is zero
|
2022-04-12 23:09:40 +02:00 |
|
Moriz Wahl
|
55ff0ee964
|
add roundedDecay field to Decay Model. This is used to calibrate the decay since the last transaction
|
2022-04-12 22:52:51 +02:00 |
|
Moriz Wahl
|
0bcf2cbd8c
|
use interface for decay constructor
|
2022-04-12 21:43:18 +02:00 |
|
Moriz Wahl
|
a6e7036339
|
remove unused fields from balance model
|
2022-04-12 21:34:33 +02:00 |
|
Moriz Wahl
|
997ef9d72a
|
query only required fields on balance
|
2022-04-12 21:34:04 +02:00 |
|
Moriz Wahl
|
9a29652a12
|
remove unused data
|
2022-04-12 21:27:41 +02:00 |
|
Alexander Friedland
|
fcb3250b63
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-12 20:53:20 +02:00 |
|
Alexander Friedland
|
979a48e438
|
Merge branch 'master' into 1755-insert-additional-set-when-redeeming
|
2022-04-12 20:48:28 +02:00 |
|
