980 Commits

Author SHA1 Message Date
Alexander Friedland
dde695831a
Merge branch 'master' into 1816-Expired-link-are-not-highlighted 2022-04-22 13:08:28 +02:00
ogerly
f8e46cc1e1 remove another unused font-scale 1 2022-04-22 13:07:39 +02:00
ogerly
432e0c1e71 remove unused font-scale 1 2022-04-22 13:05:56 +02:00
ogerly
268289bc70 change button color 2022-04-22 12:59:55 +02:00
ogerly
d595c76d08 change props from text to link in FigureQrCode 2022-04-22 12:43:27 +02:00
ogerly
0361b99a11 fixed test validUntil to string 2022-04-22 12:17:43 +02:00
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
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
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
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
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
6da5348764
lint fix 2022-04-21 13:47:17 +02:00
c6a4650866
remove code from trasnsactionLinkList query, adjusted test to have full URL in apollo mock 2022-04-21 13:34:47 +02:00
d836fb5375
remove code from TransactionLink 2022-04-21 13:30:51 +02:00
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
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ß
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ß
097d33fb97 Refactor Login page 2022-04-21 09:40:34 +02:00
Wolfgang Huß
3dddbabb99 Fix error after Ulf's hint 2022-04-21 09:09:54 +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
Wolfgang Huß
95746a7324 Refactor Message tests 2022-04-20 13:31:50 +02:00
Moriz Wahl
7af7ee09e5
Merge branch 'master' into load-transaction-links-on-click 2022-04-20 13:11:27 +02:00
Wolfgang Huß
b65cd0fd03 Refactor PasswordForgotten site 2022-04-20 12:47:01 +02:00
Wolfgang Huß
29745204b2 Create Message component 2022-04-20 12:46:39 +02:00
Wolgang Huß
d6f25b6f98 all headings centre col 12, all b-row in offset 1 and col 11 2022-04-20 12:34:54 +02:00
Moriz Wahl
6f8da4202a
Merge branch 'master' into refactor-balance-model 2022-04-20 12:01:55 +02:00
Moriz Wahl
0b53cfa044 update test 2022-04-20 09:15:08 +02:00
Moriz Wahl
ff652fa72e load transaction link on click 2022-04-20 08:48:19 +02:00
ogerly
7cae264f13 fixed test updateGdt on click on tab 2022-04-19 12:25:09 +02:00