9872 Commits

Author SHA1 Message Date
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
elweyn
277b5fde24 Create message entity, change contribution and user entities. 2022-08-16 08:23:09 +02:00
Moriz Wahl
f2f8989746 save contribution when setting status DELETED before softDelete 2022-08-15 19:06:59 +02:00
Moriz Wahl
c417bc7a10 add contribution status enum and set it 2022-08-15 19:02:06 +02:00
Moriz Wahl
daa8d48ca6 add contribution type enum and set contribution type on creation 2022-08-15 18:50:25 +02:00
Moriz Wahl
cc2cc93b60 update db entity for contributions 2022-08-15 18:38:50 +02:00
Moriz Wahl
d4150f123c update db version 2022-08-15 18:32:50 +02:00
Moriz Wahl
d83024cb51 feat: Add status, type, denied_at and denied_by to contributions Table 2022-08-15 18:31:42 +02:00
ogerly
661c9fd2ad fix lint 2022-08-14 15:13:47 +02:00
Alexander Friedland
ccaf01dc37
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-12 14:45:57 +02:00
Hannes Heine
eed210dc9e
Merge pull request #2107 from gradido/2105-add-emailChecked-to-opt-in-check
fix: 🍰 Add `emailChecked` Before Changing `optIn` State & Log Error On klicktipp Middleware
2022-08-12 12:25:53 +02:00
Hannes Heine
d4cd6c2b30
Update klicktippMiddleware.ts
Change log level from info to error
2022-08-11 15:07:48 +02:00
Wolfgang Huß
df0f3e21b6 Reduce comment to a minimal 2022-08-11 15:05:43 +02:00
Hannes Heine
ad9202efed
Update backend/src/middleware/klicktippMiddleware.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-11 14:57:17 +02:00
Hannes Heine
24ce920ecc
Merge branch 'master' into 2105-add-emailChecked-to-opt-in-check 2022-08-11 14:56:36 +02:00
ogerly
289b758ca6 delete flushPromisesin test 2022-08-11 14:23:56 +02:00
Wolfgang Huß
774e8e1f2f Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests 2022-08-11 14:17:26 +02:00
Wolfgang Huß
50fd74bb6a Remove tests of disabled cancel button, because they are always enabled yet 2022-08-11 14:14:47 +02:00
Alexander Friedland
3e1e493ad0
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-11 13:32:55 +02:00
Hannes Heine
10ad232a47
Merge pull request #2123 from gradido/2117-list-contribution-links-for-all-users
Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER
2022-08-11 11:35:41 +02:00
Hannes Heine
186eaf238a
Merge branch 'master' into 2117-list-contribution-links-for-all-users 2022-08-11 11:17:29 +02:00
Wolfgang Huß
ef8c8619f3 Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests 2022-08-11 11:16:21 +02:00
Wolfgang Huß
9d5325c199 Fix date tests
Co-Authored-By: elweyn <heine.hannes@gmail.com>
2022-08-11 11:12:55 +02:00
Alexander Friedland
afe9a53a5c
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-11 10:59:55 +02:00
Alexander Friedland
826bd6892d
Update frontend/src/components/Menu/Navbar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-11 10:59:20 +02:00