10976 Commits

Author SHA1 Message Date
Moriz Wahl
b493fd4231 migration to save contribution link on registration 2022-06-16 09:21:37 +02:00
Moriz Wahl
20b35e0f3d fix: Max Amount on Slider for Edit Contribution 2022-06-16 07:55:18 +02:00
ogerly
188a93c6bd contribution name maxlength from 80 to 100 2022-06-16 07:51:39 +02:00
Moriz Wahl
d3824ae642 Merge branch 'master' into 1881-set-role-in-admin-interface 2022-06-16 07:35:06 +02:00
ogerly
5de39268f6 merge master, resolve conflict 2022-06-16 07:30:55 +02:00
Claus-Peter Hübner
52833ed252 next try to ignore .dbeaver 2022-06-16 01:05:32 +02:00
Claus-Peter Hübner
3fb59b519c ignore .project and .dbeaver 2022-06-16 00:57:25 +02:00
Claus-Peter Hübner
9947fff256 change expected version 2022-06-16 00:51:23 +02:00
Claus-Peter Hübner
a73ff0aadf correct check amount lte zero 2022-06-16 00:32:30 +02:00
Moriz Wahl
7b66ba4064
Merge pull request #1967 from gradido/log-response-as-trace
fix: `.env` log level for apollo and backend category
2022-06-15 23:45:19 +02:00
Moriz Wahl
8646471f63
Merge branch 'master' into log-response-as-trace 2022-06-15 23:36:20 +02:00
Moriz Wahl
c92a5e815f
Merge pull request #1949 from gradido/contributions-table
refactor: Admin Pending Creations Table to Contributions Table
2022-06-15 23:34:43 +02:00
Moriz Wahl
5a97a0a43e
Merge branch 'master' into contributions-table 2022-06-15 23:27:20 +02:00
Moriz Wahl
5c7dd1cca2
Merge pull request #1984 from gradido/update-browser-list
devops: Update Browser List for Unit Tests as Recomended
2022-06-15 23:26:27 +02:00
Claus-Peter Hübner
b9c48d8760 ignore .dbeaver 2022-06-15 23:09:32 +02:00
Claus-Peter Hübner
493d1b1858 add rules and loggers in AdminResolver 2022-06-15 23:05:59 +02:00
ogerly
0690b744a3 fix locales 2022-06-15 22:42:44 +02:00
ogerly
5374b41905 refactor review from claus-peter 2022-06-15 22:33:31 +02:00
Claus-Peter Hübner
9f3006af6b Merge remote-tracking branch 'origin/master' into
1906-feature-concept-for-gdd-creation-per-linkqr-code
2022-06-15 21:57:03 +02:00
Moriz Wahl
ab69ee0a77 update browser list for unit tests as recomended 2022-06-15 20:41:22 +02:00
Moriz Wahl
1de8c94ba3 rename updatePendingCreation 2022-06-15 20:01:53 +02:00
Moriz Wahl
2b87cbcd18 rename confirmPendingCreation 2022-06-15 19:33:40 +02:00
Moriz Wahl
dd04f69ecc rename deletePendingCreation 2022-06-15 19:22:01 +02:00
Moriz Wahl
d95b1893cd rename getPendingCreations 2022-06-15 19:13:19 +02:00
Moriz Wahl
244cf20542 further renaming 2022-06-15 19:02:47 +02:00
Moriz Wahl
3eddb226d8 save transaction id on confirmed contribution 2022-06-15 16:57:51 +02:00
Moriz Wahl
94eb2d8f39 add transaction id to contribution 2022-06-15 16:57:09 +02:00
Moriz Wahl
6623849337 Merge branch 'master' into contributions-table 2022-06-15 16:50:50 +02:00
Moriz Wahl
e550d7ebbf
Merge branch 'master' into merge-1979-with-1923 2022-06-15 16:17:15 +02:00
Moriz Wahl
a6ca269352
Merge pull request #1979 from gradido/crud-contribution-link
feat: CRUD for Contribution Links in Admin Resolver
2022-06-15 16:16:56 +02:00
Moriz Wahl
5b7cb5cdf4 test CL-prefix on contribution links 2022-06-15 16:08:16 +02:00
Moriz Wahl
64a7f4aa6f remove CL-prefix for contribution links in tests 2022-06-15 16:04:14 +02:00
Moriz Wahl
fbb629cac5 remove CL-prefix 2022-06-15 15:52:11 +02:00
Moriz Wahl
4d58320426 new backend config version to have COMMUNITY_REDEEM_CONTRIBUTION_URL 2022-06-15 15:29:10 +02:00
Moriz Wahl
ad3bb58d43 createContributionLink response contains contribution id 2022-06-15 15:19:29 +02:00
Moriz Wahl
cf8ecb4c10 update rights 2022-06-15 15:11:05 +02:00
Moriz Wahl
eabd14bdf3 further renaming 2022-06-15 09:04:34 +02:00
ogerly
6ab7216a78 remove unused code, fix lint, locales, stylelint 2022-06-15 08:48:03 +02:00
ogerly
814afa3a4d add query: listContributionLinks 2022-06-15 08:46:49 +02:00
Moriz Wahl
e60f06bb9b rename mutations to create admin contributions 2022-06-15 08:32:30 +02:00
ogerly
2dd415676a refactor graphql listContributionLinks 2022-06-15 08:29:17 +02:00
Moriz Wahl
916706a973 fix mutation for admin mass creation 2022-06-15 08:21:53 +02:00
ogerly
68006dcdf9 Merge branch 'crud-contribution-link' into merge-1979-with-1923 2022-06-15 08:05:37 +02:00
ogerly
7e682425c5 merge 1923 and resolve conflict 2022-06-15 07:52:30 +02:00
ogerly
e074c99773 fix test 2022-06-15 07:42:05 +02:00
ogerly
60b6b82279 fix locales 2022-06-15 07:42:05 +02:00
ogerly
f4783165cc change data for database createContributionLink 2022-06-15 07:42:05 +02:00
Wolfgang Huß
2bdf98bc15
Update frontend/src/locales/de.json
Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>
2022-06-15 07:38:09 +02:00
Moriz Wahl
5845f708f6 rename from pending creation to unconfirmed contribution 2022-06-14 19:47:18 +02:00
Moriz Wahl
dcc1e9c2e7 proper type in seed 2022-06-14 19:19:12 +02:00