elweyn
|
e49689af77
|
Start tests for searchAdminUsers.
|
2022-08-17 14:10:54 +02:00 |
|
elweyn
|
c703117e60
|
Add searchAdminUsers query to mocks.
|
2022-08-17 14:10:54 +02:00 |
|
ogerly
|
924bbe52c3
|
Merge branch 'statistics-resolver' into 1973-List-open-contribution-links-in-the-wallet
|
2022-08-17 13:55:18 +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 |
|
ogerly
|
a9b7ca67a7
|
fix test for sidebar
|
2022-08-17 11:09:59 +02:00 |
|
ogerly
|
ead9f5be7d
|
fix test for router and navbar
|
2022-08-17 11:05:40 +02:00 |
|
ogerly
|
0be22fcc27
|
fix test
|
2022-08-17 10:51:36 +02:00 |
|
ogerly
|
212ad3aae9
|
add query searchAdminUsers
|
2022-08-17 10:51:36 +02:00 |
|
elweyn
|
c48ce63a14
|
Remove unused code.
|
2022-08-17 10:51:36 +02:00 |
|
elweyn
|
c6e08dd72d
|
Fix changes.
|
2022-08-17 10:51:36 +02:00 |
|
Alexander Friedland
|
f21b5f49ab
|
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet
|
2022-08-17 10:17:04 +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 |
|
Alexander Friedland
|
3500b6125d
|
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet
|
2022-08-16 12:14:12 +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 |
|
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 |
|
ogerly
|
1ce2aec998
|
Merge branch '2116-retrieve-admin-and-moderators' into 1973-List-open-contribution-links-in-the-wallet
|
2022-08-16 09:58:00 +02:00 |
|
ogerly
|
3f30252cf5
|
fix test, fix lint
|
2022-08-16 09:55:19 +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 |
|
Wolfgang Huß
|
7e912be184
|
Merge branch 'master' into 2091-refactor-contribution-form-logic-and-write-tests
|
2022-08-16 08:48:10 +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 |
|
elweyn
|
d3238fd486
|
Fix linting.
|
2022-08-15 11:05:11 +02:00 |
|
elweyn
|
b41f34a3dd
|
Merge master into this branch.
|
2022-08-15 11:03:58 +02:00 |
|
ogerly
|
c0486d7f72
|
add locales for es
|
2022-08-14 15:32:33 +02:00 |
|
ogerly
|
661c9fd2ad
|
fix lint
|
2022-08-14 15:13:47 +02:00 |
|
Alexander Friedland
|
220a6544f9
|
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet
|
2022-08-12 14:46:31 +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 |
|
Alexander Friedland
|
425c800de4
|
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet
|
2022-08-11 14:36:15 +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 |
|