Alexander Friedland
|
81db56fd5e
|
Update admin/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-08-18 17:06:26 +02:00 |
|
Alexander Friedland
|
693e315cf3
|
Update admin/src/components/ContentFooter.spec.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-08-18 17:06:19 +02:00 |
|
Alexander Friedland
|
4da9b22eeb
|
Update admin/jest.config.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-08-18 17:06:10 +02:00 |
|
ogerly
|
0bbc22e803
|
remove COMMUNITY_NAME in config.js
|
2022-08-18 10:42:19 +02:00 |
|
ogerly
|
fed8701bda
|
thousand separator inserted
|
2022-08-18 08:37:38 +02:00 |
|
Moriz Wahl
|
cd13071441
|
add to mocks
|
2022-08-17 17:02:03 +02:00 |
|
Moriz Wahl
|
4e240992a5
|
test the API calls
|
2022-08-17 17:00:23 +02:00 |
|
Moriz Wahl
|
9d3d70c103
|
Merge branch 'master' into 2044-Admin-Interface-Displays-Statistics
|
2022-08-17 16:29:39 +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
|
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 |
|
Alexander Friedland
|
fe3787440c
|
Merge branch 'master' into 2044-Admin-Interface-Displays-Statistics
|
2022-08-17 09:20:58 +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
|
eb09a47451
|
Merge branch 'master' into 2044-Admin-Interface-Displays-Statistics
|
2022-08-16 12:00:48 +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
|
1243615356
|
fix lint
|
2022-08-16 10:21:57 +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
|
661c9fd2ad
|
fix lint
|
2022-08-14 15:13:47 +02:00 |
|
ogerly
|
d6d4d97151
|
add propsData for test in Overview.spec.js
|
2022-08-14 13:32:37 +02:00 |
|
Alexander Friedland
|
0a295d59b4
|
Merge branch 'master' into 2044-Admin-Interface-Displays-Statistics
|
2022-08-12 14:46:15 +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 |
|