10976 Commits

Author SHA1 Message Date
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
clauspeterhuebner
d02a826e57
Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-01 01:47:24 +02:00
Claus-Peter Hübner
2444c94af9 create migration and entity for new contribution_links table 2022-06-01 01:19:44 +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
ogerly
8ada8f0163 changes code 2022-05-31 15:30:22 +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
ogerly
64430f6b28 add emit and props for update formular 2022-05-31 13:31:47 +02:00
ogerly
1a7d08f66a add events and emits on list buttons, 2022-05-31 12:05:55 +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
ogerly
cac229d0be add example methods getAutomaticCreations 2022-05-31 09:42:15 +02:00
Alexander Friedland
5103075649
Merge branch 'master' into 1923-Allow-Admin-to-CRUD-Contribution-Links 2022-05-31 09:39:33 +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
ogerly
edcdaa9bd4 formular structur, add props and apollo methods example 2022-05-31 09:38:33 +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
Moriz Wahl
625867514c
Merge branch 'master' into update-license-in-package-json 2022-05-31 09:18:45 +02:00
Moriz Wahl
e474541d3c
Merge pull request #1918 from gradido/flow-chart-creations
docu: Creation Flowchart
2022-05-31 09:18:32 +02:00
Moriz Wahl
dee2a9ccdd
Merge branch 'master' into flow-chart-creations 2022-05-31 08:58:51 +02:00
Moriz Wahl
0d42c263b3
Merge pull request #1912 from gradido/use-logger-categories
refactor: Use Logger Categories
2022-05-31 08:58:36 +02:00
Wolfgang Huß
5f2690949f Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj 2022-05-31 08:42:28 +02:00
ogerly
7cae100da4 delete ContributionsForm 2022-05-31 08:36:52 +02:00
ogerly
8a612c60fb add components AutomaticCreation, AutomaticCreationForm, AutomaticCreationList 2022-05-31 08:35:26 +02:00
Moriz Wahl
d915679497
Merge branch 'master' into use-logger-categories 2022-05-31 08:14:25 +02:00
Moriz Wahl
e44a41b22b contribution to transaction as transaction 2022-05-31 08:12:41 +02:00
Moriz Wahl
56ba42babd do not read confirmed and deleted contributions 2022-05-30 21:00:56 +02:00
ogerly
c5f8534bd8 add list, json, show, edit, delete and add form 2022-05-30 15:37:22 +02:00
Wolfgang Huß
8050b54a0b Fix locale sentence 2022-05-30 15:34:35 +02:00
Wolfgang Huß
254f94bc35 Remove eslint ignore 'site.login.signin' 2022-05-30 15:30:44 +02:00
Wolfgang Huß
5ea093a613 Remove comment 2022-05-30 15:25:22 +02:00
Wolfgang Huß
58e61fa140 Cleanup 2022-05-30 15:10:57 +02:00
Wolfgang Huß
ac7fe1172f Change locale identifiers from 'site.thx.*' to 'message.*' 2022-05-30 15:04:52 +02:00
Moriz Wahl
22944bce28 get tests running again 2022-05-30 15:00:23 +02:00
Moriz Wahl
fa2a05c35f enable soft delete 2022-05-30 14:59:51 +02:00
Moriz Wahl
5d8bf7f27c add logger to admin resolver, log some tracing, fix seeds 2022-05-30 14:50:58 +02:00