9538 Commits

Author SHA1 Message Date
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
Alexander Friedland
b9bf369e17
Merge branch 'master' into 1916-remove-select-language-from-register-form 2022-05-26 08:50:23 +02:00
Alexander Friedland
4cc3684b59
Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-26 08:50:07 +02:00
Alexander Friedland
36732d28ec
Merge branch 'master' into 1936-rename-files-in-auth-folder 2022-05-26 08:49:47 +02:00
Alexander Friedland
1863a471c6
Merge branch 'master' into 1933-auth-footer-is-not-on-one-level 2022-05-26 08:49:31 +02:00
Claus-Peter Hübner
84c0c6f10b start creating contributionLinks table 2022-05-26 02:56:38 +02:00
ogerly
b21d65c078 add scss -webkit-border-radius for safari browser problems 2022-05-25 16:19:39 +02:00
Wolfgang Huß
cd398cce9f Refactor ResetPassword page to message component instead of thx page 2022-05-25 15:43:30 +02:00
ogerly
590659d4b7 change image 1 from carousel 2022-05-25 15:35:16 +02:00
Hardy
23895f084d
Merge pull request #1945 from gradido/Hardy-Hart-am-Start-patch-5
Add files Bild_1_2400.jpg
2022-05-25 15:16:50 +02:00
Hardy
e051660a35
Add files via upload 2022-05-25 15:06:31 +02:00
ogerly
4d0aad8be9 remove picture number 4 2022-05-25 14:49:03 +02:00
ogerly
7b98193967 change picture for carousel, interval from 3000 to 13000 2022-05-25 14:44:17 +02:00
Alexander Friedland
4e653b6798
Merge branch 'master' into 1926-button-concept 2022-05-25 14:24:51 +02:00
Alexander Friedland
df141fb1bb
Merge branch 'master' into 1916-remove-select-language-from-register-form 2022-05-25 14:24:09 +02:00
ogerly
1dee2f922c sperate class for color for navbar 2022-05-25 13:52:49 +02:00
Wolfgang Huß
8052fea91a Remove code from Message component, because it's not needed anymore as on thx page 2022-05-25 13:41:15 +02:00
ogerly
a49949d6ff change buton variant from primary to gradido 2022-05-25 13:01:43 +02:00
Wolfgang Huß
7f0d322064 Merge branch '1929-styling-new-template-for-password-component' of github.com:gradido/gradido into 1697-refactor-thx-page-#2
# Conflicts:
#	frontend/src/pages/ResetPassword.vue
2022-05-25 12:58:24 +02:00
Alexander Friedland
33aa318192
Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-25 12:51:31 +02:00
Wolfgang Huß
88b4cb3fd0 Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page-#2
# Conflicts:
#	frontend/src/pages/ForgotPassword.spec.js
#	frontend/src/pages/ResetPassword.vue
2022-05-25 12:51:28 +02:00
Alexander Friedland
b5a0a62ed6
Merge branch 'master' into 1936-rename-files-in-auth-folder 2022-05-25 12:50:18 +02:00
ogerly
87eb885429 fixed stylelint 2022-05-25 12:40:45 +02:00
ogerly
7a783cda62 change footer, link color hover, padding top, margin bottom 2022-05-25 12:38:56 +02:00
ogerly
68de978677 Merge branch '1926-button-concept' into 1933-auth-footer-is-not-on-one-level 2022-05-25 12:02:47 +02:00
Hardy
2d3a83a48b
Merge pull request #1940 from gradido/Hardy-Hart-am-Start-patch-3
Bilder für Slider
2022-05-25 11:57:00 +02:00
ogerly
3f17f8f5ed remove padding left right for .btn 2022-05-25 11:55:25 +02:00
Hardy
c6024fcdcb
Bilder für Slider
Bilder für slider in zwei Auflösungen 
Auflösung 1=888 x 2400px
Auflösung 2= 1281 x 1920px
2022-05-25 11:25:19 +02:00
Alexander Friedland
529511ad76
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-05-25 11:21:04 +02:00
ogerly
08c9b5f92e rename files from auth folder, rule vue name = name files 2022-05-25 11:07:11 +02:00
ogerly
b9be7ca5b7 chenage event name from is-mobile-start to set-mobile-start 2022-05-25 10:35:28 +02:00
ogerly
79d0eb5d03 chenage event name from is-mobile-start to set-mobile-start 2022-05-25 10:33:45 +02:00
ogerly
cf9f7a4294 remove old textFields for login, because is unused 2022-05-25 10:33:45 +02:00
Alexander Friedland
5a28623558
Merge branch 'master' into 1916-remove-select-language-from-register-form 2022-05-25 09:40:34 +02:00
Alexander Friedland
d42a5130f6
Merge branch 'master' into 1926-button-concept 2022-05-25 09:40:22 +02:00
Wolfgang Huß
f064575864 Refine tests in AdminResolver.test.ts 2022-05-25 09:31:41 +02:00
Alexander Friedland
2840cc2b63
Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-25 09:25:08 +02:00
Alexander Friedland
e3c28eeea0
Merge pull request #1917 from gradido/concept-contribution-analyse-from-elopage
contribution analysis of elopage and concept proposal
2022-05-25 09:23:45 +02:00
Alexander Friedland
7fee336c5a
Merge branch 'master' into concept-contribution-analyse-from-elopage 2022-05-25 09:09:52 +02:00