IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,090 Commits 1 Branch 0 Tags
Commit Graph

9090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
548a6c7582 Decrement backend coverage minimum to 68 2022-06-20 16:59:19 +02:00
Wolfgang Huß
b88e01c818 Merge branch '1880-no-throw-when-register-with-existing-email' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email 2022-06-20 16:12:24 +02:00
Wolfgang Huß
91959aea28 Fulfill Moriz suggestions 2022-06-20 16:08:35 +02:00
Wolfgang Huß
50f5667288 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email 
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
 2022-06-20 13:56:25 +02:00
Moriz Wahl
660f4764a1
Merge pull request #1993 from gradido/release-v1.10.0 
release: v1.10.0
 2022-06-17 15:25:36 +02:00
Moriz Wahl
0171d9f44c release: v1.10.0 2022-06-17 15:15:49 +02:00
Alexander Friedland
64605afc16
Merge pull request #1988 from gradido/merge-frontend-redeem-contribution-link 
frontend redeem contribution link
 2022-06-17 15:07:29 +02:00
Moriz Wahl
8ce97391e1
Update frontend/src/pages/TransactionLink.spec.js 2022-06-17 14:11:52 +02:00
Moriz Wahl
b1beaeb2db
Merge branch 'master' into merge-frontend-redeem-contribution-link 2022-06-17 13:59:49 +02:00
Moriz Wahl
19b1cb12cf Merge branch 'master' into merge-frontend-redeem-contribution-link 2022-06-17 13:59:31 +02:00
Moriz Wahl
4475da0fbe fix tests 2022-06-17 13:58:46 +02:00
Alexander Friedland
372478caab
Merge pull request #1990 from gradido/1989-change-start-pictures 
change new start picture
 2022-06-17 12:51:44 +02:00
Alexander Friedland
0578d3620f
Merge branch 'master' into 1989-change-start-pictures 2022-06-17 12:39:17 +02:00
Moriz Wahl
94f541ff23
Merge pull request #1987 from gradido/redeem-contribution-link 
feat: Redeem Contribution Link
 2022-06-17 12:21:44 +02:00
ogerly
6ecc10318d remove double whitespace 2022-06-17 09:42:35 +02:00
ogerly
881c7637ef change new startimage 2022-06-17 08:29:48 +02:00
ogerly
964c6d8256 fix lint 2022-06-17 07:55:22 +02:00
ogerly
1d66b9511c remove alert 2022-06-16 23:55:57 +02:00
ogerly
6210ff8597 fix test for LanguageSwitch2 2022-06-16 23:31:07 +02:00
Moriz Wahl
65326358c4
Merge branch 'master' into merge-frontend-redeem-contribution-link 2022-06-16 17:04:18 +02:00
ogerly
b1b74f5c1b fix test 2022-06-16 16:45:23 +02:00
ogerly
33ed4db29a set redeem valid amount 2022-06-16 16:07:23 +02:00
ogerly
0d0d6bec9a fix locales 2022-06-16 16:03:53 +02:00
ogerly
3ed8d71aef check contribution link valid 2022-06-16 16:03:01 +02:00
Moriz Wahl
845e3d3e61 get QueryLinkResult working 2022-06-16 15:11:13 +02:00
ogerly
a64f91cb13 fix lint 2022-06-16 14:35:08 +02:00
ogerly
ef881d94cd load contribution link and transaction link 2022-06-16 14:34:30 +02:00
ogerly
d1a26f6bff Merge branch 'redeem-contribution-link' into merge-frontend-redeem-contribution-link 2022-06-16 13:30:59 +02:00
Moriz Wahl
9020d29e85
Merge branch 'master' into redeem-contribution-link 2022-06-16 13:28:35 +02:00
Moriz Wahl
a959db8d03
Merge pull request #1986 from gradido/fix-max-amount-on-edit-contribution 
fix: Max Amount on Slider for Edit Contribution
 2022-06-16 13:28:22 +02:00
ogerly
e54c3f241c Merge branch 'master' into 1924-2-Allow-Users-to-Redeem-Contribution-Links 2022-06-16 13:25:11 +02:00
Moriz Wahl
399203adea
Merge branch 'master' into fix-max-amount-on-edit-contribution 2022-06-16 13:15:12 +02:00
Moriz Wahl
7bd66e8f78 true date for Dokuemnta in Seed 2022-06-16 13:13:56 +02:00
Moriz Wahl
9ca1ee3455 fix validation rules for redeem contribution link 2022-06-16 12:39:07 +02:00
Alexander Friedland
368b25449e
Merge pull request #1981 from gradido/merge-1979-with-1923 
CRUD contribution link admin interface
 2022-06-16 12:29:36 +02:00
ogerly
e0796d46fd test for form submit commented out 2022-06-16 12:20:36 +02:00
Moriz Wahl
1bfd463a2d decrease coverage backend :( 2022-06-16 12:08:21 +02:00
Moriz Wahl
232beb8bd9 quick and dirty confirm contribution link 2022-06-16 11:59:38 +02:00
ogerly
1a1d71e52f changed code for review from wolle 2022-06-16 11:45:45 +02:00
Moriz Wahl
06b5c7606c query for transaction link may find a contribution link 2022-06-16 10:57:38 +02:00
Moriz Wahl
409e44f679 store contribution link id on user when regsitered with contribution link code 2022-06-16 10:44:17 +02:00
ogerly
1ba7e86173 changed redeem for contribution link and transaction link 2022-06-16 10:21:59 +02:00
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
ogerly
5de39268f6 merge master, resolve conflict 2022-06-16 07:30:55 +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