8721 Commits

Author SHA1 Message Date
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
e48d2d6c8f
Merge pull request #1927 from gradido/1926-button-concept
1926 button concept for gradido template
2022-05-30 07:50:39 +02:00
Alexander Friedland
cbe4a9330c
Merge branch 'master' into 1926-button-concept 2022-05-30 07:41:12 +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
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
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
36732d28ec
Merge branch 'master' into 1936-rename-files-in-auth-folder 2022-05-26 08:49:47 +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
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
Alexander Friedland
b5a0a62ed6
Merge branch 'master' into 1936-rename-files-in-auth-folder 2022-05-25 12:50:18 +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
ogerly
08c9b5f92e rename files from auth folder, rule vue name = name files 2022-05-25 11:07:11 +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
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
clauspeterhuebner
0559d12a07
Merge pull request #1711 from gradido/1676-feature-federation-technical-concept
1676 feature federation technical concept
2022-05-25 00:48:56 +02:00
clauspeterhuebner
b096613c69
Merge branch 'master' into 1676-feature-federation-technical-concept 2022-05-25 00:36:45 +02:00
clauspeterhuebner
75b6ac9d0c
Merge pull request #1842 from gradido/1823-Describe_Setup_on_Windows
more details about Windows installation
2022-05-25 00:33:53 +02:00
clauspeterhuebner
2889d564a7
Merge branch 'master' into 1823-Describe_Setup_on_Windows 2022-05-25 00:23:17 +02:00
clauspeterhuebner
fc4c14a58c
Merge pull request #1797 from gradido/1574-Concept_to_introduce_Gradido-ID
Concept to Introduce Gradido ID
2022-05-25 00:20:55 +02:00
Moriz Wahl
8d94306f70
Merge branch 'master' into 1676-feature-federation-technical-concept 2022-05-24 18:02:49 +02:00
Moriz Wahl
6a5f49f485
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID 2022-05-24 17:03:19 +02:00
clauspeterhuebner
6e8346252e
Merge pull request #1796 from gradido/1793-feature-concept-of-business-event-protocol
first draft of concept event protocol
2022-05-24 17:02:13 +02:00
Moriz Wahl
81e8cb2481
Merge branch 'master' into 1793-feature-concept-of-business-event-protocol 2022-05-24 16:44:01 +02:00
ogerly
ff867523ab fixed test for Register.spec.js 2022-05-24 13:22:32 +02:00
ogerly
9587b95ee6 fixed stylelint 2022-05-24 12:14:09 +02:00
ogerly
225eec36de fixed stylelint 2022-05-24 12:13:05 +02:00
ogerly
57c4c6ad06 Merge branch '1926-button-concept' into 1916-remove-select-language-from-register-form 2022-05-24 12:00:37 +02:00
ogerly
c7b727e984 add button disable 2022-05-24 11:47:48 +02:00
ogerly
bfb64d0618 remove language input from register 2022-05-24 10:44:32 +02:00
ogerly
60945b0f72 fixed stylelint 2022-05-24 09:05:09 +02:00
ogerly
44f9c96d95 refactor gradido template button, hover 2022-05-24 08:37:37 +02:00
Alexander Friedland
78021a401f
Merge pull request #1693 from gradido/1682-new-design-for-the-login-and-registration-area
1682 new design for the login and registration area
2022-05-24 07:26:54 +02:00
Moriz Wahl
db9e5201d3
Merge branch 'master' into 1793-feature-concept-of-business-event-protocol 2022-05-23 19:24:58 +02:00
Moriz Wahl
825f5598fc
Merge branch 'master' into 1676-feature-federation-technical-concept 2022-05-23 19:23:46 +02:00
Moriz Wahl
a9ddedf447
Merge branch 'master' into 1823-Describe_Setup_on_Windows 2022-05-23 19:22:50 +02:00
Alexander Friedland
fbf5849139
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-05-23 16:37:05 +02:00
Moriz Wahl
2039e1a4ec
Merge pull request #1915 from gradido/fix-db-connection-charset
fix: Database Connection Charset to utf8mb4_unicode_ci
2022-05-23 16:10:37 +02:00