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

152 Commits

Author SHA1 Message Date
elweyn
0271a42741 Use user entity instead of user model. 2022-08-24 10:56:19 +02:00
elweyn
1c433e2d57 Add graphql object that will be returned instead of dbEntity. 2022-08-23 11:53:19 +02:00
Moriz Wahl
69f4b98473 Merge branch 'master' into statistics-resolver 2022-08-17 15:22:57 +02:00
Alexander Friedland
632141ffca
Merge branch 'master' into statistics-resolver 2022-08-17 12:44:31 +02:00
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
elweyn
d3238fd486 Fix linting. 2022-08-15 11:05:11 +02:00
elweyn
304732bdad Add model for AdminUser 2022-08-10 11:27:27 +02:00
Claus-Peter Hübner
35da60c572 change User to create a gradidoID as uuidv4 during createUser 2022-08-09 23:36:00 +02:00
Alexander Friedland
58512a9e32
Merge branch 'master' into statistics-resolver 2022-08-06 11:14:58 +02:00
elweyn
c8267cf774 Add contributionDate to the Contribution object. 2022-07-20 10:42:24 +02:00
elweyn
495fbfd05c Change linkCount to contributionCount and linkList to contributionList. 2022-07-18 11:31:04 +02:00
elweyn
fdea5f68ef Add confirmedBy and confirmedAt for the contribution query. 2022-07-14 16:43:20 +02:00
elweyn
c02f575780 Withdrew userid from contribution object. 2022-07-14 12:59:21 +02:00
elweyn
2f90bd9811 Withdrew User from Contribution object and replaced it with userId, firstName and lastName. 2022-07-14 12:58:01 +02:00
elweyn
7c698de325 Add constructor to ContributionListResult. 2022-07-14 12:25:45 +02:00
Moriz Wahl
ff93ce3b29
Merge branch 'master' into statistics-resolver 2022-07-13 16:12:15 +02:00
Moriz Wahl
8a3c825371 feat: Login Returns Open Creations for User 2022-07-12 10:27:52 +02:00
Moriz Wahl
924db68d06 setup community statistics 2022-07-07 15:52:55 +02:00
elweyn
3ce80fc081 Remove unused imports. 2022-06-30 16:47:44 +02:00
elweyn
f19a6f1d15 Create model for Contribution and create function to query listContributions. 2022-06-30 13:58:21 +02:00
elweyn
70b22f3dbe Remove unused import of FULL_CREATION_AVAILABLE const. 2022-06-29 12:00:35 +02:00
elweyn
c7ea879e36 Change return value of createContribution from Boolean to UnconfirmedContribution, add constructor to UnconfirmedContribution. 2022-06-29 11:56:18 +02:00
elweyn
4d4f6979da Change moderator so that it can be null. 2022-06-27 13:41:11 +02:00
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
Moriz Wahl
244cf20542 further renaming 2022-06-15 19:02:47 +02:00
Moriz Wahl
6623849337 Merge branch 'master' into contributions-table 2022-06-15 16:50:50 +02:00
Moriz Wahl
fbb629cac5 remove CL-prefix 2022-06-15 15:52:11 +02:00
Moriz Wahl
4d58320426 new backend config version to have COMMUNITY_REDEEM_CONTRIBUTION_URL 2022-06-15 15:29:10 +02:00
Moriz Wahl
eabd14bdf3 further renaming 2022-06-15 09:04:34 +02:00
Moriz Wahl
5845f708f6 rename from pending creation to unconfirmed contribution 2022-06-14 19:47:18 +02:00
Moriz Wahl
fd2f6a16b7 lsit contribution links query 2022-06-14 12:10:16 +02:00
Moriz Wahl
f258f63ee7 test createContributionLink 2022-06-14 10:43:03 +02:00
Moriz Wahl
1e0b246252 simple createContributionLink mutation 2022-06-14 09:44:37 +02:00
Moriz Wahl
bd593e96ae roles and args for contribution links 2022-06-14 09:23:51 +02:00
Moriz Wahl
5456e6dae4 add ContributionLink graphQL model 2022-06-13 13:19:03 +02:00
Wolfgang Huß
f71bf5da30 Add 'isAdmin' property to 'UserAdmin' and 'AdminResolver', 'searchUsers' 2022-06-08 10:48:03 +02:00
Moriz Wahl
08f72e2777 Merge branch 'master' into contributions-table 2022-06-02 08:25:09 +02:00
Moriz Wahl
69a3cc0264 use new Contribution Data Model 2022-05-30 14:15:34 +02:00
ogerly
18d0249029 remove files und code from coinanimation in backend 2022-05-29 12:36:00 +02:00
Moriz Wahl
a0e29e2524 remove moderator from update pending creation mutation args 2022-04-27 12:06:01 +02:00
Ulf Gebhardt
0299fffbee
Merge branch 'master' into database_admin_pending_creations_decimal 
# Conflicts:
#	backend/src/config/index.ts
 2022-04-25 15:13:03 +02:00
Ulf Gebhardt
e9906f3908
Merge branch 'master' into database_admin_pending_creations_decimal 2022-04-25 14:08:00 +02:00
Moriz Wahl
7e4d4bf607
Merge branch 'master' into eliminate-server-user-table 2022-04-22 11:18:00 +02:00
Ulf Gebhardt
56ed35d692
backend fix types for admin_pending_creations is now decimal 2022-04-21 13:49:29 +02:00
Ulf Gebhardt
19f2686b6e
Merge branch 'master' into 1637-generate-link-backend 
# Conflicts:
#	frontend/src/components/ClipboardCopy.vue
#	frontend/src/components/GddSend/TransactionResultLink.vue
#	frontend/src/components/TransactionLinks/TransactionLink.vue
#	frontend/src/components/Transactions/TransactionLinkSummary.spec.js
 2022-04-21 13:14:52 +02:00
Moriz Wahl
fa6fbe38c8 User.isAdmin as nullable Date 2022-04-21 11:05:51 +02:00
Moriz Wahl
e3a807ed95
Merge branch 'master' into eliminate-server-user-table 2022-04-20 13:08:43 +02:00
Moriz Wahl
324de93814 update/remove comments 2022-04-20 12:51:34 +02:00
Moriz Wahl
6691be813f decontruct input 2022-04-20 12:44:21 +02:00
Moriz Wahl
64859a71f4 use isAdmin on user to determine if user is admin 2022-04-20 11:27:09 +02:00