2409 Commits

Author SHA1 Message Date
joseji
088e30daae added admin events for contributions 2022-10-07 12:36:31 +02:00
joseji
34b6e0d48f added new events 2022-10-07 12:32:00 +02:00
joseji
84d87bbee6 fixed wrong order on one method call parameters 2022-10-07 12:15:49 +02:00
joseji
3cfe266a05 Merge branch 'contribution-resolver-logs-and-events' into admin-resolver-events-and-logging
as new events were added in the branch being merged
2022-10-07 12:11:35 +02:00
jjimenezgarcia
0ddd08d1e1
Merge branch 'master' into contribution-resolver-logs-and-events 2022-10-07 12:09:31 +02:00
joseji
ad174e6e0a corrections 2022-10-07 12:09:09 +02:00
Wolfgang Huß
83d2aaa276 Refine email design 2022-10-05 13:39:38 +02:00
Wolfgang Huß
a02d8d0edb Get email-template to work the first time 2022-10-05 11:07:16 +02:00
joseji
3eae1f60b2 applied propper conventions and fixed code duplication 2022-10-04 21:18:00 +02:00
joseji
bb3d1caa73 fixed amount not being initialized in databsae while storing events 2022-10-04 20:33:50 +02:00
joseji
4853eea32a fixed wrong non mandatory attributes 2022-10-04 20:33:22 +02:00
joseji
903fd4446e changed database version 2022-10-04 20:32:10 +02:00
joseji
7a21ec12e0 message changed for messageId and some small problems solved 2022-10-04 19:26:05 +02:00
Wolfgang Huß
47e4be4697 Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates 2022-10-04 11:46:52 +02:00
clauspeterhuebner
92bda917ca
Merge branch 'master' into 2220-feature-reconfigure-log4js 2022-09-30 00:27:25 +02:00
joseji
f05c31f69b removed duplicated code 2022-09-29 12:32:43 +02:00
joseji
7061718c1f all conversations solved 2022-09-29 12:20:08 +02:00
joseji
ce280f6320 some conversations solved 2022-09-29 11:53:32 +02:00
joseji
df25197842 solved unnecessary date creation regarding one invalid date testing 2022-09-29 11:39:01 +02:00
Claus-Peter Hübner
ff93c41c19 Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js 2022-09-28 21:41:51 +02:00
joseji
a756f0a4cc all tests completed 2022-09-28 12:47:00 +02:00
joseji
0f1f9baa8d added tests for events 2022-09-28 11:57:49 +02:00
joseji
33eeab344f added missing error logs 2022-09-28 11:14:16 +02:00
joseji
2ca9945a1b added missing events 2022-09-28 11:09:14 +02:00
elweyn
ea234add11 Add message after updateContribution. 2022-09-27 13:37:45 +02:00
joseji
e97aac759f typo camel case in 'send multiregistration email event' 2022-09-26 23:00:33 +02:00
joseji
91b363e61c fixed conflicts 2022-09-26 22:53:57 +02:00
joseji
c8a2d899b8 all stated according to the events table 2022-09-26 22:41:33 +02:00
joseji
329e6f0893 removed unnecesary previously included parameter 'message' on events 2022-09-26 22:29:48 +02:00
joseji
49378c64e2 new events fully implemented 2022-09-26 22:17:07 +02:00
elweyn
3ae79ad935 Change expected database version. 2022-09-26 15:24:36 +02:00
elweyn
186e6711f5 Remove unused import. 2022-09-26 09:10:58 +02:00
elweyn
fefdf9f0fa Merge master and resolve merge conflict. 2022-09-26 08:53:25 +02:00
elweyn
209c61e5d8 Change call from Contribution to DbContribution and use Contribution as model. 2022-09-26 08:48:04 +02:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +02:00
elweyn
6df8b9a83f Test that when an admin user create a contribution in FE he can not delete it in admin interface. 2022-09-24 11:32:07 +02:00
joseji
744c961c0b fixed tests with new log message 2022-09-23 19:33:54 +02:00
clauspeterhuebner
55a8174822
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account 2022-09-23 19:29:34 +02:00
Claus-Peter Hübner
516fc5c5e7 Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
2022-09-23 19:28:28 +02:00
clauspeterhuebner
e955b92235
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-23 18:48:11 +02:00
joseji
60d2e2ff7b fixed contribution delete event saving and testing 2022-09-23 18:46:40 +02:00
Claus-Peter Hübner
ab1a4ac8d1 solve tests 2022-09-23 18:24:13 +02:00
elweyn
e7b5400db2 Change the database version needed for the backend. 2022-09-23 16:49:12 +02:00
elweyn
8c69b94e8e Throw error if moderator tries to deleted own contribution created as user. Add deletedby value. 2022-09-23 16:25:22 +02:00
Claus-Peter Hübner
b3bf7fecc4 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-09-23 01:32:44 +02:00
Claus-Peter Hübner
969d6d0fbe Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-23 01:12:24 +02:00
Claus-Peter Hübner
e701f99553 rework PR comments 2022-09-23 01:11:37 +02:00
clauspeterhuebner
b0781bce88
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 01:03:07 +02:00
clauspeterhuebner
62446bd2f0
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 00:56:36 +02:00
Claus-Peter Hübner
3dd66b4527 small changes in log-pattern
Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
2022-09-23 00:31:33 +02:00