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
4,955 Commits 1 Branch 0 Tags
Commit Graph

4955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
9f8c7e897f
Merge pull request #1207 from gradido/migration_0006-login_users_collation 
migration_0006_login_users_collation
 2021-12-21 20:13:46 +01:00
Ulf Gebhardt
aad32e16f3
Merge branch 'master' into migration_0006-login_users_collation 2021-12-21 15:54:37 +01:00
Hannes Heine
0aa57dd38b
Merge pull request #1179 from gradido/wrong_login_is_not_password_reset 
wrong_login_is_not_password_reset
 2021-12-21 15:43:44 +01:00
elweyn
56802e967f Change the Test of login.vue so we check the redirections. 2021-12-21 15:32:13 +01:00
Ulf Gebhardt
f83213fbed
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-21 13:55:51 +01:00
Hannes Heine
ee6ef4f869
Merge pull request #1185 from gradido/1165-refactor-admin-interface 
Moved reverse of the getPendingCreations to the AdminResolver instead…
 2021-12-21 12:14:25 +01:00
Hannes Heine
7716863f90
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-21 11:51:34 +01:00
Hannes Heine
2736414ae4
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-21 09:16:14 +01:00
Ulf Gebhardt
6ae330da51
update required database version 2021-12-21 07:08:17 +01:00
Ulf Gebhardt
1f8d7b8230
fixed two old User Entity definitions. This is legit since this never changed and just was a missing definition. (Normally it would be forbidden to change old entity models or migrations) 2021-12-21 02:58:11 +01:00
Ulf Gebhardt
cdd7d25024
description migration: 0002-add_settings 2021-12-21 02:46:23 +01:00
Ulf Gebhardt
e6ae25cd90
description migration: 0003-login_server_tables 2021-12-21 02:45:09 +01:00
Ulf Gebhardt
f7459b73ed
description migration: 0004-login_server_data 2021-12-21 02:42:32 +01:00
Ulf Gebhardt
c42e6f5e96
typo 2021-12-21 02:42:15 +01:00
Ulf Gebhardt
e90744e1f9
description migration: 0005-admin_tables 2021-12-21 02:37:05 +01:00
Ulf Gebhardt
a467c8d945
updated model accordingly 2021-12-21 02:34:52 +01:00
Ulf Gebhardt
0b0af7ae76
added migration 0006-login_users_collation 2021-12-21 02:33:54 +01:00
Hannes Heine
e7b2184a95
Merge pull request #1206 from gradido/1205-create-user-withdrew-password 
Withdrew password argument of createUser.
 2021-12-20 20:15:31 +01:00
elweyn
1688ded788 Withdrew password argument of createUser. 2021-12-20 15:26:51 +01:00
Ulf Gebhardt
e669a9eedf
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-20 13:15:39 +01:00
Ulf Gebhardt
7d31e5b154
Merge pull request #1195 from gradido/fix_optin_code_regeneration 
fix_optin_code_regeneration
 2021-12-20 13:11:35 +01:00
Ulf Gebhardt
ce973d1e78
Merge branch 'master' into fix_optin_code_regeneration 2021-12-20 12:36:48 +01:00
Hannes Heine
0a4af110d3
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-20 11:24:07 +01:00
Alexander Friedland
fe6f093847
Merge pull request #1149 from gradido/1078-GDD-Calculate-Decay-Tool-clear 
1057 display gdd balance when sending
 2021-12-17 13:17:40 +01:00
Alexander Friedland
96e5362cb4
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-17 12:23:10 +01:00
elweyn
238352bf24 Change the removeConfirmResult so we switch over the event possibilities instead of an if else logic. 2021-12-17 09:05:24 +01:00
Hannes Heine
fedd1d626d
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-17 08:47:59 +01:00
Hannes Heine
523696748a
Merge pull request #1164 from gradido/1145-refactor-admin-resolver-from-master 
1145 refactor admin resolver from master
 2021-12-16 20:06:12 +01:00
Hannes Heine
6ba0c16776
Merge branch 'master' into 1145-refactor-admin-resolver-from-master 2021-12-16 13:00:01 +01:00
Alexander Friedland
b846fac6ed
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-16 12:53:42 +01:00
Alexander Friedland
ef50176ba0
Merge pull request #1183 from gradido/Error-handling-in-GddTransactionList 
Error handling in GddTransactionList.vue
 2021-12-16 12:52:55 +01:00
Ulf Gebhardt
8edd750912
fixed optIn Code generation - a new Code is now generated when the 10 min delay is expired 2021-12-16 12:30:04 +01:00
elweyn
52acec0820 Tests for SendOverview send transaction steps 2021-12-16 12:11:16 +01:00
ogerly
de7549596e error query set individually 2021-12-16 09:45:51 +01:00
Alexander Friedland
ab3b4f40bb
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-15 07:55:34 +01:00
Alexander Friedland
d1de2b5820
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-15 07:55:17 +01:00
Alexander Friedland
ca0f122f4e
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-15 07:55:08 +01:00
Alexander Friedland
ada332e8a2
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-14 13:05:05 +01:00
ogerly
725e5a29e9 add propsData in SendOverview.spec.js, yarn lint --fix 2021-12-14 12:48:24 +01:00
ogerly
17d16df87c yarn locales --fix 2021-12-14 11:24:56 +01:00
ogerly
e03534108e Status component removed from SendOverview 2021-12-14 11:24:04 +01:00
ogerly
00c2c85306 Send transaction confirm, new amount structured 2021-12-14 11:22:30 +01:00
Alexander Friedland
4530e53ce7
Merge branch 'master' into Error-handling-in-GddTransactionList 2021-12-14 10:01:28 +01:00
ogerly
1cc35170e9 yarn lint --fix 2021-12-14 09:48:12 +01:00
ogerly
6ab394d46f english translations for the test 2021-12-14 09:47:37 +01:00
ogerly
4cfd2206fe test no transactions, test transaction is empty 2021-12-14 09:44:52 +01:00
Alexander Friedland
0818ddcf66
Update frontend/src/locales/en.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-14 09:12:49 +01:00
Alexander Friedland
96dc03e0df
Update frontend/src/locales/de.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-14 09:12:40 +01:00
elweyn
985895c624 Merge branch 'wrong_login_is_not_password_reset' of https://github.com/gradido/gradido into wrong_login_is_not_password_reset 2021-12-14 08:14:04 +01:00
elweyn
f1b28a640e In case where their is no password set now we need to send the user to a page to change his password. 2021-12-14 08:09:47 +01:00