elweyn
|
75cbea2321
|
Change the transactionList query so we can get only creation and get the list for specific users.
|
2021-12-20 15:15:51 +01:00 |
|
Moriz Wahl
|
53b4e32e53
|
Merge branch 'catch-no-cookies' of github.com:gradido/gradido into catch-no-cookies
|
2021-12-20 15:06:19 +01:00 |
|
Moriz Wahl
|
e61d5a0bdb
|
Log error message to console, test is not working
|
2021-12-20 15:05:49 +01:00 |
|
Moriz Wahl
|
905e280463
|
Merge branch 'master' into catch-no-cookies
|
2021-12-20 14:27:33 +01:00 |
|
Hannes Heine
|
3860822058
|
Merge branch 'master' into adminCreateMultiplePendingCreations
|
2021-12-20 13:40:59 +01:00 |
|
|
|
e669a9eedf
|
Merge branch 'master' into wrong_login_is_not_password_reset
|
2021-12-20 13:15:39 +01:00 |
|
|
|
7d31e5b154
|
Merge pull request #1195 from gradido/fix_optin_code_regeneration
fix_optin_code_regeneration
|
2021-12-20 13:11:35 +01:00 |
|
|
|
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 |
|
elweyn
|
9bc13c39a6
|
Merge branch '1200-editing-a-creation-is-not-displayed-in-formular' into 1197-admin-interface-created-transactions-list
|
2021-12-20 10:47:11 +01:00 |
|
ogerly
|
021e5d3151
|
removed unused import.
|
2021-12-20 10:35:02 +01:00 |
|
ogerly
|
198657b795
|
Fix lint.
|
2021-12-20 10:32:51 +01:00 |
|
ogerly
|
bc00ddfdc7
|
UserSearch implement the filter on every user that has not activate his account yet.
|
2021-12-20 10:32:17 +01:00 |
|
ogerly
|
8e974bbc22
|
Check for emailChecked in the user search and giving the value to the UserTable
|
2021-12-20 10:01:53 +01:00 |
|
ogerly
|
39a4705ef4
|
remove unused lines
|
2021-12-20 09:40:17 +01:00 |
|
ogerly
|
16f373c120
|
add details_edit_true on editCreationUserTable
|
2021-12-20 09:38:55 +01:00 |
|
ogerly
|
0e896ef7d2
|
SendActivationEmail mutation added to the admin and linked to the resendEmailFunction.
|
2021-12-20 09:31:40 +01:00 |
|
elweyn
|
d3105bbbad
|
Merge branch '1197-admin-interface-created-transactions-list' into 1196-send-registration-link
|
2021-12-20 09:15:29 +01:00 |
|
Hannes Heine
|
04bea42261
|
Merge branch 'master' into adminCreateMultiplePendingCreations
|
2021-12-20 09:11:47 +01:00 |
|
ogerly
|
9f6106d4ae
|
remove unused imported files
|
2021-12-20 08:37:33 +01:00 |
|
ogerly
|
5f2537b08d
|
add CreationsTransaction List Icon und Component and function, example list data
|
2021-12-19 20:51:21 +01:00 |
|
ogerly
|
659d966a68
|
add function sendRegisterMail in ConfirmRegisterMailFormular.vue button
|
2021-12-19 19:12:26 +01:00 |
|
ogerly
|
af39826ce5
|
remove unused function in ConfirmRegisterMailFormular.vue button
|
2021-12-19 19:04:35 +01:00 |
|
ogerly
|
578f4835b1
|
add test ConfirmRegisterMailFormular.spec.js
|
2021-12-19 18:50:31 +01:00 |
|
ogerly
|
ea4b74e051
|
function unconfirmedRegisterMail added
|
2021-12-19 14:24:29 +01:00 |
|
ogerly
|
d8440a5956
|
yarn lint --fix
|
2021-12-19 13:52:05 +01:00 |
|
ogerly
|
531bba0391
|
change text
|
2021-12-19 13:51:46 +01:00 |
|
ogerly
|
1ceff2311f
|
yarn lint --fix
|
2021-12-19 13:48:34 +01:00 |
|
ogerly
|
9bc71d1af0
|
register mail send style and function added
|
2021-12-19 13:47:30 +01:00 |
|
ogerly
|
e23180896f
|
merge 1165-Admin-issues-regarding-code-quality-syle
|
2021-12-19 13:07:02 +01:00 |
|
ogerly
|
d13b341bae
|
Switching between two form additions is clean
|
2021-12-19 13:03:34 +01:00 |
|
ogerly
|
bb703f9fa8
|
clean code from creation or confirm registermail formular
|
2021-12-19 12:58:22 +01:00 |
|
ogerly
|
2ea0a18075
|
show an hide creation or confirm registermail formular
|
2021-12-19 12:56:58 +01:00 |
|
ogerly
|
cfc502593d
|
add cell confirm_mail, mail icon in Usertabel Usersearch
|
2021-12-19 11:59:37 +01:00 |
|
ogerly
|
02a211a7fe
|
code tidy, yarn lint
|
2021-12-19 10:45:58 +01:00 |
|
ogerly
|
49fa943063
|
only have one creation form box open at a time.
|
2021-12-19 10:44:38 +01:00 |
|
ogerly
|
147e3c18b9
|
row.detailsShowing clearing, remove console.logs
|
2021-12-18 21:39:43 +01:00 |
|
Alexander Friedland
|
21f884bb87
|
Merge branch 'master' into 1165-Admin-issues-regarding-code-quality-syle
|
2021-12-18 21:02:15 +01:00 |
|
ogerly
|
a46d1acce7
|
show details of a user only once in the table. close open details automatically
|
2021-12-18 17:15:11 +01:00 |
|
Hannes Heine
|
543c32cabe
|
Merge branch 'master' into 1196-send-registration-link
|
2021-12-18 11:41:23 +01:00 |
|
ogerly
|
6e9b65b6e0
|
close all showDetails prepared
|
2021-12-17 13:22:16 +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
|
ffe3cdf700
|
Config of resendTime to resendPassword logic
|
2021-12-17 11:12:52 +01:00 |
|
elweyn
|
da527dd162
|
Database logics when resending activation link
|
2021-12-17 11:04:12 +01:00 |
|
elweyn
|
7f650b9755
|
Adding a configurable resend_time in minutes.
|
2021-12-17 11:01:23 +01:00 |
|
elweyn
|
8c5fff73ef
|
Refactoring of the sendActivationEmail so that we can send another email with a new activation link.
|
2021-12-17 09:49:45 +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 |
|