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
7,991 Commits 1 Branch 0 Tags
Commit Graph

7991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
27ad1d2e22 transaction list model contains balance, user balance resolver to create transacton list result 2022-03-29 01:54:13 +02:00
Ulf Gebhardt
30e2556384
Merge branch 'master' into fixes_stage1 2022-03-29 01:36:47 +02:00
Moriz Wahl
dc30315311 change resolved object to new schema 2022-03-29 01:31:23 +02:00
Moriz Wahl
03da5aa343 change transaction list query to new balance object 2022-03-29 01:29:08 +02:00
Moriz Wahl
e9e97549a7 rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails 2022-03-29 01:12:07 +02:00
Moriz Wahl
d584651fc1 rename right to GDT_BALANCE 2022-03-29 01:11:25 +02:00
Moriz Wahl
a26aaae71a Merge branch 'master' into refactor-balance-resolver 2022-03-29 01:03:52 +02:00
Moriz Wahl
9eda41b24a Merge branch 'optin-valid-time' into show-valid-time-of-link-in-email 2022-03-29 00:59:47 +02:00
Moriz Wahl
37e36e01af do not remove optin code in DB after email verification 2022-03-29 00:51:44 +02:00
Moriz Wahl
cb90249301 rename function, add parameter for optinType, sort by updatedAt DESC 2022-03-29 00:50:50 +02:00
Moriz Wahl
3128ede829
Merge branch 'master' into optin-valid-time 2022-03-29 00:34:04 +02:00
Alexander Friedland
d5b57dcf1c
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-28 18:00:25 +02:00
Moriz Wahl
4637caac10 Test TransactionLinkList 2022-03-28 15:17:25 +02:00
Alexander Friedland
50806d9505
Merge pull request #1680 from gradido/1594-Show-transaction-was-created-by-link 
1594 show transaction was created by link
 2022-03-28 14:01:57 +02:00
Ulf Gebhardt
6fa62c1958
Merge branch 'master' into fixes_stage1 2022-03-28 13:52:52 +02:00
Alexander Friedland
453d23a7c9
Merge branch 'master' into 1594-Show-transaction-was-created-by-link 2022-03-28 13:52:38 +02:00
Alexander Friedland
193e085439
sorting properties 2022-03-28 13:51:24 +02:00
Moriz Wahl
f20b8e8f75
Merge pull request #1675 from gradido/increase-max-memo-length 
refactor: Memo Text Length to 255 Characters
 2022-03-28 13:50:22 +02:00
Alexander Friedland
640923dd50
sorting properties 2022-03-28 13:47:45 +02:00
Alexander Friedland
666f176b35
remove comma from via link 2022-03-28 13:46:34 +02:00
Alexander Friedland
3f7d9e73b3
remove comma from via link 2022-03-28 13:45:11 +02:00
Ulf Gebhardt
ecc3adbdd0
fix git command git fetch --all in startscript. It doesnt take remote repository as parameter 2022-03-28 10:26:55 +02:00
Ulf Gebhardt
33a3deec60
since the server changes to summertime by default, we need to ensure to set UTC timezone 2022-03-28 10:26:26 +02:00
Ulf Gebhardt
9235fab929
missing config versions for frontend and admin in deployscript 2022-03-28 10:25:57 +02:00
Alexander Friedland
ea7f6345c0
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-03-26 22:54:14 +01:00
ogerly
6b5288ca8f change, via_link text outer link 2022-03-26 16:58:50 +01:00
ogerly
4909254a02 remove comma in text 2022-03-26 09:39:46 +01:00
ogerly
543b389f8c add comma on via_link 2022-03-26 09:39:14 +01:00
ogerly
871a8ed14d add props transactionLinkId in TransactionSend 2022-03-26 09:36:48 +01:00
ogerly
f9cc754ca0 add props transactionLinkId in TransactionReceive 2022-03-26 09:36:35 +01:00
ogerly
eecab9248d add link icon and locales via_link if redeemed 2022-03-26 09:35:29 +01:00
ogerly
bcfc60150b remove linkk icon if redeemed 2022-03-26 09:34:53 +01:00
ogerly
184b948916 add locales via_link 2022-03-26 09:33:48 +01:00
ogerly
1235673c3b add test for OpenCreationsTable.spec.js 2022-03-26 08:46:02 +01:00
ogerly
1de52a94b8 deleted unused locales 2022-03-26 07:22:48 +01:00
Alexander Friedland
a6531f0653
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-03-26 06:57:35 +01:00
Ulf Gebhardt
f9a56a3e37
fix UserSearch.spec.js 2022-03-26 01:18:28 +01:00
Ulf Gebhardt
9a0004d1a3
fix Creation.spec.js 2022-03-26 01:17:05 +01:00
ogerly
5c099cd01f add props transactionLinkId 2022-03-25 21:49:35 +01:00
ogerly
fe2d1caa10 add icon if transactionLinkId on transaction 2022-03-25 21:48:47 +01:00
ogerly
095dffc7e6 add locales redeemed-title 2022-03-25 21:47:16 +01:00
ogerly
62831a71df add transactionLinkId on query 2022-03-25 21:46:38 +01:00
Alexander Friedland
aba237db54
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-25 20:45:55 +01:00
ogerly
a445693f93 change date query for expired status 2022-03-25 20:42:40 +01:00
ogerly
b633544f89 yarn lint --fix 2022-03-25 20:40:04 +01:00
ogerly
0117a13c8d add status for expired 2022-03-25 20:39:28 +01:00
ogerly
3ff7cc494a add locales for expired 2022-03-25 20:39:12 +01:00
ogerly
6d3a58d18c rename spec from CreationTransactionListFormular to CreationTransactionList 2022-03-25 20:29:36 +01:00
ogerly
2e904e3696 yarn locales --fix 2022-03-25 20:27:08 +01:00
ogerly
c7025831e8 yarn lint --fix 2022-03-25 20:26:45 +01:00