IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,360 Commits 1 Branch 0 Tags
Commit Graph

3143 Commits

Author SHA1 Message Date
Wolfgang Huß
3f502ea37a Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page 
# Conflicts:
#	frontend/src/pages/Login.spec.js
#	frontend/src/pages/Login.vue
 2022-04-21 10:15:31 +02:00
Wolfgang Huß
d63303c75c Refine error messages a bit more detailed 2022-04-21 10:02:48 +02:00
Wolfgang Huß
180d8b4e8d Put faulty deleted toaster in ForgotPassword page back 2022-04-21 09:56:07 +02:00
Wolfgang Huß
f245a3703c Refactor test for Login page 2022-04-21 09:51:47 +02:00
Wolfgang Huß
097d33fb97 Refactor Login page 2022-04-21 09:40:34 +02:00
Wolfgang Huß
13b5e02c24 Removed comment after Ulf's suggestion 2022-04-21 09:16:07 +02:00
Wolfgang Huß
3dddbabb99 Fix error after Ulf's hint 2022-04-21 09:09:54 +02:00
Wolfgang Huß
ef6b3c78df Fix translation of ForgotPassword login button text 2022-04-21 08:46:57 +02:00
Wolfgang Huß
0e0b5aef09 Refactor Message props 2022-04-20 14:58:54 +02:00
Alexander Friedland
58d0cf21b5
Merge branch 'master' into 1731-Fix-Startblock-Layouting 2022-04-20 14:44:10 +02:00
Wolgang Huß
3e98657c1f fixed tests for pagenation 2022-04-20 14:40:37 +02:00
Wolgang Huß
c0b56de91a remove unused computed code 2022-04-20 14:40:37 +02:00
Moriz Wahl
fd509bd216
Merge branch 'master' into frontend_community_info_bake_in 2022-04-20 13:48:01 +02:00
Moriz Wahl
29ec984289 fix test 2022-04-20 13:46:02 +02:00
Ulf Gebhardt
90f0b532e1
remove community to store tests 2022-04-20 13:38:56 +02:00
Wolfgang Huß
95746a7324 Refactor Message tests 2022-04-20 13:31:50 +02:00
Moriz Wahl
7af7ee09e5
Merge branch 'master' into load-transaction-links-on-click 2022-04-20 13:11:27 +02:00
Moriz Wahl
0da6cc6298
Merge branch 'master' into refactor-balance-model 2022-04-20 12:48:50 +02:00
Wolfgang Huß
b65cd0fd03 Refactor PasswordForgotten site 2022-04-20 12:47:01 +02:00
Wolfgang Huß
29745204b2 Create Message component 2022-04-20 12:46:39 +02:00
Moriz Wahl
35a6b560da
Merge branch 'master' into load-transaction-links-on-click 2022-04-20 12:35:44 +02:00
Wolgang Huß
d6f25b6f98 all headings centre col 12, all b-row in offset 1 and col 11 2022-04-20 12:34:54 +02:00
Moriz Wahl
6f8da4202a
Merge branch 'master' into refactor-balance-model 2022-04-20 12:01:55 +02:00
ogerly
1268b375b7 change config DECAY_START_TIME in UTC Timezone of 0000 2022-04-20 09:31:17 +02:00
Moriz Wahl
0b53cfa044 update test 2022-04-20 09:15:08 +02:00
Moriz Wahl
ff652fa72e load transaction link on click 2022-04-20 08:48:19 +02:00
ogerly
2ddf9cb33b fixed GdtBalance in tab visible 2022-04-19 15:08:53 +02:00
ogerly
7cae264f13 fixed test updateGdt on click on tab 2022-04-19 12:25:09 +02:00
Moriz Wahl
1b0f53ca64
Merge branch 'master' into refactor-balance-model 2022-04-19 11:10:24 +02:00
ogerly
17f8a47f7f add ref in childComponent and refs on click tab 2022-04-15 07:47:39 +02:00
ogerly
dfc4a7ddde remove mounted 2022-04-15 07:47:39 +02:00
Alexander Friedland
06cd75e8dd
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked 2022-04-15 07:47:26 +02:00
Alexander Friedland
672496499c
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked 2022-04-14 11:22:27 +02:00
Alexander Friedland
c4fd4bff63
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-14 10:17:25 +02:00
ogerly
26fd677098 resolve conflict 2022-04-14 09:49:08 +02:00
ogerly
703a46779d change qr-code image to color variant 2022-04-14 09:40:35 +02:00
ogerly
53d524c7f5 style work to end 2022-04-14 09:26:29 +02:00
ogerly
18c36ea0a4 add font WorkSans in App 2022-04-14 09:26:06 +02:00
ogerly
f15faeb37c add locales followUs 2022-04-14 09:18:46 +02:00
ogerly
13b9d87100 add footer component for AuthArea 2022-04-14 09:17:46 +02:00
ogerly
512637a407 add new font WorkSans 2022-04-14 09:17:03 +02:00
ogerly
9a0e2aca5b Merge branch '1763-remove-qr-code-from-profile-remove-unused-libraries' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-13 09:25:09 +02:00
ogerly
644369e367 merge 1763-remove-qr-code-from-profile-remove-unused-libraries 2022-04-13 09:23:55 +02:00
Alexander Friedland
934b5a2715
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-13 07:31:08 +02:00
Moriz Wahl
034fa5e7a9 add math minus, add minus operator if decay is zero 2022-04-12 23:09:40 +02:00
Moriz Wahl
997ef9d72a query only required fields on balance 2022-04-12 21:34:04 +02:00
Moriz Wahl
9a29652a12 remove unused data 2022-04-12 21:27:41 +02:00
Alexander Friedland
fcb3250b63
Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked 2022-04-12 20:53:20 +02:00
Alexander Friedland
979a48e438
Merge branch 'master' into 1755-insert-additional-set-when-redeeming 2022-04-12 20:48:28 +02:00
Ulf Gebhardt
9332eeff36
Merge branch 'master' into frontend_decay_start_block_as_static 2022-04-12 19:06:04 +02:00