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 |
|
ogerly
|
53d524c7f5
|
style work to end
|
2022-04-14 09:26:29 +02:00 |
|
ogerly
|
18c36ea0a4
|
add font WorkSans in App
|
2022-04-14 09:26:06 +02:00 |
|
ogerly
|
f15faeb37c
|
add locales followUs
|
2022-04-14 09:18:46 +02:00 |
|
ogerly
|
13b9d87100
|
add footer component for AuthArea
|
2022-04-14 09:17:46 +02:00 |
|
ogerly
|
512637a407
|
add new font WorkSans
|
2022-04-14 09:17:03 +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 |
|
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 |
|
ogerly
|
fb8fed7cc5
|
fix yarn lint
|
2022-04-12 16:54:37 +02:00 |
|
Alexander Friedland
|
ef9f1c7d38
|
Merge branch 'master' into 1668-Admin-make-User-Details-tabbed
|
2022-04-12 16:27:59 +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
|
f2906dad9b
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-12 16:24:54 +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 |
|
ogerly
|
7224fd7cf7
|
resolve conflict
|
2022-04-12 16:21:26 +02:00 |
|
ogerly
|
841cf2514f
|
resolve conflict
|
2022-04-12 16:19:40 +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
|
f625681c51
|
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked
|
2022-04-12 15:21:54 +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 |
|
