Wolfgang Huß
|
b65cd0fd03
|
Refactor PasswordForgotten site
|
2022-04-20 12:47:01 +02:00 |
|
Wolfgang Huß
|
29745204b2
|
Create Message component
|
2022-04-20 12:46:39 +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 |
|
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 |
|
Wolfgang Huß
|
8205e88b2f
|
Comply Ulf's suggestions
|
2022-04-14 14:19: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
|
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 |
|
Alexander Friedland
|
979a48e438
|
Merge branch 'master' into 1755-insert-additional-set-when-redeeming
|
2022-04-12 20:48:28 +02:00 |
|
Moriz Wahl
|
a9f64d2fd6
|
Merge pull request #1762 from gradido/define-context-object
refactor: Define Context Interface
|
2022-04-12 19:54:24 +02:00 |
|
Moriz Wahl
|
263d0ab812
|
Merge branch 'master' into define-context-object
|
2022-04-12 19:45:19 +02:00 |
|
Moriz Wahl
|
11193f29fa
|
Merge pull request #1742 from gradido/fix-elopage-status
fix: Elopage Status
|
2022-04-12 19:44:59 +02:00 |
|
Moriz Wahl
|
51a95132c4
|
Merge branch 'master' into fix-elopage-status
|
2022-04-12 19:33:51 +02:00 |
|
|
|
b1dd255d1e
|
Merge pull request #1749 from gradido/frontend_decay_start_block_as_static
Refactor: Frontend decay start block as static config value
|
2022-04-12 19:22:08 +02:00 |
|
|
|
9332eeff36
|
Merge branch 'master' into frontend_decay_start_block_as_static
|
2022-04-12 19:06:04 +02:00 |
|
Moriz Wahl
|
de6421201d
|
use getUser helper to get moderator form context
|
2022-04-12 19:04:29 +02:00 |
|
Moriz Wahl
|
4a71acab55
|
Merge branch 'master' into fix-elopage-status
|
2022-04-12 18:47:00 +02:00 |
|
Alexander Friedland
|
ffeddda436
|
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-04-12 16:25:42 +02:00 |
|
Alexander Friedland
|
f9440a15cf
|
Merge branch 'master' into 1755-insert-additional-set-when-redeeming
|
2022-04-12 16:24:19 +02:00 |
|
Alexander Friedland
|
e116172cba
|
Merge pull request #1758 from gradido/1757-to-locales-Still-valid-14-days
better date format for reddem valid date
|
2022-04-12 16:22:22 +02:00 |
|
Wolfgang Huß
|
35c5bf4c41
|
Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link
|
2022-04-12 15:40:33 +02:00 |
|
Wolfgang Huß
|
563afcbf2a
|
Add EMAIL_CLIENT_URI in config
- Increment config version.
- Correct usage of EMAIL_CLIENT_URI.
|
2022-04-12 15:36:05 +02:00 |
|
Alexander Friedland
|
cc50cc3a3e
|
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-04-12 15:12:49 +02:00 |
|
Alexander Friedland
|
0cb00cf446
|
Merge branch 'master' into 1755-insert-additional-set-when-redeeming
|
2022-04-12 15:11:49 +02:00 |
|
Alexander Friedland
|
ecb8fadb60
|
Merge branch 'master' into 1757-to-locales-Still-valid-14-days
|
2022-04-12 15:09:42 +02:00 |
|
Alexander Friedland
|
38b2b2b6c7
|
Merge pull request #1754 from gradido/1753-darker-background-summary-transaktion-links
add insert shadow in summary links transaction type
|
2022-04-12 15:07:51 +02:00 |
|
|
|
87aed30cfd
|
good catch
|
2022-04-12 14:57:46 +02:00 |
|
Wolfgang Huß
|
ea5589a840
|
Add wallet link to transaction mail, first approach
|
2022-04-12 12:18:04 +02:00 |
|
ogerly
|
4c75c79c14
|
remove package vue-qrcode
|
2022-04-12 09:18:30 +02:00 |
|
ogerly
|
de4931e1e0
|
avatar added with the first letters of the first and last name
|
2022-04-12 09:12:19 +02:00 |
|
ogerly
|
37aaf3bc63
|
remove package vue-qrcode from app & system
|
2022-04-12 08:50:25 +02:00 |
|
ogerly
|
ab76b05ba6
|
remove package qrcode from system
|
2022-04-12 08:44:18 +02:00 |
|
ogerly
|
04fb116ce9
|
remove QrCodeReader.vue & vue-qrcode-reader from system
|
2022-04-12 08:43:06 +02:00 |
|
Moriz Wahl
|
f752d8d045
|
type ExpressContext
|
2022-04-11 17:25:59 +02:00 |
|
Moriz Wahl
|
71d1701102
|
undo apollo log plugin hack
|
2022-04-11 16:31:21 +02:00 |
|
Moriz Wahl
|
902dce6390
|
Context interface in balance resolver
|
2022-04-11 16:24:38 +02:00 |
|
Moriz Wahl
|
d7bec83d25
|
use Context interface in Transaction resolver
|
2022-04-11 16:22:32 +02:00 |
|
Moriz Wahl
|
00bba07b11
|
define hack to pass already queried data to balance resolver
|
2022-04-11 16:22:09 +02:00 |
|
