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

11528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
2caf0ee664
v1.15.0 2022-11-26 01:14:24 +01:00
Moriz Wahl
9556e196ab
Merge pull request #2423 from gradido/fix-balance-migration 
fix(database): wrong balance and decay values
 2022-11-25 18:22:06 +01:00
Ulf Gebhardt
48365c7bb3
Merge branch 'master' into 2367-feature-add-federation-configs 2022-11-25 17:53:48 +01:00
Ulf Gebhardt
2c3cac5939
Merge branch 'master' into fix-balance-migration 2022-11-25 17:48:28 +01:00
mahula
06fd7c9b9a disable submit button of contribution messages formular until submit request is finished in wallet 2022-11-25 17:41:04 +01:00
mahula
84613af035 disable submit button of contribution messages formular until submit request is finished 2022-11-25 17:38:25 +01:00
Moriz Wahl
bd49a1e80d
Merge pull request #2422 from gradido/fix-wrong-balance 
fix(backend): wrong balance after transaction receive
 2022-11-25 15:19:31 +01:00
Moriz Wahl
aa1a88bc11
Merge branch 'master' into fix-wrong-balance 2022-11-25 14:44:39 +01:00
Moriz Wahl
9253706513 remove comment 2022-11-25 14:32:23 +01:00
Moriz Wahl
62c48712a4 fix misspelled text 2022-11-25 14:32:12 +01:00
Ulf Gebhardt
bc0cbfe2f7
lint fix 2022-11-25 14:24:47 +01:00
Ulf Gebhardt
1ea8eb1815
create log folder 2022-11-25 14:23:47 +01:00
Ulf Gebhardt
0f71a486a5
log affected accounts & some fixes 2022-11-25 14:13:22 +01:00
Claus-Peter Hübner
89283fa3da rework PR comments 2022-11-25 04:08:01 +01:00
Ulf Gebhardt
4bb82f2933
Merge branch 'master' into jest_is_dev_depenency 2022-11-25 03:42:17 +01:00
Claus-Peter Hübner
9395b5a0ba resolve conflicts 2022-11-25 03:11:14 +01:00
Claus-Peter Hübner
efa46f50f3 resolve conflicts 2022-11-25 03:09:54 +01:00
Claus-Peter Hübner
7543acfb53 Merge branch '2367-feature-add-federation-configs' of 
github.com:gradido/gradido into 2367-feature-add-federation-configs
 2022-11-25 03:06:52 +01:00
Claus-Peter Hübner
7a2de6c437 rework PR comments 2022-11-25 03:03:57 +01:00
Claus-Peter Hübner
111602c707 rework PR comments 2022-11-25 03:03:17 +01:00
Claus-Peter Hübner
d021cb2918 renamend porperties to FEDERATION_xxx 2022-11-25 03:01:23 +01:00
clauspeterhuebner
192ab67817
Update backend/src/index.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-11-25 01:43:59 +01:00
clauspeterhuebner
ce1b488865
Update backend/.env.template 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-11-25 01:37:56 +01:00
clauspeterhuebner
68586eaae7
Update backend/.env.dist 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-11-25 01:37:36 +01:00
Claus-Peter Hübner
5863736658 create DHT-KeyPair with optional configured Seed 2022-11-25 01:01:14 +01:00
Claus-Peter Hübner
28fa11bcd5 use the new config property to start DHT 2022-11-25 00:59:35 +01:00
Claus-Peter Hübner
cf1c68f290 define the federation config properties 2022-11-25 00:58:28 +01:00
Claus-Peter Hübner
b4fbb09f26 define the federation config properties 2022-11-25 00:57:48 +01:00
Claus-Peter Hübner
7d56905b62 Merge remote-tracking branch 'origin/master' into 2367-feature-add-federation-configs 2022-11-24 23:35:20 +01:00
Wolfgang Huß
b68f550b6c Remove old untranslated email 'sendResetPasswordEmail' 2022-11-24 22:16:18 +01:00
Wolfgang Huß
2d634b4111 Test 'sendResetPasswordEmail' 2022-11-24 22:10:07 +01:00
Wolfgang Huß
a652654be7 Refactor 'sendResetPasswordEmail' email to HTML and translatable 2022-11-24 22:09:36 +01:00
clauspeterhuebner
bfccd815d3
Merge pull request #2301 from gradido/2267-feature-gradido-roadmap 
feat(other): feature gradido roadmap
 2022-11-24 21:56:42 +01:00
clauspeterhuebner
1314ed5263
Merge branch 'master' into 2267-feature-gradido-roadmap 2022-11-24 21:22:45 +01:00
Wolfgang Huß
44f2e6b06a Move 'getTimeDurationObject' and 'printTimeDuration' into a separate file 2022-11-24 20:15:55 +01:00
Moriz Wahl
f2e8846932 rename migration file, set new db version in backend 2022-11-24 16:37:32 +01:00
Moriz Wahl
63e22eeab8 fix(database): wrong balance and decay values 2022-11-24 16:30:55 +01:00
Wolfgang Huß
e07a2f88c1 Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables 2022-11-24 16:23:10 +01:00
Wolfgang Huß
3b030e4612 Remove old untranslated email 'sendContributionRejectedEmail' 2022-11-24 16:12:48 +01:00
Wolfgang Huß
ae65af9df8 Test 'sendContributionRejectedEmail' 2022-11-24 16:10:41 +01:00
Wolfgang Huß
72213988ac Refactor 'sendContributionRejectedEmail' email to HTML and translatable 2022-11-24 16:10:29 +01:00
Wolfgang Huß
dd33254acb Remove old untranslated email 'sendContributionConfirmedEmail' 2022-11-24 14:56:09 +01:00
Wolfgang Huß
727e5ca1f6 Test 'sendContributionConfirmedEmail' 2022-11-24 14:45:33 +01:00
Wolfgang Huß
c87ffd5b8a Refactor 'sendContributionConfirmedEmail' email to HTML and translatable 2022-11-24 14:44:50 +01:00
Ulf Gebhardt
bd28a888a6
Merge branch 'master' into jest_is_dev_depenency 2022-11-24 13:40:59 +01:00
Moriz Wahl
77d93f18fa remove test 2022-11-24 13:13:01 +01:00
Moriz Wahl
b3e880d45f undo refactoring 2022-11-24 13:03:50 +01:00
jjimenezgarcia
8b9eb4a522
Merge pull request #2353 from gradido/new-password-encryption 
refactor(backend): new password encryption implementation
 2022-11-24 12:00:20 +01:00
jjimenezgarcia
d8f5cda0fc
Merge branch 'master' into new-password-encryption 2022-11-24 11:26:02 +01:00
joseji
2a74b92472 user saving on db 2022-11-24 11:21:47 +01:00