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

6840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
cc596df22a
validate valitity of userpassword when updating it via updateUserInfos 2022-03-07 13:31:33 +01:00
Ulf Gebhardt
3e3b5871a4
Merge branch 'master' into 1170_Send_new_Users_Gradido 2022-03-07 13:14:08 +01:00
ogerly
7c37c345a1 pull origin 2022-03-06 18:59:11 +01:00
Alexander Friedland
132de9d00f
Update frontend/src/components/DecayInformations/DecayInformation-Short.vue 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-03-06 18:33:06 +01:00
Alexander Friedland
b1d6f36025
Update frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-03-06 18:32:52 +01:00
ogerly
ea00ab94d2 change 'Koordinierte Weltzeit', 'Coordinated Universal Time' 2022-03-06 12:28:00 +01:00
ogerly
5ecd9a9bac yarn locales --fix 2022-03-06 12:08:39 +01:00
ogerly
ca46f3f6a5 add locales for transactionlist.balanceDate 2022-03-06 12:08:13 +01:00
ogerly
8618d7894e yarn test fixed 2022-03-06 12:00:38 +01:00
ogerly
25b1a5a83e admin area creation transaction list 2022-03-06 11:52:29 +01:00
ogerly
9c6a3c2b08 yarn test fixed for frontend 2022-03-06 10:59:18 +01:00
Ulf Gebhardt
f1c4e847fe
fix previous database field definition 2022-03-06 10:52:13 +01:00
Ulf Gebhardt
433000e536
allow sending to user without transactions 2022-03-06 10:50:14 +01:00
ogerly
68df42baa2 decay startblock insert, set position center 2022-03-06 10:49:07 +01:00
ogerly
7061bdd358 add page DecayInformation-Decay.vue, minus sign inserted 2022-03-06 10:17:06 +01:00
Ulf Gebhardt
cf0710d324
changes required to have things running 2022-03-05 13:04:03 +01:00
Ulf Gebhardt
bc81a9a40f
missign change for startBlock implementation 
# Conflicts:
#	frontend/src/components/Transactions/TransactionCreation.vue
#	frontend/src/components/Transactions/TransactionReceive.vue
#	frontend/src/components/Transactions/TransactionSend.vue
 2022-03-05 13:03:49 +01:00
Ulf Gebhardt
0ec7caac42
fix frontend 2022-03-05 12:56:16 +01:00
Ulf Gebhardt
552005e2a4
fixed database error 2022-03-05 12:43:44 +01:00
ogerly
48ab9f695f change review from ulf gebhardt 2022-03-05 10:08:44 +01:00
ogerly
807757268c change test TZ=UTC jest --coverage 2022-03-04 16:59:28 +01:00
ogerly
05d53261ad merge refactor_arithmetic_transactionlist 
refactor_arithmetic_transactionlist_adminarea
 2022-03-04 16:22:27 +01:00
ogerly
231602676c yarn test fixed 2022-03-04 16:09:03 +01:00
ogerly
e39502c070 yarn lint --fix 2022-03-04 15:51:43 +01:00
Ulf Gebhardt
103f727798
Merge branch 'master' into test-login-user-resolver 2022-03-04 15:50:23 +01:00
ogerly
2bea864caa remove console.log 2022-03-04 15:42:54 +01:00
ogerly
ed85248289 undo changes 2022-03-04 15:38:48 +01:00
ogerly
c728b13f43 undo changes 2022-03-04 15:33:49 +01:00
Ulf Gebhardt
22c65aa929
renamed TypeId to TransactiontypeId 
fixed admin creation (backend part)
 2022-03-04 15:12:51 +01:00
Ulf Gebhardt
ae4ad937aa
fix transaction type id - too much change 2022-03-04 14:50:20 +01:00
Ulf Gebhardt
91fda4c097
Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea 2022-03-04 14:43:39 +01:00
Alexander Friedland
b9584310b4
Merge branch 'master' into refactor_arithmetic_transactionlist 2022-03-04 14:41:26 +01:00
Ulf Gebhardt
e0490827c7
Merge pull request #1539 from gradido/refactor_arithmetic 
Refactor: arithmetic and data types
 2022-03-04 14:40:20 +01:00
Ulf Gebhardt
6b6cb43247
fix decay start block info 2022-03-04 14:31:08 +01:00
Moriz Wahl
0759289a05
Merge branch 'master' into refactor_arithmetic 2022-03-04 14:27:20 +01:00
Moriz Wahl
b6618d1ffa fix transaction seed 2022-03-04 14:11:18 +01:00
Moriz Wahl
dc72add7cd
Merge pull request #1547 from gradido/bv-toaster-admin-interface 
refactor: Bootstrap Vue Toast in Admin interface
 2022-03-04 13:53:52 +01:00
ogerly
970592d00b
merge master, change tests, change operators 2022-03-04 13:40:22 +01:00
Alexander Friedland
6d17786c59
Merge branch 'master' into refactor_arithmetic_transactionlist 2022-03-04 13:40:22 +01:00
Ulf Gebhardt
1840878513
write negative values in database when sending GDD 2022-03-04 13:39:23 +01:00
Ulf Gebhardt
8429d884c8
fix test 2022-03-04 13:10:55 +01:00
Ulf Gebhardt
ca3c07b0d8
use forEach instead of for loop in transactions, 
simplified code
 2022-03-04 12:51:30 +01:00
Ulf Gebhardt
e69437cb9f
include decay in balance 2022-03-04 12:48:38 +01:00
Ulf Gebhardt
2ef0fd18fc
fix involvedUserIds calculation 2022-03-04 12:44:09 +01:00
Ulf Gebhardt
29b1d44cdd
implement KISS on transaction list length - first page contains 26 instead of 25 transactions now due to virtual decay transaction 2022-03-04 12:41:10 +01:00
Ulf Gebhardt
3af5ee13b9
properly return a result when querying an empty transaction list 2022-03-04 12:38:17 +01:00
Ulf Gebhardt
1f0886585e
decay duration now is an integer 2022-03-04 12:34:04 +01:00
Ulf Gebhardt
008331d43f
renamed lastUserTransaction to lastTransaction 2022-03-04 12:32:05 +01:00
Alexander Friedland
2030da653e
Merge branch 'master' into test-login-user-resolver 2022-03-04 12:31:44 +01:00
Ulf Gebhardt
cd6b2f18f8
no float for the duration, just an integer 2022-03-04 12:30:24 +01:00