IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,136 Commits 1 Branch 0 Tags
Commit Graph

8136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
53a192c25b
Merge branch 'master' into 1816-Expired-link-are-not-highlighted 2022-04-22 15:17:17 +02:00
Ulf Gebhardt
4de4451ee2
Merge pull request #1817 from gradido/federation_image 
Docu: Federation image
 2022-04-22 13:29:39 +02:00
Ulf Gebhardt
d3957ae527
Merge branch 'master' into federation_image 2022-04-22 13:18:25 +02:00
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
Alexander Friedland
17ba05eecf
Merge pull request #1819 from gradido/1813-QR-Code-Popup 
1813 qr code popup
 2022-04-22 13:02:50 +02:00
Alexander Friedland
c28b4eabbb
Merge branch 'master' into 1813-QR-Code-Popup 2022-04-22 12:44:30 +02:00
clauspeterhuebner
7614e768fa
Merge pull request #1822 from gradido/fix_windows_cross-env 
Fix: cross-env for windows
 2022-04-22 12:18:44 +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
b7e940e6c1
Merge branch 'master' into 1816-Expired-link-are-not-highlighted 2022-04-22 11:31:46 +02:00
Alexander Friedland
730a6004d7
Merge branch 'master' into fix_windows_cross-env 2022-04-22 11:28:26 +02:00
Moriz Wahl
af97673891
Merge branch 'master' into federation_image 2022-04-22 11:18:41 +02:00
Moriz Wahl
d7801ba342
Merge pull request #1818 from gradido/fix-double-load-transaction-links 
fix: Double Load Transaction Links
 2022-04-22 11:17:39 +02:00
Claus-Peter Hübner
7d1f97ea0b cross-env for database 2022-04-22 02:34:17 +02:00
Claus-Peter Hübner
993362b77f missing change 2022-04-22 02:32:57 +02:00
Claus-Peter Hübner
b8ef1cdd04 cross-env for admin 2022-04-22 02:30:23 +02:00
Claus-Peter Hübner
41260a5898 cross-env for frontend 2022-04-22 02:28:36 +02:00
Claus-Peter Hübner
061b27eaa3 fix cross-env for windows 2022-04-22 02:16:44 +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
Ulf Gebhardt
cbe0b9a8c2
Merge pull request #1745 from gradido/1637-generate-link-backend 
Generated link in backend should also give back the base url
 2022-04-21 21:34:34 +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
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
39775868ee
federation image created for federation planning 2022-04-21 13:41:55 +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
00e03af7f3
increase backend config version v6 2022-04-21 13:19:01 +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