272 Commits

Author SHA1 Message Date
Moriz Wahl
6f8da4202a
Merge branch 'master' into refactor-balance-model 2022-04-20 12:01:55 +02:00
Moriz Wahl
1b0f53ca64
Merge branch 'master' into refactor-balance-model 2022-04-19 11:10:24 +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
ogerly
26fd677098 resolve conflict 2022-04-14 09:49:08 +02:00
Moriz Wahl
034fa5e7a9 add math minus, add minus operator if decay is zero 2022-04-12 23:09:40 +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
ogerly
6a6edfde62 change text links_sum in locales 2022-04-10 20:03:53 +02:00
ogerly
5206dacf01 yarn locales fixx 2022-04-10 12:24:40 +02:00
ogerly
73af0574a4 new locales added: gdd_per_link.isFree 2022-04-10 12:23:56 +02:00
ogerly
7a3b73580f git fix yarn locales 2022-04-10 10:33:52 +02:00
ogerly
bfd8f202e3 add gdt.gdt locales 2022-04-10 10:29:47 +02:00
Moriz Wahl
e942cd2069 remove unused locale due to deletion of pagination component 2022-04-05 14:35:35 +02:00
Alexander Friedland
035d10753e
Merge branch 'master' into 1727-Change-button-text-and-observe-spelling 2022-04-04 13:33:37 +02:00
ogerly
00bb4a1abc fixed yarn lint 2022-04-03 11:57:54 +02:00
ogerly
a0bdecbe1a change text button 2022-04-03 11:56:49 +02:00
ogerly
307f1092d5 text for toast expand link copied 2022-04-03 11:03:01 +02:00
Moriz Wahl
ef3420ef2e add standerd error message on fail for forgot password API call 2022-03-30 18:33:26 +02:00
Alexander Friedland
d5b57dcf1c
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-28 18:00:25 +02:00
Alexander Friedland
666f176b35
remove comma from via link 2022-03-28 13:46:34 +02:00
ogerly
543b389f8c add comma on via_link 2022-03-26 09:39:14 +01:00
ogerly
184b948916 add locales via_link 2022-03-26 09:33:48 +01:00
ogerly
1de52a94b8 deleted unused locales 2022-03-26 07:22:48 +01:00
ogerly
095dffc7e6 add locales redeemed-title 2022-03-25 21:47:16 +01:00
ogerly
ea99db0159 yarn lint and locales fixed 2022-03-21 14:50:50 +01:00
ogerly
b68fab72cc review from ulf and hannes 2022-03-21 14:02:04 +01:00
Alexander Friedland
be319ba5e4
Update frontend/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 13:50:17 +01:00
Alexander Friedland
07bf90e483
Update frontend/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-03-21 13:49:19 +01:00
Alexander Friedland
8bbe9401b0
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 13:08:48 +01:00
c83959fc58
Merge branch 'master' into 1319-email-optin 2022-03-21 12:30:57 +01:00
ogerly
9c668f3934 changed review from moriz 2022-03-21 08:18:47 +01:00
ogerly
d3352ff0bf add successfully-redeemed 2022-03-20 11:34:41 +01:00
ogerly
668d4f05e0 yarn locales && lint --fix 2022-03-18 19:25:12 +01:00
ogerly
13afe6bbbc add locales for transaction link info 2022-03-18 19:18:22 +01:00
ogerly
63d9e9ab94 yarn locales --fix 2022-03-18 11:19:18 +01:00
ogerly
74d6096255 delete unused keys from locales 2022-03-18 11:19:18 +01:00
ogerly
37d7c9bf53 add show textbox for deleted link and redeemed link 2022-03-18 11:19:18 +01:00
ogerly
e1f67df794 add redeem modal and start function redeemLink() 2022-03-18 11:19:18 +01:00
ogerly
6be14e83b7 add no redeem - You can't redeem your own link! 2022-03-18 11:19:18 +01:00
ogerly
5dc1d1e67c add id to query queryTransactionLink, add locales for redeem amount, check auth 2022-03-18 11:19:18 +01:00
e2bba25679
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-17 23:03:30 +01:00
Alexander Friedland
6b2cd9716d
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-17 16:48:49 +01:00
Alexander Friedland
85513f40f1
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-17 16:48:14 +01:00
ogerly
d046dbc7a6 add locales for transaction link information 2022-03-17 14:20:53 +01:00
ogerly
abcaad7207 delete unused keys in locales 2022-03-16 21:16:33 +01:00
Alexander Friedland
3ada62d20f
Merge branch 'master' into 1588-frontend-expendable-paginated-link-list 2022-03-16 20:57:03 +01:00
ogerly
f28b006732 change link-reload to link-load 2022-03-16 18:19:24 +01:00
ogerly
8fbbf90938 yarn locales --fix 2022-03-16 12:09:26 +01:00
ogerly
4c55f2dc13 add locales in CollapseLinksList.vue 2022-03-16 12:09:26 +01:00
ogerly
798a75e923 add locales in TransactionLink.vue 2022-03-16 12:09:26 +01:00