10160 Commits

Author SHA1 Message Date
Moriz Wahl
edaafa0e32 remove seed from database 2022-04-19 08:44:34 +02:00
Moriz Wahl
242f45ee54 seed in backend on deploy 2022-04-19 08:41:58 +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
Claus-Peter Hübner
3dbb406d7c add details about stage-1 and stage-2, still ongoing 2022-04-15 20:33:07 +02:00
Claus-Peter Hübner
62e3eabef9 more details, but still ongoing 2022-04-15 16:27:08 +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
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