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

6686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
c8977ea749
Merge branch 'master' into fix_validate_password_update_user_infos 2022-03-07 16:09:24 +01:00
Ulf Gebhardt
ec6ed74cb9
Merge pull request #1549 from gradido/fix_send_to_use_without_transactions 
Fix: Allow sending to user without transactions
 2022-03-07 16:08:59 +01:00
Hannes Heine
fb2945df71
Merge branch 'master' into fix_validate_password_update_user_infos 2022-03-07 16:01:59 +01:00
Ulf Gebhardt
5cae087a26
Merge branch 'master' into fix_send_to_use_without_transactions 2022-03-07 16:00:27 +01:00
Ulf Gebhardt
388f054e54
Merge pull request #1569 from gradido/fix_balance_type 
Fix: Balance type
 2022-03-07 15:49:08 +01:00
Ulf Gebhardt
4773de6a34
fix balance type 2022-03-07 15:36:22 +01:00
Ulf Gebhardt
cc596df22a
validate valitity of userpassword when updating it via updateUserInfos 2022-03-07 13:31:33 +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
Ulf Gebhardt
e0490827c7
Merge pull request #1539 from gradido/refactor_arithmetic 
Refactor: arithmetic and data types
 2022-03-04 14:40:20 +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
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
Ulf Gebhardt
cd6b2f18f8
no float for the duration, just an integer 2022-03-04 12:30:24 +01:00
Ulf Gebhardt
0094ee3bbc
removed unnecessary lint ignores 2022-03-04 12:28:03 +01:00
Ulf Gebhardt
a587cd800a
balance decayDate as Date 2022-03-04 12:25:42 +01:00
Moriz Wahl
67861c32e4 Merge branch 'bv-toaster-admin-interface' of github.com:gradido/gradido into bv-toaster-admin-interface 2022-03-03 20:28:12 +01:00
Moriz Wahl
5ec86bb053 fix typo in describe 2022-03-03 20:28:00 +01:00
Moriz Wahl
805b251163
Merge branch 'master' into bv-toaster-admin-interface 2022-03-03 20:24:35 +01:00
Moriz Wahl
2e53cfea0d add event to toast failed creation emails after model update 2022-03-03 20:24:01 +01:00
Moriz Wahl
f7015ea11f move success toast after user delete/recover in UserSearch page 2022-03-03 20:01:57 +01:00
Moriz Wahl
f41354f123 use portal vue 2022-03-03 19:44:50 +01:00
Ulf Gebhardt
850060d057
Merge branch 'master' into refactor_arithmetic 2022-03-03 17:25:57 +01:00
Ulf Gebhardt
7d72a47f70
Merge pull request #1531 from gradido/combine_transaction_tables2 
Refactor: Combine transaction tables and restructure transaction design
 2022-03-03 17:25:04 +01:00
Moriz Wahl
c663843758 type_id in raw sql query 2022-03-03 16:54:34 +01:00
Moriz Wahl
5be959a584 localize error for fail on create pending creation 2022-03-03 13:04:02 +01:00
Moriz Wahl
950d0181a0 fix locales 2022-03-03 12:50:53 +01:00
Moriz Wahl
f887781c54 remove vue-toasted package 2022-03-03 12:43:45 +01:00
Moriz Wahl
1d31b00622 bv toast in user search page 2022-03-03 12:40:46 +01:00
Moriz Wahl
16501a7488 bv toast in creation confirm page 2022-03-03 12:36:57 +01:00
Moriz Wahl
b8f4980bda bv toast in creation page 2022-03-03 12:33:40 +01:00
Moriz Wahl
371bfba0ee bv toast in edit creation formular 2022-03-03 12:31:08 +01:00
Moriz Wahl
bb4a237f18 bv toast in deleted user formular 2022-03-03 12:29:01 +01:00
Moriz Wahl
11808f1e22 bv toast in creation transaction formular 2022-03-03 12:26:10 +01:00
Moriz Wahl
f2af159914 bv toast in creation formular 2022-03-03 12:23:20 +01:00
Moriz Wahl
bfaa77482c refactor: Bootstrap Vue Toast in Admin Interface 2022-03-03 12:07:35 +01:00
Ulf Gebhardt
b1e6f50f44
lint fix 2022-03-01 13:27:05 +01:00
Ulf Gebhardt
e35275cd55
fixed query to run successfully 2022-02-28 13:11:35 +01:00
Ulf Gebhardt
84fb6c0827
merge error 2022-02-28 13:02:29 +01:00
Ulf Gebhardt
a0046bc89a
corrected merge migration namings 2022-02-28 12:58:44 +01:00
Ulf Gebhardt
50d13b10ab
Merge branch 'combine_transaction_tables2' into refactor_arithmetic 
# Conflicts:
#	backend/src/config/index.ts
#	backend/src/graphql/model/Transaction.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	database/entity/Transaction.ts
#	database/src/interface/TransactionContext.ts
#	database/src/seeds/helpers/user-helpers.ts
 2022-02-28 12:58:23 +01:00