8839 Commits

Author SHA1 Message Date
Moriz Wahl
08f72e2777 Merge branch 'master' into contributions-table 2022-06-02 08:25:09 +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
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
ogerly
7c3cfd508f fixed stylelint 2022-06-01 10:18:40 +02:00
ogerly
cb7e3df9e6 learn more button add href and locales 2022-06-01 10:17:34 +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
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
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
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
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
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
Moriz Wahl
69a3cc0264 use new Contribution Data Model 2022-05-30 14:15:34 +02:00
Wolfgang Huß
4091413847 Remove thx page 2022-05-30 13:50:31 +02:00
Wolfgang Huß
eb34a9f6df Refactor test for ResetPassword.vue, fix 'only' 2022-05-30 13:25:22 +02:00
Wolfgang Huß
44d695d0a5 Refactor test for ResetPassword.vue 2022-05-30 12:44:45 +02:00
Wolfgang Huß
2b715fe338 Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page-#2 2022-05-30 12:06:35 +02:00
Alexander Friedland
afde83e2cb
Merge pull request #1946 from gradido/1883-remove-the-animated-coins-in-the-profile-settings
1883 remove the animated coins in the profile settings
2022-05-30 11:32:01 +02:00
Moriz Wahl
4c7fc10d8f change DB version 2022-05-30 10:57:25 +02:00
Moriz Wahl
617ea9a2b0 contribution entity 2022-05-30 10:56:54 +02:00
Moriz Wahl
e6d9420d8e migration to rename admin-pending-creations 2022-05-30 10:40:55 +02:00
Alexander Friedland
2c1dbcaee0
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 08:53:41 +02:00
Alexander Friedland
61c7938ba6
Merge pull request #1943 from gradido/1942-Replace-pictures-for-carousel
1942 replace pictures for carousel
2022-05-30 08:53:15 +02:00