8882 Commits

Author SHA1 Message Date
Claus-Peter Hübner
538f21cdbb rework the creation-rules for contribution 2022-06-02 23:54:16 +02:00
clauspeterhuebner
6bc0177f02
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-06-02 22:35:44 +02:00
Moriz Wahl
06319f2c66
Merge pull request #1968 from gradido/version-1.9.0
devops: Release Version 1.9.0
2022-06-02 15:40:38 +02:00
Moriz Wahl
9f9c6aed79 devops: Release Version 1.9.0 2022-06-02 14:28:27 +02:00
Wolfgang Huß
7bf026f704
Merge pull request #1914 from gradido/1840-refactor-to-filter-object--sub-rename+filters-obj
refactor: 🍰 Refactor To `filters` Object And Rename Filters Properties
2022-06-02 11:44:54 +02:00
Wolfgang Huß
8264b18d43 Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj 2022-06-02 11:22:37 +02:00
Wolfgang Huß
ca8ce34f68 Move 'searchUsers' query from mutations to queries, correct and refine test descriptions 2022-06-02 11:21:57 +02:00
Alexander Friedland
343864b6f1
Merge pull request #1964 from gradido/1963-remove-d-flex-from-col-in-register
refactor register button position
2022-06-02 09:02:26 +02:00
ogerly
de7a41516a refactor register button position 2022-06-02 08:04:21 +02:00
clauspeterhuebner
05ef8f26ef
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-06-02 02:35:44 +02:00
Claus-Peter Hübner
602c532ab0 add description for 1st-expansion-stade 2022-06-02 02:30:50 +02:00
Claus-Peter Hübner
a979f80d55 Merge branch '1906-feature-concept-for-gdd-creation-per-linkqr-code' of
github.com:gradido/gradido into
1906-feature-concept-for-gdd-creation-per-linkqr-code
2022-06-02 00:16:30 +02:00
Alexander Friedland
b58e653d28
Merge pull request #1958 from gradido/1956-redemption-link-is-not-displayed-in-the-mobile-version
fixed redeem link is mobile start false
2022-06-01 14:45:19 +02:00
Moriz Wahl
7ee664b8c8 set defaults for transcation link list filters in query 2022-06-01 14:12:41 +02:00
Moriz Wahl
2c67d5f5fe filter args optional, now default values 2022-06-01 14:11:50 +02:00
Moriz Wahl
70b1119840 queries in queries file instead of mutations 2022-06-01 14:10:37 +02:00
Wolfgang Huß
6bdcd867e7 Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj 2022-06-01 10:48:13 +02:00
Alexander Friedland
117a13c3d8
Merge branch 'master' into 1956-redemption-link-is-not-displayed-in-the-mobile-version 2022-06-01 10:40:56 +02:00
Alexander Friedland
bad6b00e63
Merge pull request #1959 from gradido/1951-remove-back-link-and-remove-gray-box
1951 remove back link and remove gray box
2022-06-01 10:40:32 +02:00
ogerly
119b8cdb96 remove computed learnMore 2022-06-01 10:37:32 +02:00
Wolfgang Huß
8650f86a7d Put expected directly into the test after Moriz suggestion to get it better to debug 2022-06-01 10:26:53 +02:00
Wolfgang Huß
3f8c1169ba Fix wrongly changed month on transaction links data 2022-06-01 10:19:46 +02:00
ogerly
7c3cfd508f fixed stylelint 2022-06-01 10:18:40 +02:00
Wolfgang Huß
5601dcc5f8 Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj 2022-06-01 10:18:29 +02:00
ogerly
cb7e3df9e6 learn more button add href and locales 2022-06-01 10:17:34 +02:00
Wolfgang Huß
06b5aaaa1c
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-01 10:05:02 +02:00
Wolfgang Huß
517034dcab
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-01 10:02:38 +02:00
Wolfgang Huß
d6556cd02c
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-01 10:01:20 +02:00
ogerly
8c81d2fe49 add button variant from primary to gradido 2022-06-01 09:46:26 +02:00
ogerly
4f15e4e3cd add href for front button link to gradido 2022-06-01 09:44:14 +02:00
ogerly
4fd13f8e32 fixed test, fixed lint 2022-06-01 08:17:20 +02:00
ogerly
922e44adcd remove gray box and back link 2022-06-01 08:15:13 +02:00
ogerly
d1d2ce9565 fixed redeem link is mobile start false 2022-06-01 07:49:57 +02:00
Claus-Peter Hübner
9c21481414 resolve conflicts in .gitignore 2022-06-01 02:34:14 +02:00
Claus-Peter Hübner
80c3958be6 Merge remote-tracking branch 'origin/master' into
1906-feature-concept-for-gdd-creation-per-linkqr-code
2022-06-01 02:32:00 +02:00
Alexander Friedland
fd1496232d
Merge pull request #1955 from gradido/1952-Change-footer-icons-color-an-remove-save-login
1952 change footer icons color an remove save login
2022-05-31 21:06:22 +02:00
ogerly
d12f31f62a change locales 2022-05-31 15:51:08 +02:00
ogerly
8cda603324 change footer icon color to #383838 2022-05-31 15:45:04 +02:00
ogerly
eebc4421c1 remove save login checkbox locales 2022-05-31 15:40:33 +02:00
ogerly
0fea0a092b remove save login checkbox from login page 2022-05-31 15:38:53 +02:00
Moriz Wahl
b9ce1ce964
Merge pull request #1954 from gradido/SPDX-license
fix: License should be a valid SPDX license expression
2022-05-31 15:03:52 +02:00
Moriz Wahl
c922bd6b6f fix: License should be a valid SPDX license expression 2022-05-31 14:11:09 +02:00
Wolfgang Huß
1640484c93
Merge pull request #1858 from gradido/1697-refactor-thx-page-#2
refactor: 🍰 Refactor THX Page – 2. Step
2022-05-31 11:20:08 +02:00
Wolfgang Huß
3ea19b2050 Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page-#2 2022-05-31 11:09:05 +02:00
Wolfgang Huß
56873b6f18 Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj 2022-05-31 11:01:46 +02:00
Wolfgang Huß
514a38ea38 Make transaction link filter object nullable 2022-05-31 11:00:56 +02:00
Wolfgang Huß
cabb844c2c Fix creation date for transaction links for seeding
- Add some commented code for future testing of 'withRedeemed', 'withExpired'.
2022-05-31 10:43:15 +02:00
Moriz Wahl
27258d7409
Merge pull request #1931 from gradido/add-timezone-to-decay-start-block
fix: Add Timezone to Decay Start Block
2022-05-31 09:38:47 +02:00
Moriz Wahl
c8931e0740
Merge branch 'master' into add-timezone-to-decay-start-block 2022-05-31 09:27:27 +02:00
Moriz Wahl
a3025f65dd
Merge pull request #1925 from gradido/update-license-in-package-json
devops: Update License in all package.json
2022-05-31 09:27:11 +02:00