109 Commits

Author SHA1 Message Date
e35275cd55
fixed query to run successfully 2022-02-28 13:11:35 +01:00
50d13b10ab
Merge branch 'combine_transaction_tables2' into refactor_arithmetic
# Conflicts:
#	backend/src/config/index.ts
#	backend/src/graphql/model/Transaction.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	database/entity/Transaction.ts
#	database/src/interface/TransactionContext.ts
#	database/src/seeds/helpers/user-helpers.ts
2022-02-28 12:58:23 +01:00
50ef39d1a4
fixed transaction query in frontend 2022-02-27 03:12:25 +01:00
Alexander Friedland
533de795df
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-07 13:04:50 +01:00
ogerly
e76bae4585 Add firstTransaction to transactionList transactions query. 2022-02-07 12:01:39 +01:00
148bd6286c
cleaned frontend 2022-02-07 05:20:40 +01:00
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
Hannes Heine
5cbdbcb7c9
Merge branch 'master' into login_call_resetPassword 2021-11-25 10:22:15 +01:00
0c8e79bc74
cleanup ResetPassword & deleted unused queries 2021-11-24 03:57:07 +01:00
636c4c8df3
implement verifyLogin 2021-11-23 14:05:02 +01:00
41d6a7ba45
implemented isAdmin from backend 2021-11-23 12:48:59 +01:00
d1dfda81ce
removed password from createUser & implement setPassword 2021-11-23 12:00:14 +01:00
728aaa095f
first of several calls regarding password reset 2021-11-23 03:04:28 +01:00
9540ab3208
reduced checkUsername response to a boolean 2021-10-31 02:01:02 +01:00
elweyn
ad11d482e0 Missing files.. 2021-10-13 13:35:58 +02:00
elweyn
2d218e86ce Asking for hasElopage in login. 2021-10-12 16:50:26 +02:00
elweyn
06b7778f11 Made the community resolver work again & changes in frontend merged with 803-community-selection-page-of-registration-process 2021-10-05 10:13:28 +02:00
elweyn
5462e8b606 Merge master in this and resolve merge conflicts. 2021-10-05 08:06:09 +02:00
d78585309a
lint fixes 2021-10-02 17:15:36 +02:00
einhorn_b
2630de425d update GDT to use enums and switch-case 2021-10-02 16:41:21 +02:00
Einhornimmond
b5a7af16e7
bring load and save coinanimation to live 2021-10-02 13:54:09 +02:00
16d530489d
fixed query transactionsQuery 2021-10-02 12:34:03 +02:00
69bb8b7ea7
unify pagination to use currentPage, pageSize and order as values 2021-10-01 22:00:37 +02:00
elweyn
b66e0243ed Implementation of the Community in the backend. 2021-10-01 12:58:47 +02:00
Moriz Wahl
62142710f8 send coins as Mutations 2021-09-20 12:25:04 +02:00
Moriz Wahl
5ded9f60be createUser as Mutation 2021-09-20 12:02:17 +02:00
Moriz Wahl
e6d386c598 refactor: Queries to Mutations 2021-09-20 11:22:00 +02:00
elweyn
0d0c463c48 Lint fixe remove. 2021-09-16 13:15:14 +02:00
elweyn
ad1aa402f4 KlickTipp subscribe and unsubscribe, merge master. 2021-09-16 10:38:08 +02:00
Moriz Wahl
12a5f58376 no token in login response. token is inside response header 2021-09-13 13:30:53 +02:00
elweyn
c108c0c21a Method param renamed to optin instead of option 2021-09-09 12:04:04 +02:00
elweyn
3c17b7cd60 Added a query to the backend that calls the checkEmail service, added a spinner, and the routes for the new CheckEmail vue. 2021-09-09 11:46:02 +02:00
Moriz Wahl
6811f45a1c feat: New JWT in Every Authenticated Response 2021-09-09 11:43:14 +02:00
elweyn
021952831f Merge master in the branch. 2021-09-05 10:45:50 +02:00
Moriz Wahl
8c729c1723
Merge pull request #777 from gradido/jwt-setup
feat: JSON Web Token for Authentification
2021-09-01 14:50:07 +02:00
einhornimmond
9b2afaafe5 add id to gdt entry 2021-08-31 12:11:17 +02:00
Moriz Wahl
02a70c5acf Gdt List without session ID 2021-08-30 17:47:59 +02:00
Moriz Wahl
60fa39c7e8 send coins without sessionId 2021-08-30 17:20:24 +02:00
Moriz Wahl
5ff9842c0b change user data without sessionId 2021-08-30 16:54:37 +02:00
Moriz Wahl
6ae5f6e23d logout without sessionId 2021-08-30 16:39:10 +02:00
Moriz Wahl
b2cdc69716 sessionId from JWT into context for resolver 2021-08-30 16:29:11 +02:00
Moriz Wahl
7610ad08b6 login expects JWT 2021-08-24 21:45:06 +02:00
elweyn
2af47e7581 Lint error said to remove '.' from this lines. 2021-08-23 14:39:39 +02:00
elweyn
c4345489c5 Klicktipp has two single optin apikeys one for en and one for de so we need to get the information of the language in the creation query. 2021-08-23 11:25:53 +02:00
Moriz Wahl
3a40b5104f gdt transaction list is working 2021-08-16 18:23:38 +02:00
Moriz Wahl
b633c7006c try to get gdt transactionlist working 2021-08-16 17:36:10 +02:00
elweyn
594030eb9a Changes to the graphql query and the datas needed for the gdtTransactions. 2021-08-16 16:13:18 +02:00
Hannes Heine
f93e62e412 Withdrew the community gdt call in apollo server and client definitions. 2021-08-13 14:52:07 +02:00
Hannes Heine
d82eb9f081 Merged master into apollo-client branch. Withdrew the communityAPI call for the gdtTransactionList and replaced it with the apollo query. 2021-08-12 21:00:31 +02:00
Hannes Heine
ef69683cbb Added the checkUsername query. 2021-08-10 16:49:19 +02:00