699 Commits

Author SHA1 Message Date
31a3837fa5
right check for searchUsers & verifyLogin 2021-11-25 09:01:23 +01:00
Hannes Heine
72f06ede08 Change the date calculation so we get the three last month and next month as string and search with this values. 2021-11-25 08:57:40 +01:00
754bd89723
lint 2021-11-25 08:49:47 +01:00
77dc54155a
Merge branch 'master' into backend_rights
# Conflicts:
#	admin/src/router/guards.js
#	admin/src/store/store.js
#	backend/src/graphql/resolver/UserResolver.ts
#	frontend/src/components/SidebarPlugin/SideBar.vue
#	frontend/src/graphql/queries.js
#	frontend/src/routes/guards.js
2021-11-25 08:49:06 +01:00
Hannes Heine
1d612c034e add users Promis all 2021-11-25 08:08:27 +01:00
Moriz Wahl
2f92aec460 Merge branch 'master' into admin_pending_creation 2021-11-24 21:27:44 +01:00
a24c6119a6
check rights on all resolvers 2021-11-24 19:41:26 +01:00
cefc963780
implemented isAdmin from backend 2021-11-24 19:38:42 +01:00
Moriz Wahl
b0ac9b6632 Merge branch 'login_admin_interface' of github.com:gradido/gradido into login_admin_interface 2021-11-24 18:26:38 +01:00
Moriz Wahl
ac7eb303b4 Merge branch 'master' into login_admin_interface 2021-11-24 18:23:31 +01:00
Moriz Wahl
fa717e7046 Merge branch 'master' into ADMINBEREICH-first-step 2021-11-24 18:03:38 +01:00
Hannes Heine
e67b724058 Calculate the usedAmount with the pending amounts. 2021-11-24 16:08:01 +01:00
Hannes Heine
7c0f1cfc0f Query Builder to get the pending creation amount of this, last and beforeLast Month 2021-11-24 16:04:40 +01:00
Hannes Heine
91089c6668 Change the result value to the sum value. 2021-11-24 14:46:56 +01:00
Hannes Heine
3cd5ab27db Change getRawOne to getOne. 2021-11-24 14:40:22 +01:00
Hannes Heine
6a2a4ee649 Change where to >= 2021-11-24 14:37:42 +01:00
Hannes Heine
3ec7960865 Withdrew table name from query builder. 2021-11-24 14:29:07 +01:00
Hannes Heine
9193eeb6a8 Change calls to have query for last three months. 2021-11-24 14:23:32 +01:00
Hannes Heine
735a47779f Prepare complete query 2021-11-24 14:13:22 +01:00
Hannes Heine
e825184b4d Divide the call to get the last 2021-11-24 14:09:59 +01:00
Hannes Heine
7abf1e4c44 Add where date > 2 month 2021-11-24 13:54:37 +01:00
Hannes Heine
53adaf49ee Change Query select 2021-11-24 13:51:45 +01:00
Hannes Heine
16aef73adc Addawait 2021-11-24 13:49:35 +01:00
Hannes Heine
1112b538ea Addawait to get the datas 2021-11-24 13:45:07 +01:00
Hannes Heine
00abbb4413 Add console log of query and id 2021-11-24 13:43:01 +01:00
Hannes Heine
cadec27c9a Reintroduced table name 2021-11-24 13:38:30 +01:00
Hannes Heine
db609d1d78 Change query to query bui. 2021-11-24 13:36:42 +01:00
Hannes Heine
7a27bf52bf Change query to query builder withdrew table name. 2021-11-24 13:35:31 +01:00
Hannes Heine
76b372fb64 Change query to query builder. to get many 2021-11-24 13:34:08 +01:00
Hannes Heine
6a152a8791 Change query to query builder. 2021-11-24 13:31:27 +01:00
Hannes Heine
1a0c0907c4 Corrected. 2021-11-24 13:09:30 +01:00
ogerly
b5baa9d883 Added PendingCreationRepository and added find all pending creations. 2021-11-24 12:29:49 +01:00
ogerly
367122fb1b Search db for transactions. 2021-11-24 12:08:38 +01:00
ogerly
ed5baeccc0 Implementation of the TransactionCreationRepository. 2021-11-24 11:46:12 +01:00
ogerly
c68386be85 Test log. 2021-11-24 11:27:22 +01:00
ogerly
4544d701fb Withdrew Promise 2021-11-24 11:23:21 +01:00
ogerly
0dcceb682e add function getUserCreations 2021-11-24 11:11:48 +01:00
ogerly
048d75f167 Added a default random value for the last three creations. 2021-11-24 11:09:53 +01:00
ogerly
cd12d621fe Methode to get user creations. 2021-11-24 10:51:40 +01:00
ogerly
5f8235c7af Added last todo before sending success. 2021-11-24 10:42:05 +01:00
ogerly
f3cd722e9f User creations logic in comments. 2021-11-24 10:41:34 +01:00
ogerly
c2c03d1032 implementation of createPendingCreation search for the state_user. 2021-11-24 10:40:49 +01:00
87059a6588
Merge branch 'master' into login_hook_elopage 2021-11-24 09:08:14 +01:00
fc054cc2f9
Merge branch 'master' into login_admin_interface 2021-11-24 09:06:56 +01:00
dc1715eea0
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-24 08:50:54 +01:00
8354aad277
lint fix 2021-11-24 04:18:11 +01:00
d07bd472b0
catch errors with klicktipp - do not fail setPassword on failing klicktipp 2021-11-24 04:15:50 +01:00
4bdcff8152
fixed save optin code problem,
corrected URL
2021-11-24 04:12:01 +01:00
51f7d48566
- make setPassword a mutation
- fix repository stuff
2021-11-24 03:55:24 +01:00
58992b639a
fix pubkey on state_user table - write zeros 2021-11-24 03:30:23 +01:00