2327 Commits

Author SHA1 Message Date
Alexander Friedland
c4fd4bff63
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-14 10:17:25 +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
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
9332eeff36
Merge branch 'master' into frontend_decay_start_block_as_static 2022-04-12 19:06:04 +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
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
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
ogerly
6a6edfde62 change text links_sum in locales 2022-04-10 20:03:53 +02:00
ogerly
fc049a14ac fix test for cancel delete link 2022-04-10 14:59:39 +02:00
ogerly
50be004ce4 add jest.fn((d) 2022-04-10 14:47:43 +02:00
ogerly
2e37b81abc fix style lint 2022-04-10 13:32:46 +02:00
ogerly
94382d9834 better date format for reddem valid date 2022-04-10 12:51:05 +02:00
ogerly
3101719c67 fix yarn lint 2022-04-10 12:30:50 +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
8a621ec7ce add insert shadow in summary links transaction type 2022-04-10 12:09:02 +02:00
ogerly
dd04640497 tests for QrCode/FigureQrCode 2022-04-10 09:40:55 +02:00
ogerly
22aeb06f97 tests for TransactionLink 2022-04-10 09:40:12 +02:00
ogerly
43863e21fc add qrcanvas-vue@2.1.1 for vue2 2022-04-10 09:39:02 +02:00
ogerly
da288eaeed position button on link list 2022-04-09 11:36:23 +02:00
ogerly
f76c4ac5c0 change lib for qr code, add logo 2022-04-09 11:02:21 +02:00
ab7b2a7028
test for correct startblock date in frontend 2022-04-07 13:06:47 +02:00
d5d90c7050
remove decayStartBlock from all component interfaces 2022-04-06 15:24:17 +02:00
3582805098
reference config decay start time when figuring out if its the decay start block 2022-04-06 15:23:47 +02:00
ebb6c926d8
define decay start block in config statically 2022-04-06 15:22:57 +02:00
Alexander Friedland
08ff60f55b
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-05 15:28:22 +02:00
Moriz Wahl
6a5ad7e6b5 Merge branch '503-Transaction-List-Pagination-Pages-clickable' of github.com:gradido/gradido into 503-Transaction-List-Pagination-Pages-clickable 2022-04-05 14:35:46 +02:00
Moriz Wahl
e942cd2069 remove unused locale due to deletion of pagination component 2022-04-05 14:35:35 +02:00
Alexander Friedland
e819c1868d
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-04-05 13:50:46 +02:00
Moriz Wahl
ddeb936634 remove unused pagination component 2022-04-05 13:30:06 +02:00
Moriz Wahl
f8412acb5e improve tests 2022-04-05 13:27:43 +02:00
Moriz Wahl
a6b5dddc61 email is restored after clicking back from transaction confirmation 2022-04-05 13:01:33 +02:00
Alexander Friedland
fd5dca7eba
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-05 09:43:18 +02:00
Alexander Friedland
066f898805
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-04-05 09:43:09 +02:00
Alexander Friedland
13de1d07e0
Merge branch 'master' into 1706-After-unsuccessful-sending-email-is-cleared 2022-04-04 22:58:12 +02:00
Alexander Friedland
51d4e855b4
Merge branch 'master' into 1727-Change-button-text-and-observe-spelling 2022-04-04 22:41:19 +02:00