1509 Commits

Author SHA1 Message Date
84d4d41f22
v1.8.0 2022-04-25 16:51:48 +02:00
Moriz Wahl
1f19b3e4de
Merge branch 'master' into fix_database_version 2022-04-25 16:40:07 +02:00
6aad140247
fix database version requirement for backend 2022-04-25 16:36:33 +02:00
Moriz Wahl
60d7163d78
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:31:26 +02:00
Moriz Wahl
294433ec7e
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:20:19 +02:00
Moriz Wahl
54e119f88d fix test after alter is admin field 2022-04-25 16:20:00 +02:00
Moriz Wahl
ecbb59281e
Merge branch 'master' into fix-decay-rounding-with-transaction-links 2022-04-25 16:12:40 +02:00
Moriz Wahl
b3449a28af Merge branch 'more-user-resolver-tests' of github.com:gradido/gradido into more-user-resolver-tests 2022-04-25 16:06:30 +02:00
Moriz Wahl
22fcf28291 remove strange comments 2022-04-25 16:06:18 +02:00
Moriz Wahl
89dea79ce1
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:05:24 +02:00
Moriz Wahl
1d48c12573
Merge branch 'master' into fix-decay-rounding-with-transaction-links 2022-04-25 16:04:38 +02:00
Moriz Wahl
a4ae002693 round balance down before subtracting hold available amount 2022-04-25 16:01:26 +02:00
0299fffbee
Merge branch 'master' into database_admin_pending_creations_decimal
# Conflicts:
#	backend/src/config/index.ts
2022-04-25 15:13:03 +02:00
e9906f3908
Merge branch 'master' into database_admin_pending_creations_decimal 2022-04-25 14:08:00 +02:00
Moriz Wahl
0264931e58 test update user infos mutation. Remove publisher ID from update user infos as it is never used 2022-04-25 14:07:31 +02:00
Moriz Wahl
e30d1f723f test queryOptIn 2022-04-25 13:18:08 +02:00
Moriz Wahl
276a1be889 test forgot password mutation 2022-04-25 12:49:23 +02:00
Moriz Wahl
d346a1d09d test verify login 2022-04-25 11:52:10 +02:00
Moriz Wahl
fb3137892f
Merge branch 'master' into eliminate-server-user-table 2022-04-25 11:21:00 +02:00
Moriz Wahl
7e4d4bf607
Merge branch 'master' into eliminate-server-user-table 2022-04-22 11:18:00 +02:00
Claus-Peter Hübner
061b27eaa3 fix cross-env for windows 2022-04-22 02:16:44 +02:00
efcd75717a
updated backend required database version 2022-04-21 13:49:29 +02:00
56ed35d692
backend fix types for admin_pending_creations is now decimal 2022-04-21 13:49:29 +02:00
00e03af7f3
increase backend config version v6 2022-04-21 13:19:01 +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
Moriz Wahl
50bddf49e4 fix test for User.isAdmin as nullable date 2022-04-21 11:16:14 +02:00
Moriz Wahl
fa6fbe38c8 User.isAdmin as nullable Date 2022-04-21 11:05:51 +02:00
Moriz Wahl
e3a807ed95
Merge branch 'master' into eliminate-server-user-table 2022-04-20 13:08:43 +02:00
Moriz Wahl
3e660fcfa9
Merge branch 'master' into deploy-seed-in-backend 2022-04-20 12:59:45 +02:00
Moriz Wahl
324de93814 update/remove comments 2022-04-20 12:51:34 +02:00
Moriz Wahl
6691be813f decontruct input 2022-04-20 12:44:21 +02:00
Moriz Wahl
4dca3d24ec Merge branch 'deploy-seed-in-backend' into eliminate-server-user-table 2022-04-20 11:50:33 +02:00
Moriz Wahl
c9701574f3 seed with isAdmin, test user resolver with isAdmin 2022-04-20 11:44:34 +02:00
Moriz Wahl
8ca72beac8 use isAdmin of user to determine user role 2022-04-20 11:30:29 +02:00
Moriz Wahl
64859a71f4 use isAdmin on user to determine if user is admin 2022-04-20 11:27:09 +02:00
Moriz Wahl
5c6aa5d4ce new db version for isAdmin in user db model 2022-04-20 11:20:28 +02:00
Moriz Wahl
1b3217a212
Merge branch 'master' into deploy-seed-in-backend 2022-04-20 08:34:51 +02:00
Moriz Wahl
081e4d7949 add descrition for seed 2022-04-20 08:34:24 +02:00
Moriz Wahl
15b37c4937 rename README 2022-04-20 08:16:39 +02:00
Moriz Wahl
1b0f53ca64
Merge branch 'master' into refactor-balance-model 2022-04-19 11:10:24 +02:00
Wolfgang Huß
d0215f2885
Update backend/src/mailer/text/transactionReceived.ts
- Follow Ulf's suggestion.

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-04-19 10:03:56 +02:00
Moriz Wahl
6db9586fb8 add README 2022-04-19 08:55:51 +02:00
Moriz Wahl
6d2033abd2 no interface 2022-04-19 08:36:38 +02:00
Wolfgang Huß
8205e88b2f Comply Ulf's suggestions 2022-04-14 14:19:40 +02:00
Wolfgang Huß
ad0f3a8be4 Add test for existence of e-mail link to overview page 2022-04-13 10:36:39 +02:00
Wolfgang Huß
f94dc967c0 Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
2022-04-13 10:26:49 +02:00
Moriz Wahl
55ff0ee964 add roundedDecay field to Decay Model. This is used to calibrate the decay since the last transaction 2022-04-12 22:52:51 +02:00
Moriz Wahl
0bcf2cbd8c use interface for decay constructor 2022-04-12 21:43:18 +02:00
Moriz Wahl
a6e7036339 remove unused fields from balance model 2022-04-12 21:34:33 +02:00
Moriz Wahl
263d0ab812
Merge branch 'master' into define-context-object 2022-04-12 19:45:19 +02:00