10976 Commits

Author SHA1 Message Date
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
Alexander Friedland
a34ed43469
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 08:43:31 +02:00
Alexander Friedland
33a110069f
Merge branch 'master' into 1942-Replace-pictures-for-carousel 2022-05-30 08:43:22 +02:00
Alexander Friedland
6005cbe620
Merge pull request #1941 from gradido/1933-auth-footer-is-not-on-one-level
1933 auth footer is not on one level
2022-05-30 08:43:01 +02:00
Alexander Friedland
a863ba8fca
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 08:23:19 +02:00
Alexander Friedland
e6ac5d6072
Merge branch 'master' into 1942-Replace-pictures-for-carousel 2022-05-30 08:23:07 +02:00
Alexander Friedland
9542218441
Merge branch 'master' into 1933-auth-footer-is-not-on-one-level 2022-05-30 08:23:01 +02:00
Alexander Friedland
a4089aab71
Merge pull request #1935 from gradido/1929-styling-new-template-for-password-component
1929 styling new template for password component
2022-05-30 08:22:37 +02:00
Alexander Friedland
05f7b301ff
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 08:12:08 +02:00
Alexander Friedland
767097e7e7
Merge branch 'master' into 1942-Replace-pictures-for-carousel 2022-05-30 08:12:02 +02:00
Alexander Friedland
843c5f1505
Merge branch 'master' into 1933-auth-footer-is-not-on-one-level 2022-05-30 08:11:52 +02:00
Alexander Friedland
fb41e85c29
Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-30 08:11:15 +02:00
Moriz Wahl
da8a7c087f
Merge branch 'master' into add-timezone-to-decay-start-block 2022-05-30 07:52:36 +02:00
Moriz Wahl
c436c80988
Merge branch 'master' into use-logger-categories 2022-05-30 07:51:41 +02:00
Moriz Wahl
28d876e71c log errors as error 2022-05-30 07:51:13 +02:00
Alexander Friedland
e48d2d6c8f
Merge pull request #1927 from gradido/1926-button-concept
1926 button concept for gradido template
2022-05-30 07:50:39 +02:00
Moriz Wahl
b40aa58553
Merge branch 'master' into update-license-in-package-json 2022-05-30 07:43:12 +02:00
Moriz Wahl
94baba53c5
Merge branch 'master' into add-timezone-to-decay-start-block 2022-05-30 07:42:25 +02:00
Alexander Friedland
cbe4a9330c
Merge branch 'master' into 1926-button-concept 2022-05-30 07:41:12 +02:00
Alexander Friedland
03fcb6f450
Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-30 07:39:44 +02:00
Alexander Friedland
57ddd8ab77
Merge branch 'master' into 1933-auth-footer-is-not-on-one-level 2022-05-30 07:39:02 +02:00
Alexander Friedland
040bcceec6
Merge branch 'master' into 1942-Replace-pictures-for-carousel 2022-05-30 07:37:29 +02:00
Alexander Friedland
95a65b0b21
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 07:37:16 +02:00
Hardy
d3d17f2053
Merge pull request #1930 from gradido/1916-remove-select-language-from-register-form
1916 remove select language from register form
2022-05-29 19:40:18 +02:00
ogerly
abd1e62fc3 remove unused backend variable 2022-05-29 12:48:10 +02:00
ogerly
18d0249029 remove files und code from coinanimation in backend 2022-05-29 12:36:00 +02:00
ogerly
32f8e43c90 remove files and code from coinanimation settings 2022-05-29 12:08:28 +02:00
Alexander Friedland
47a89154a0
Merge branch 'master' into 1933-auth-footer-is-not-on-one-level 2022-05-29 11:05:55 +02:00
ogerly
831034a555 change interval for carousel to 13000 2022-05-29 11:04:19 +02:00
ogerly
c1e060add6 rename files from auth folder, rule vue name = name files 2022-05-29 11:04:19 +02:00
ogerly
5d50cfd753 change interval for carousel to 13000 2022-05-29 10:57:23 +02:00
ogerly
02fd1d3c8f change interval for carousel 2022-05-29 10:56:23 +02:00
ogerly
13053f4d1a Merge branch 'master' into 1942-Replace-pictures-for-carousel 2022-05-29 10:37:20 +02:00
ogerly
8bca6ddd96 carousel interval from 3000 to 13000 2022-05-29 10:35:06 +02:00
Alexander Friedland
011d978db3
Merge branch 'master' into 1926-button-concept 2022-05-29 10:08:50 +02:00
Alexander Friedland
a9fb1b480e
Merge branch 'master' into 1916-remove-select-language-from-register-form 2022-05-29 10:08:31 +02:00
ogerly
f402d79576 Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-29 09:37:49 +02:00
ogerly
21c56da0fe rename files from auth folder, rule vue name = name files 2022-05-29 09:26:40 +02:00
Alexander Friedland
425788ab97
Merge pull request #1937 from gradido/1936-rename-files-in-auth-folder
rename files from auth folder, rule vue name = name files
2022-05-29 09:19:36 +02:00
Alexander Friedland
f2a38d27a2
Merge branch 'master' into 1926-button-concept 2022-05-26 08:50:41 +02:00