3331 Commits

Author	SHA1	Message	Date
ogerly	f6c64af047	resolve conflict unused computed link()	2022-04-22 11:59:06 +02:00
Alexander Friedland	8748abf4f0	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:43:30 +02:00
Alexander Friedland	8df93df392	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:42:23 +02:00
Alexander Friedland	e4214bc193	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:41:10 +02:00
Alexander Friedland	720f90f4b2	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:40:40 +02:00
Alexander Friedland	a54ad7cef4	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:40:25 +02:00
Alexander Friedland	df958f0be8	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:38:10 +02:00
Alexander Friedland	158ca4abec	Update frontend/src/components/TransactionLinks/TransactionLink.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-22 11:37:52 +02:00
Alexander Friedland	17a96a5c6f	Merge branch 'master' into 1813-QR-Code-Popup	2022-04-22 11:34:04 +02:00
Alexander Friedland	e7147f7dad	Merge branch 'master' into 1812-Put-QR-Code-into-Popup-on-generate	2022-04-22 11:33:18 +02:00
Alexander Friedland	b7e940e6c1	Merge branch 'master' into 1816-Expired-link-are-not-highlighted	2022-04-22 11:31:46 +02:00
Ulf Gebhardt	df819e91ea	Merge branch 'master' into fix-double-load-transaction-links	2022-04-21 23:24:54 +02:00
ogerly	76d2100c3c	add props validLink	2022-04-21 22:35:19 +02:00
ogerly	39517cdf52	add computed text()	2022-04-21 22:32:15 +02:00
ogerly	ff37c1af9d	add locales 'expiredOn'	2022-04-21 22:29:47 +02:00
ogerly	5943ceeb20	add locales 'qrCode'	2022-04-21 21:18:57 +02:00
ogerly	8d447ffaff	fixed test, validUntil and No validUntil	2022-04-21 21:16:29 +02:00
ogerly	afec1f7e59	remove button, add dropdown menü, change style	2022-04-21 21:15:40 +02:00
ogerly	459dc217b6	fixed yarn test	2022-04-21 18:08:05 +02:00
ogerly	6360509cad	fixed yarn lint	2022-04-21 18:05:04 +02:00
ogerly	475af6b5f1	remove unused code	2022-04-21 18:03:26 +02:00
ogerly	e9767fc3de	add qr code svg in button	2022-04-21 18:02:44 +02:00
ogerly	8972c05e8a	add emit 'showQrCodeButton'	2022-04-21 17:48:17 +02:00
ogerly	1823bc3611	add methods 'showQrCodeButton', add data 'showQrcode'	2022-04-21 17:47:55 +02:00
ogerly	b2623cc83e	add locales 'qrCode'	2022-04-21 17:46:43 +02:00
ogerly	0e8ca5b410	fixed yarn lint	2022-04-21 16:40:30 +02:00
ogerly	e154373694	add locales 'qrCode'	2022-04-21 16:39:19 +02:00
ogerly	bbec1306d0	change modal structure	2022-04-21 16:38:14 +02:00
Moriz Wahl	839d52748b	test reopening of transaction link details	2022-04-21 14:08:22 +02:00
Moriz Wahl	eb2b0e951e	reset transaction link arrays after click	2022-04-21 14:04:04 +02:00
Ulf Gebhardt	6da5348764	lint fix	2022-04-21 13:47:17 +02:00
Ulf Gebhardt	74c0e3826b	adjust test	2022-04-21 13:35:57 +02:00
Ulf Gebhardt	c6a4650866	remove code from trasnsactionLinkList query, adjusted test to have full URL in apollo mock	2022-04-21 13:34:47 +02:00
Ulf Gebhardt	d836fb5375	remove code from TransactionLink	2022-04-21 13:30:51 +02:00
Ulf Gebhardt	febe57ce13	remove code from graphql query, just use code	2022-04-21 13:28:21 +02:00
Ulf Gebhardt	f9efc3fa06	use link instead of url, do not use v-model, use value to not allow mutate prop	2022-04-21 13:22:52 +02:00
Ulf Gebhardt	19f2686b6e	Merge branch 'master' into 1637-generate-link-backend ... # Conflicts: # frontend/src/components/ClipboardCopy.vue # frontend/src/components/GddSend/TransactionResultLink.vue # frontend/src/components/TransactionLinks/TransactionLink.vue # frontend/src/components/Transactions/TransactionLinkSummary.spec.js	2022-04-21 13:14:52 +02:00
Wolfgang Huß	4f4d464b53	Fix unintentionally destroyed test	2022-04-21 10:19:39 +02:00
Wolfgang Huß	3f502ea37a	Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page ... # Conflicts: # frontend/src/pages/Login.spec.js # frontend/src/pages/Login.vue	2022-04-21 10:15:31 +02:00
Wolfgang Huß	d63303c75c	Refine error messages a bit more detailed	2022-04-21 10:02:48 +02:00
Wolfgang Huß	180d8b4e8d	Put faulty deleted toaster in ForgotPassword page back	2022-04-21 09:56:07 +02:00
Wolfgang Huß	f245a3703c	Refactor test for Login page	2022-04-21 09:51:47 +02:00
Wolfgang Huß	097d33fb97	Refactor Login page	2022-04-21 09:40:34 +02:00
Wolfgang Huß	13b5e02c24	Removed comment after Ulf's suggestion	2022-04-21 09:16:07 +02:00
Wolfgang Huß	3dddbabb99	Fix error after Ulf's hint	2022-04-21 09:09:54 +02:00
Wolfgang Huß	ef6b3c78df	Fix translation of ForgotPassword login button text	2022-04-21 08:46:57 +02:00
Wolfgang Huß	0e0b5aef09	Refactor Message props	2022-04-20 14:58:54 +02:00
Alexander Friedland	58d0cf21b5	Merge branch 'master' into 1731-Fix-Startblock-Layouting	2022-04-20 14:44:10 +02:00
Wolgang Huß	3e98657c1f	fixed tests for pagenation	2022-04-20 14:40:37 +02:00
Wolgang Huß	c0b56de91a	remove unused computed code	2022-04-20 14:40:37 +02:00