elweyn
|
f136f3c4ad
|
Remove unused migration.
|
2022-09-26 08:59:46 +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 |
|
mahula
|
9ac62d5101
|
Merge pull request #2047 from gradido/e2e-test-setup
End-to-end test setup
|
2022-09-23 21:17:53 +02:00 |
|
mahula
|
d6b1b25f6e
|
Merge branch 'master' into e2e-test-setup
|
2022-09-23 21:06:41 +02:00 |
|
clauspeterhuebner
|
a6d30328ff
|
Merge pull request #2216 from gradido/2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
config testmodus flag for sending emails to test or team account instead of user account
|
2022-09-23 19:38:50 +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
|
22845c6264
|
Merge pull request #2058 from gradido/1798-feature-gradidoid-1-adapt-and-migrate-database-schema
GradidoID 1: adapt and migrate database schema
|
2022-09-23 19:07:53 +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 |
|
Claus-Peter Hübner
|
792d8a8d53
|
eol convert
|
2022-09-23 18:47:07 +02:00 |
|
joseji
|
60d2e2ff7b
|
fixed contribution delete event saving and testing
|
2022-09-23 18:46:40 +02:00 |
|
Moriz Wahl
|
a411dbe761
|
Merge branch 'master' into e2e-test-setup
|
2022-09-23 18:24:15 +02:00 |
|
Claus-Peter Hübner
|
ab1a4ac8d1
|
solve tests
|
2022-09-23 18:24:13 +02:00 |
|
Moriz Wahl
|
79ab041137
|
Merge pull request #2206 from gradido/add-client-request-time
feat: Add Client Request Time to Context
|
2022-09-23 18:18:03 +02:00 |
|
Moriz Wahl
|
929593e92d
|
Merge branch 'master' into add-client-request-time
|
2022-09-23 18:08:46 +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 |
|
elweyn
|
8c6a234861
|
Change contributions table to have deleted_by in the object.
|
2022-09-23 16:20:41 +02:00 |
|
Hannes Heine
|
fd77e5e2ec
|
Merge branch 'master' into e2e-test-setup
|
2022-09-23 15:52:22 +02:00 |
|
mahula
|
60e4cbfd60
|
make login query string more human readable in cypress.config.ts
|
2022-09-23 14:23:07 +02:00 |
|
mahula
|
454c8e2fda
|
correct cypress execution command in package.json
|
2022-09-23 14:20:30 +02:00 |
|
mahula
|
a12bb9e09b
|
bundle cypress step definitions
- bundle step definitions in feature-related multiple-step files
- avoid the long ugly file names
|
2022-09-23 12:19:37 +02:00 |
|
mahula
|
9f23ac9734
|
shorten script name for cypress execution in e2e-tests/cypress/tests/package.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-23 10:23:30 +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
|
0b410fd5fd
|
oel convert
|
2022-09-23 00:50:07 +02:00 |
|
Claus-Peter Hübner
|
8eba19a45b
|
Merge branch '2220-feature-reconfigure-log4js' of github.com:gradido/gradido into 2220-feature-reconfigure-log4js
|
2022-09-23 00:33:15 +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 |
|
Claus-Peter Hübner
|
99f0905bee
|
Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js
|
2022-09-22 23:42:23 +02:00 |
|
clauspeterhuebner
|
810d258965
|
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
|
2022-09-22 23:31:08 +02:00 |
|
Claus-Peter Hübner
|
de234cc7df
|
rework PR remarks
|
2022-09-22 23:29:51 +02:00 |
|
Alexander Friedland
|
00faee4bd4
|
Merge branch 'master' into 2109-Typo-im-Dialog
|
2022-09-22 22:43:44 +02:00 |
|
Alexander Friedland
|
c7abc78ad8
|
Merge branch 'master' into send-form-border-radius
|
2022-09-22 22:43:36 +02:00 |
|
Alexander Friedland
|
6011564cf2
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-22 22:43:18 +02:00 |
|
clauspeterhuebner
|
43b5f79ddb
|
Merge branch 'master' into 2220-feature-reconfigure-log4js
|
2022-09-22 22:07:50 +02:00 |
|
clauspeterhuebner
|
4735687c0b
|
Merge pull request #2234 from gradido/2219-feature-rework-eventprotocol
2219 feature rework eventprotocol
|
2022-09-22 22:06:47 +02:00 |
|
Moriz Wahl
|
18008e9598
|
Merge branch 'master' into add-client-request-time
|
2022-09-22 21:13:27 +02:00 |
|
joseji
|
79f7ebce57
|
updated event working, deletion is not working properly (deeper than the event itself)
|
2022-09-22 17:35:41 +02:00 |
|
ogerly
|
8b2a781be1
|
style: deleted max-rows 6 from all forms textareas
|
2022-09-22 15:14:58 +02:00 |
|
ogerly
|
52524120ba
|
style: deleted max-rows 6 from all forms textareas
|
2022-09-22 15:11:55 +02:00 |
|
clauspeterhuebner
|
63afbab8ea
|
Merge branch 'master' into 2219-feature-rework-eventprotocol
|
2022-09-22 14:56:26 +02:00 |
|
ogerly
|
3f821d24bb
|
style: add border-radius on send form
|
2022-09-22 14:47:34 +02:00 |
|
Hannes Heine
|
69b0ee7cbb
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-22 14:35:49 +02:00 |
|