8968 Commits

Author SHA1 Message Date
ogerly
d914781dfc changes in /backend/ 2022-06-14 12:28:22 +02:00
ogerly
27d8570592 chnages in /admin/ 2022-06-14 12:27:39 +02:00
ogerly
c3ea48c546 Merge branch '1923-Allow-Admin-to-CRUD-Contribution-Links' into merge-1979-with-1923 2022-06-14 11:19:54 +02:00
Moriz Wahl
e1a84eb52e add enum cycle type for contribution links 2022-06-14 10:45:10 +02:00
Moriz Wahl
f258f63ee7 test createContributionLink 2022-06-14 10:43:03 +02:00
Moriz Wahl
9a88db2b8f Merge branch 'master' into crud-contribution-link 2022-06-14 09:44:45 +02:00
Moriz Wahl
1e0b246252 simple createContributionLink mutation 2022-06-14 09:44:37 +02:00
Moriz Wahl
bd593e96ae roles and args for contribution links 2022-06-14 09:23:51 +02:00
ogerly
022d03bee4 fixed test 2022-06-13 23:04:53 +02:00
ogerly
955a16d24e remove unused apollo-link-http-commoms 2022-06-13 22:57:35 +02:00
ogerly
6f6d801fb6 change form and cycle values 2022-06-13 22:57:35 +02:00
clauspeterhuebner
cf728ed900
Merge pull request #1957 from gradido/1920-feature-create-contribution-link-table
1920 feature create contribution link table
2022-06-13 22:52:09 +02:00
Moriz Wahl
5456e6dae4 add ContributionLink graphQL model 2022-06-13 13:19:03 +02:00
Moriz Wahl
a84f11880f rename migration 0037 to what it acutally does 2022-06-13 12:31:40 +02:00
Moriz Wahl
795d339398 add type definitions, make code required (not null) 2022-06-13 12:23:57 +02:00
Moriz Wahl
83c8f9731e remove duplicate file 2022-06-13 12:05:13 +02:00
Moriz Wahl
5121910c83 rename ContributionLinks to ContributionLink, add CL entity to index 2022-06-13 12:03:15 +02:00
Moriz Wahl
5deaf597ed Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-13 12:02:20 +02:00
Alexander Friedland
46bbe625a2
Merge branch 'master' into 1923-Allow-Admin-to-CRUD-Contribution-Links 2022-06-13 11:51:04 +02:00
Wolfgang Huß
7860abb6ef
Merge pull request #1960 from gradido/1948-delete-settings-animationcoin-in-database
refactor: 🍰 Delete `user_setting` Table From DB
2022-06-13 11:31:13 +02:00
Alexander Friedland
0f61209aae
Merge branch 'master' into 1948-delete-settings-animationcoin-in-database 2022-06-10 07:24:05 +02:00
Claus-Peter Hübner
8a0147c811 shift enum in ticket #1921 2022-06-09 23:54:06 +02:00
Claus-Peter Hübner
d7ff6446d9 evaluate nullable columns vs entity 2022-06-09 23:52:40 +02:00
Claus-Peter Hübner
4c34542e80 rename column description to memo
Merge remote-tracking branch
'origin/1920-feature-create-contribution-link-table' into
1921-feature-contribution-link-crud-in-admin-resolver
2022-06-09 23:47:53 +02:00
Claus-Peter Hübner
94a48173e0 remove *.bak files from repo
Merge remote-tracking branch
'origin/1920-feature-create-contribution-link-table' into
1920-feature-create-contribution-link-table
2022-06-09 23:20:05 +02:00
Claus-Peter Hübner
2775a2006c Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1920-feature-create-contribution-link-table 2022-06-09 22:58:34 +02:00
Claus-Peter Hübner
e76817ebdb column validFrom NOT NULL 2022-06-09 22:55:52 +02:00
clauspeterhuebner
64c821e53a
Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-09 22:33:16 +02:00
Claus-Peter Hübner
7577f59406 Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1920-feature-create-contribution-link-table 2022-06-09 22:31:13 +02:00
Claus-Peter Hübner
3328c200d8 rework PR comments 2022-06-09 22:28:56 +02:00
clauspeterhuebner
83c66d052a
Update database/entity/0037-add_contribution_links_table/ContributionLinks.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-09 22:27:54 +02:00
clauspeterhuebner
b65aa5cefc
Update database/entity/0037-add_contribution_links_table/ContributionLinks.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-09 22:26:30 +02:00
clauspeterhuebner
114465c234
Update backend/src/config/index.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-09 22:24:22 +02:00
Alexander Friedland
f38fa23a7c
Merge branch 'master' into 1923-Allow-Admin-to-CRUD-Contribution-Links 2022-06-09 22:19:30 +02:00
Alexander Friedland
871b0f3220
Merge pull request #1969 from gradido/link-about-gradido-locales
locales link german, english navbar
2022-06-09 22:18:58 +02:00
Moriz Wahl
6b03bd96fb
Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-09 11:15:17 +02:00
Claus-Peter Hübner
fd352602ec delete value NONE from enum 2022-06-08 21:33:26 +02:00
Claus-Peter Hübner
605a6757a3 change default cycle-value to ONCE 2022-06-08 21:32:42 +02:00
ogerly
b7cb268ac9 changed test from FigureQrCode 2022-06-08 21:14:34 +02:00
ogerly
8294e9ca8f changed test to 95% 2022-06-08 21:09:52 +02:00
ogerly
a659ce2f19 fixed locales 2022-06-08 16:50:05 +02:00
ogerly
20103b1700 changed locales for start and enddate 2022-06-08 16:49:24 +02:00
ogerly
4730fdefaa changed locales 2022-06-08 16:42:06 +02:00
ogerly
60d6367da2 changed locales in DE 2022-06-08 15:15:02 +02:00
ogerly
23fb8839c8 remove test for methods in OpenCreationsTable 2022-06-08 15:12:46 +02:00
ogerly
f8da264482 add test methods OpenCreationsTable 2022-06-08 15:12:46 +02:00
Alexander Friedland
4a0eb8f671
Update admin/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-08 14:46:15 +02:00
Alexander Friedland
809d8bebe5
Update admin/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-08 14:45:56 +02:00
Alexander Friedland
1a6c1fe04d
Update admin/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-08 14:45:34 +02:00
Alexander Friedland
00c14bf914
Update admin/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-08 14:45:12 +02:00