9914 Commits

Author SHA1 Message Date
elweyn
0a2c8c6a08 Add import for deletedatecolumn. 2022-08-19 12:18:55 +02:00
Hannes Heine
0cc5be1c11
Update database/entity/0047-messages_tables/ContributionMessage.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-18 12:09:08 +02:00
Hannes Heine
ab681dd5ac
Update database/entity/0047-messages_tables/ContributionMessage.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-18 12:08:52 +02:00
Hannes Heine
e0185b4afb
Update database/entity/0047-messages_tables/ContributionMessage.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-18 12:08:40 +02:00
Hannes Heine
fb22bdbe63
Merge branch 'master' into create-message-table 2022-08-18 12:07:57 +02:00
Moriz Wahl
e5f7bec965
Merge pull request #2041 from gradido/statistics-resolver
feat: Statistics Resolver
2022-08-17 15:31:09 +02:00
Moriz Wahl
69f4b98473 Merge branch 'master' into statistics-resolver 2022-08-17 15:22:57 +02:00
Moriz Wahl
d058b7033b
Merge pull request #2127 from gradido/2116-retrieve-admin-and-moderators
2116 retrieve admin and moderators
2022-08-17 15:20:28 +02:00
Moriz Wahl
194d4a6ad2 move right COMMUNITY_STATISTICS to user rights 2022-08-17 15:15:35 +02:00
elweyn
b1a17c52ec Add community_statistics to user ROLES. 2022-08-17 12:46:29 +02:00
Alexander Friedland
632141ffca
Merge branch 'master' into statistics-resolver 2022-08-17 12:44:31 +02:00
elweyn
e4ec7a1d59 Change Message to ContributionMessage, change 0046 to 0047. 2022-08-17 12:04:03 +02:00
elweyn
1c301d34a2 Test for searchAdminUsers. 2022-08-17 11:37:13 +02:00
elweyn
6c707eae59 Start tests for searchAdminUsers. 2022-08-17 10:22:08 +02:00
elweyn
f96fb5aa63 Add searchAdminUsers query to mocks. 2022-08-17 10:21:40 +02:00
elweyn
a44bcc00e2 Remove unused code. 2022-08-17 10:09:12 +02:00
elweyn
beb563ac5c Fix changes. 2022-08-17 10:05:56 +02:00
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
elweyn
6bb2ae34b1 Fix typo. 2022-08-17 09:51:23 +02:00
Hannes Heine
4382224c18
Merge branch 'master' into create-message-table 2022-08-17 09:29:40 +02:00
clauspeterhuebner
1e0922e311
Merge pull request #2126 from gradido/2125-feature-gradido-id-new-column-gradidoid-in-users-table
2125 feature gradido id: new column gradidoid in users table
2022-08-17 04:17:42 +02:00
Claus-Peter Hübner
72e1de9f78 Merge remote-tracking branch 'origin/master' into
2125-feature-gradido-id-new-column-gradidoid-in-users-table
2022-08-16 17:10:15 +02:00
Claus-Peter Hübner
e876f32ad5 initialize gradidoID of fakedUser per uuidv4() instead of constant 2022-08-16 17:05:31 +02:00
elweyn
47b9d67b15 Add new mendatory fields to the entity. 2022-08-16 15:49:16 +02:00
elweyn
c44ed7a348 Add new mendatory fields. 2022-08-16 15:48:53 +02:00
elweyn
6e6d4c2b04 Merge branch 'create-message-table' of https://github.com/gradido/gradido into create-message-table 2022-08-16 12:00:50 +02:00
elweyn
c67652ab19 Remove unchanged User change. 2022-08-16 12:00:36 +02:00
Hannes Heine
d31378519d
Merge branch 'master' into create-message-table 2022-08-16 11:47:21 +02:00
elweyn
cadc0db50c Remove unused imports. 2022-08-16 11:47:10 +02:00
Alexander Friedland
8b3ebb807b
Merge pull request #2120 from gradido/2119-New-menu-item-GDT
2119 new menu item gdt
2022-08-16 11:46:58 +02:00
elweyn
0678d53216 Remove message to user relation. 2022-08-16 11:43:00 +02:00
elweyn
dd381f3de1 Merge master changes. 2022-08-16 11:37:26 +02:00
Alexander Friedland
f3d6960721
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-16 11:37:17 +02:00
Alexander Friedland
722b0e4757
Update frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-16 11:37:10 +02:00
Alexander Friedland
9a1b73ebf3
Update frontend/src/components/GddSend/TransactionConfirmationLink.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-16 11:37:03 +02:00
Moriz Wahl
ca48218d33
Merge pull request #2136 from gradido/update-contributions-table
feat: Migrate Contributions Table
2022-08-16 11:22:12 +02:00
Wolfgang Huß
68031d5401
Merge branch 'master' into update-contributions-table 2022-08-16 11:08:31 +02:00
Wolfgang Huß
bc9db6b37b
Merge pull request #2092 from gradido/2091-refactor-contribution-form-logic-and-write-tests
chore: 🍰 Refactor Contribution Form Logic And Write Tests
2022-08-16 11:02:00 +02:00
elweyn
be2fa7f8e8 Fix removed , after primary key 2022-08-16 10:41:06 +02:00
elweyn
6553763f07 Add collate utf8mb4_unicode_ci 2022-08-16 10:30:59 +02:00
elweyn
2fc693f60b Add Message to the entity definitions. 2022-08-16 10:30:36 +02:00
elweyn
959b7e3d13 Take newer User entity. 2022-08-16 09:53:43 +02:00
ogerly
13478960bc fix lint 2022-08-16 09:50:47 +02:00
ogerly
32e3252155 test for TransactionConfirmationLink 2022-08-16 09:34:16 +02:00
ogerly
90fb72a648 fix lint 2022-08-16 09:10:23 +02:00
elweyn
60890b5eac Add eslint-disable and change import of Message in contribution. 2022-08-16 09:07:19 +02:00
Wolfgang Huß
7e912be184
Merge branch 'master' into 2091-refactor-contribution-form-logic-and-write-tests 2022-08-16 08:48:10 +02:00
elweyn
d86f502fe7 Set new database version in backend config. 2022-08-16 08:25:21 +02:00
elweyn
dd408a52ff Down and upgrade script for 0046-messages_tables 2022-08-16 08:24:48 +02:00
elweyn
73b7d38301 Change the three entities to their new definitions. 2022-08-16 08:24:13 +02:00