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

6854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
8eaed23af4
transactionResolver 
- remove unnecessary function
- use of the enity model directly
- corrected spelling
- show specific error when sending to a deleted user
 2022-02-18 12:47:33 +01:00
Ulf Gebhardt
4a51231bf9
admin resolver 
- use entity instead of repository
- include deleted users in our query for pending transactions
- throw an error when trying to add or confirm a pending transaction for a deleted user
 2022-02-18 12:44:35 +01:00
ogerly
3bd9e66079 add in backend deletedAt in UserAdmin.ts and AdminResolver.ts and in AdminFrontend add deletedAt in searchUser.js 2022-02-18 12:06:18 +01:00
ogerly
9e6c8e9e76 Merge branch 'users_soft_delete' into test-softdeleted 2022-02-18 11:09:00 +01:00
Ulf Gebhardt
185c38c12a
updated database version 2022-02-18 11:02:22 +01:00
ogerly
5c8bc402f0 Merge branch '1508-En-and-disable-an-account-in-the-admin-interface' into test-softdeleted 2022-02-18 09:47:08 +01:00
ogerly
903effb164 Merge branch 'users_soft_delete' into test-softdeleted 2022-02-18 09:46:46 +01:00
ogerly
19930eec45 yarn locales fix 2022-02-18 09:33:39 +01:00
ogerly
e654b75147 change wording, deactivated to deleted 2022-02-18 09:32:41 +01:00
ogerly
671dacef53 remove unused code and icon, refactor button for filter deleted user 2022-02-18 09:27:01 +01:00
Alexander Friedland
dbebc4ba0b
Merge branch 'master' into 1459-List-Data-again-on-Confirm-Creation 2022-02-18 00:54:10 +01:00
ogerly
40bcc3ff8c prepared the deletion of a user in the admin area. 2022-02-17 20:17:16 +01:00
Moriz Wahl
8f8c9ab534 fix tests (check for minus signs) 2022-02-17 15:58:20 +01:00
Moriz Wahl
ab33b953fb use vue-moment again 2022-02-17 15:08:43 +01:00
Moriz Wahl
804f9837f4 linting 2022-02-17 14:07:10 +01:00
Moriz Wahl
10090756a1 avoid moment, use minus signs 2022-02-17 13:55:45 +01:00
Moriz Wahl
48435f0d8b Merge branch 'backend-tests-running-again' of github.com:gradido/gradido into backend-tests-running-again 2022-02-17 12:33:10 +01:00
Moriz Wahl
4a5d1980a5 afterAll at top 2022-02-17 12:32:51 +01:00
Alexander Friedland
d63f93149c
Merge pull request #1515 from gradido/1466-404-Page-needs-Back-to-Login-Button 
404 page needs back to login button
 2022-02-17 10:58:18 +01:00
Ulf Gebhardt
0683ff1999
fixed backend deletedAt instead of disabled 2022-02-17 10:53:49 +01:00
ogerly
62efedeecb make a function goback() from router go-1 in adminarea 2022-02-17 10:43:28 +01:00
ogerly
62260857c5 make a function goback() from router go-1 in frontend wallet 2022-02-17 10:43:28 +01:00
Ulf Gebhardt
864f1b085d
missing change 2022-02-17 10:42:31 +01:00
Alexander Friedland
e64ab0c4f7
Merge branch 'master' into 1466-404-Page-needs-Back-to-Login-Button 2022-02-17 10:31:31 +01:00
Alexander Friedland
9e16e66704
Merge pull request #1514 from gradido/1461-Admin-Interface-Version-Commit 
feature: show current version in admin footer
 2022-02-17 10:27:11 +01:00
Ulf Gebhardt
d76798e02f
fixed factories 2022-02-17 10:08:33 +01:00
ogerly
a0b8d8266f yarn test fixed frontend walet 2022-02-17 10:01:46 +01:00
ogerly
f677657628 yarn test fixed adminarea 2022-02-17 10:01:19 +01:00
Ulf Gebhardt
bc43c495ad
replace disabled (flag) with deletedAt (date) on users 2022-02-17 10:00:02 +01:00
ogerly
f7fa134346 yarn test fixed 2022-02-17 09:57:52 +01:00
ogerly
ed6ee0f823 add locales on back button in PageNotFound 2022-02-17 09:39:06 +01:00
ogerly
e5c9822fbe yarn lint --fix and yarn locales fix in adminarea 2022-02-17 09:37:50 +01:00
ogerly
4bbc9772ac frontend yarn lint --fix 2022-02-17 09:32:57 +01:00
ogerly
7cb3dd397d adminarea yarn lint --fix 2022-02-17 09:32:35 +01:00
ogerly
f5b533c3fe add go -1 back if 404 page not found in frontend wallet 2022-02-17 09:30:39 +01:00
ogerly
68d53bc6bc add go -1 back if 404 page not found in adminarea 2022-02-17 09:30:17 +01:00
ogerly
b514539917 add version in footer 2022-02-17 09:03:31 +01:00
Moriz Wahl
6140ce19ed
Merge pull request #1512 from gradido/never-sent-email-text 
fix: Never Sent Email Text
 2022-02-16 23:25:45 +01:00
Moriz Wahl
71e5052288
Merge branch 'master' into never-sent-email-text 2022-02-16 13:48:41 +01:00
Moriz Wahl
fe8546da08 add typeorm package 2022-02-16 13:19:46 +01:00
Moriz Wahl
631346b63c remove deleted entities 2022-02-16 13:19:27 +01:00
Moriz Wahl
1335bb8e26 activate UserResolver test again 2022-02-16 13:18:59 +01:00
Moriz Wahl
34741b9802
Merge branch 'master' into backend-tests-running-again 2022-02-16 12:40:47 +01:00
Ulf Gebhardt
87d1a11c3b
Merge pull request #1405 from gradido/static_decay_block 
refactor: static decay block
 2022-02-16 12:38:06 +01:00
Moriz Wahl
fccf64ec36 set time zone in package json 2022-02-16 12:29:24 +01:00
Ulf Gebhardt
a37b479158
fixed sendCoins 2022-02-16 12:29:16 +01:00
Moriz Wahl
a3d697182d fix: Backend Unit Tests Running Again 2022-02-16 12:26:27 +01:00
Ulf Gebhardt
374841feb3
corrected migration name & config db version 2022-02-16 12:05:46 +01:00
Moriz Wahl
6f53054328 adjust variable name 2022-02-16 11:53:14 +01:00
Moriz Wahl
37354a010a
add test to ensure that the date of the decay start block cannot be changed by mistake 2022-02-16 11:51:32 +01:00