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

95 Commits

Author SHA1 Message Date
Wolfgang Huß
f6f487aa7e Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 
# Conflicts:
#	backend/src/auth/RIGHTS.ts
 2022-06-16 14:23:35 +02:00
ogerly
5de39268f6 merge master, resolve conflict 2022-06-16 07:30:55 +02:00
Moriz Wahl
1de8c94ba3 rename updatePendingCreation 2022-06-15 20:01:53 +02:00
Moriz Wahl
2b87cbcd18 rename confirmPendingCreation 2022-06-15 19:33:40 +02:00
Moriz Wahl
dd04f69ecc rename deletePendingCreation 2022-06-15 19:22:01 +02:00
Moriz Wahl
d95b1893cd rename getPendingCreations 2022-06-15 19:13:19 +02:00
Moriz Wahl
eabd14bdf3 further renaming 2022-06-15 09:04:34 +02:00
Moriz Wahl
e60f06bb9b rename mutations to create admin contributions 2022-06-15 08:32:30 +02:00
ogerly
2dd415676a refactor graphql listContributionLinks 2022-06-15 08:29:17 +02:00
Moriz Wahl
916706a973 fix mutation for admin mass creation 2022-06-15 08:21:53 +02:00
ogerly
256c84d132 changes db types 2022-06-14 13:35:11 +02:00
ogerly
27d8570592 chnages in /admin/ 2022-06-14 12:27:39 +02:00
Wolfgang Huß
98f1f48d1d Implement mutation 'setUserRole' in frontend 2022-06-13 10:10:23 +02:00
Wolfgang Huß
96c168c854 Add 'ChangeUserRoleFormular.vue' to 'SearchUserTable' 2022-06-08 10:49:23 +02:00
Alexander Friedland
f99855e1ea
Merge branch 'master' into 1923-Allow-Admin-to-CRUD-Contribution-Links 2022-06-07 13:38:53 +02:00
ogerly
77d5825ea2 rename from AutomaticCobtribution to ContributionLink, add locales 2022-06-07 11:19:31 +02:00
ogerly
ac88b08785 add mutation and query for automatic creations, create, list, delete 2022-06-06 12:39:45 +02:00
Moriz Wahl
7ee664b8c8 set defaults for transcation link list filters in query 2022-06-01 14:12:41 +02:00
Wolfgang Huß
14ea920a24 Remove ObjectType from SearchUsersFilters and rename SearchUsersFiltersInput to the same name 2022-05-23 06:57:43 +02:00
Wolfgang Huß
762bdfc505 Refactor frontend user search to refactored resolver 2022-05-19 10:58:48 +02:00
Wolfgang Huß
0f8ffb5860 Refactor to have filters GQL object and input for usererSearch, a start 2022-05-18 14:46:19 +02:00
Moriz Wahl
bd6e5a2679
Merge branch 'master' into test-admin-resolver 2022-04-28 16:14:07 +02:00
Moriz Wahl
d14d4c5640 remove moderator from update pending creation mutation args 2022-04-27 11:57:41 +02:00
Moriz Wahl
2aa7772d20 remove moderator ID form create pending creation mutation args 2022-04-27 11:03:34 +02:00
Wolfgang Huß
ee18ae41b9 Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted 2022-04-27 09:24:20 +02:00
Ulf Gebhardt
7b86c4bc24
admin use decimal instead of float for pending creations in graphql queries 2022-04-21 13:49:29 +02:00
Wolfgang Huß
0bf18a4f2b Revert unintenionally renamimngs 2022-04-21 11:08:28 +02:00
Wolfgang Huß
0c0bfe1a10 Rename to filterByActivated and filterByDeleted 2022-04-21 10:52:11 +02:00
Wolfgang Huß
621786c91d Rename after suggestion emailChecked withActivated and deletedAt to withDeleted 2022-04-21 07:54:41 +02:00
Wolfgang Huß
e8aba86430 Rename isDeleted to deletedAt 2022-04-20 08:53:12 +02:00
Wolfgang Huß
03e1624c11 Rename isEmailChecked to emailChecked 2022-04-20 08:48:13 +02:00
Wolfgang Huß
145989e284 Replace notActivated by isEmailChecked 2022-04-19 14:43:25 +02:00
ogerly
db8e112648 add count in graphql query 2022-03-25 20:19:01 +01:00
ogerly
76d6b308cf add deletedAt in query, change locales expired to valid_until 2022-03-25 08:27:36 +01:00
Moriz Wahl
752228a7ea query transaction links as admin 2022-03-22 19:06:22 +01:00
ogerly
af7105191e show table with transaction links from user 2022-03-22 11:10:44 +01:00
ogerly
942d4d2d3a rename from getListTransactionLinks to listTransactionLinks 2022-03-22 11:10:04 +01:00
ogerly
5ab0295051 add graphql query listTransactionLinks 2022-03-22 09:31:23 +01:00
Moriz Wahl
612b8ca69c Merge branch 'master' into no-float-ids 2022-03-19 13:07:53 +01:00
Moriz Wahl
6124e0764f datatype Int for Ids 2022-03-17 13:02:50 +01:00
Moriz Wahl
f21e0ed038 only creations transaction list with admin rights 2022-03-17 11:20:26 +01:00
ogerly
25b1a5a83e admin area creation transaction list 2022-03-06 11:52:29 +01:00
ogerly
3b656898e1 add isDeleted in backend, delete and undelete is activ by return 2022-02-22 14:45:43 +01:00
ogerly
fc3d7e2cbb
add in backend function unDeleteUser() 2022-02-22 12:18:07 +01:00
ogerly
fed3562e4d
add in backend function deleteUser() 2022-02-22 12:18:06 +01:00
ogerly
9f4762647b
add deletedUser and unDeleteUser function in admin frontend 2022-02-22 12:18:06 +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
Moriz Wahl
7e54251f71 display coorect date when the last confirmation email was sent 2022-02-10 08:08:48 +01:00
ogerly
c66e459572 Add hasElopage for each user to the graphql query searchUsers. 2022-02-07 10:40:15 +01:00
Moriz Wahl
ddd9e4ecc0 perPage as data parameter 2022-01-18 12:51:59 +01:00