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 |
|
ogerly
|
0c928ceeb0
|
fixed tests
|
2022-05-25 08:59:25 +02:00 |
|
ogerly
|
2cf4cc4a18
|
refactor set and reset passwort component for new style
|
2022-05-25 08:51:03 +02:00 |
|
clauspeterhuebner
|
55e3dcd67d
|
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code
|
2022-05-25 01:09:41 +02:00 |
|
clauspeterhuebner
|
e7252e4c16
|
Update .gitignore
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-05-25 00:52:09 +02:00 |
|
clauspeterhuebner
|
e7bdd8490f
|
Update .gitignore
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-05-25 00:51:57 +02:00 |
|
clauspeterhuebner
|
c4f1421a15
|
Update .gitignore
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-05-25 00:51:40 +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 |
|
Claus-Peter Hübner
|
71ca21137f
|
final reworks
|
2022-05-25 00:06:15 +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
|
44d62b535c
|
fix: Add Timezone to Decay Start Block
|
2022-05-24 16:55:44 +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 |
|
Wolfgang Huß
|
cba20e8490
|
Rename TransactionLinkFilters fields from by* back to with*
|
2022-05-24 10:15:18 +02:00 |
|
Wolfgang Huß
|
72e67194c4
|
Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj
|
2022-05-24 09:44:52 +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 |
|