Alexander Friedland
|
b9fa850094
|
Merge branch 'master' into 2152-Decrease-statistical-values-in-the-frontend
|
2022-08-25 09:04:27 +02:00 |
|
Alexander Friedland
|
9ff3ac9998
|
Update frontend/src/pages/InfoStatistic.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-08-25 09:04:13 +02:00 |
|
ogerly
|
5a0bbbf20d
|
add slots for messages
|
2022-08-24 22:36:26 +02:00 |
|
ogerly
|
66647d64f2
|
Merge branch '2131-crud-for-messages' into Contribution-Messages
|
2022-08-24 16:53:05 +02:00 |
|
elweyn
|
4dbcabf96d
|
Add where clause.
|
2022-08-24 16:52:42 +02:00 |
|
ogerly
|
0eb63689ee
|
Merge branch '2131-crud-for-messages' into Contribution-Messages
|
2022-08-24 16:45:59 +02:00 |
|
elweyn
|
057816e4c0
|
Change innerJoin to leftJoin, so that every contribution is shown not only the one with messages.
|
2022-08-24 16:43:32 +02:00 |
|
ogerly
|
938079d8b4
|
Merge branch '2131-crud-for-messages' into Contribution-Messages
|
2022-08-24 16:35:17 +02:00 |
|
ogerly
|
8b063639f6
|
add apollo mutation createContributionMessage
|
2022-08-24 16:34:23 +02:00 |
|
elweyn
|
a9c3dd25ed
|
Add RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES to the ROLES of Users.
|
2022-08-24 16:32:58 +02:00 |
|
elweyn
|
e0fcdb2cee
|
Add new RIGHT for LIST_ALL_CONTRIBUTION_MESSAGES.
|
2022-08-24 16:31:36 +02:00 |
|
elweyn
|
59df924e1d
|
Add User to Contribution link, query the messages user in the listContributions query.
|
2022-08-24 16:27:28 +02:00 |
|
ogerly
|
8adf366c52
|
Merge branch '2133-Messages-in-Admin-Interface' into Contribution-Messages
|
2022-08-24 14:52:30 +02:00 |
|
ogerly
|
5aee0ac7bb
|
resolve conflict
|
2022-08-24 14:52:05 +02:00 |
|
ogerly
|
95abc61964
|
Merge branch '2131-crud-for-messages' into Contribution-Messages
|
2022-08-24 14:50:03 +02:00 |
|
ogerly
|
2e0820ca9c
|
yarn locales
|
2022-08-24 14:47:18 +02:00 |
|
ogerly
|
7bc82db3c4
|
add apollo mutation adminCreateContributionMessage
|
2022-08-24 12:45:13 +02:00 |
|
ogerly
|
250c444722
|
Merge branch '2131-crud-for-messages' into 2133-Messages-in-Admin-Interface
|
2022-08-24 11:12:17 +02:00 |
|
ogerly
|
39c51a6698
|
Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet
|
2022-08-24 11:07:13 +02:00 |
|
ogerly
|
a0d765c7f2
|
add list and formular for contribution messages
|
2022-08-24 11:04:28 +02:00 |
|
elweyn
|
5dfe330168
|
Merge branch '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages
|
2022-08-24 10:58:00 +02:00 |
|
elweyn
|
dd2022df25
|
Add new values to query for contributions in frontend.
|
2022-08-24 10:57:52 +02:00 |
|
elweyn
|
bda04f87d2
|
Add messages and state to the contribution model.
|
2022-08-24 10:57:03 +02:00 |
|
elweyn
|
0271a42741
|
Use user entity instead of user model.
|
2022-08-24 10:56:19 +02:00 |
|
ogerly
|
1ac50875c0
|
Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet
|
2022-08-24 07:45:28 +02:00 |
|
Hannes Heine
|
9c609665e0
|
Merge branch 'master' into 2131-crud-for-messages
|
2022-08-23 16:06:20 +02:00 |
|
ogerly
|
0def6472d5
|
add files for ContributionMessages
|
2022-08-23 14:30:03 +02:00 |
|
ogerly
|
2855615462
|
add components ContributionMessagesList.vue
|
2022-08-23 14:13:58 +02:00 |
|
Alexander Friedland
|
b48c638c75
|
Merge branch 'master' into 2145-Corrections-style-for-frontend
|
2022-08-23 13:54:34 +02:00 |
|
ogerly
|
c2b4a4d082
|
test fix
|
2022-08-23 13:49:12 +02:00 |
|
Alexander Friedland
|
b08867bf9c
|
Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics
|
2022-08-23 13:49:01 +02:00 |
|
elweyn
|
41fb0d2a9f
|
Change export name of ContributionMessageResolver class.
|
2022-08-23 13:46:55 +02:00 |
|
clauspeterhuebner
|
bc83a15ab5
|
Merge pull request #2073 from gradido/2072-feature-usecase-contribution-messaging
2072 feature usecase contribution messaging
|
2022-08-23 13:46:29 +02:00 |
|
clauspeterhuebner
|
456fbd4b15
|
Merge branch 'master' into 2072-feature-usecase-contribution-messaging
|
2022-08-23 13:37:15 +02:00 |
|
ogerly
|
f8a67d6a2f
|
test fix
|
2022-08-23 13:37:01 +02:00 |
|
Alexander Friedland
|
ab641792d6
|
Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics
|
2022-08-23 13:30:14 +02:00 |
|
Alexander Friedland
|
55a8d3fe04
|
Merge branch 'master' into 2152-Decrease-statistical-values-in-the-frontend
|
2022-08-23 12:04:35 +02:00 |
|
mahula
|
b6a2516426
|
Merge pull request #2158 from gradido/2151-add-hint-to-redeem-link
2151 add hint to redeem link
|
2022-08-23 12:03:02 +02:00 |
|
elweyn
|
e3e4b61c57
|
Rename export of ContributionArgs to ContributionMessageArgs.
|
2022-08-23 11:59:24 +02:00 |
|
ogerly
|
2eecd472b4
|
delete fetchPolicy: 'network-only' from getCommunityStatistics
|
2022-08-23 11:57:23 +02:00 |
|
elweyn
|
2c459a8fae
|
Changed the Contribution.find so that we can throw a specific error, added an GraphQL Model as return value instead of DbEntity.
|
2022-08-23 11:55:34 +02:00 |
|
elweyn
|
1c433e2d57
|
Add graphql object that will be returned instead of dbEntity.
|
2022-08-23 11:53:19 +02:00 |
|
ogerly
|
f04e99cc48
|
deleted fetchPolicy: 'network-only from getContributionLinks'
|
2022-08-23 11:47:54 +02:00 |
|
mahula
|
1ea43130dc
|
adapt unit tests to link text changes
|
2022-08-23 11:41:01 +02:00 |
|
mahula
|
f55851e4d0
|
add hint text to copyLinkWithText method
|
2022-08-23 11:39:43 +02:00 |
|
ogerly
|
9e9ee42dbf
|
deleted fetchPolicy: 'network-only'
|
2022-08-23 11:39:09 +02:00 |
|
Alexander Friedland
|
f915b563cb
|
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-08-23 11:26:19 +02:00 |
|
Alexander Friedland
|
432186385f
|
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-08-23 11:26:13 +02:00 |
|
ogerly
|
f24461f924
|
delete unused locales
|
2022-08-23 11:23:45 +02:00 |
|
ogerly
|
a531d37c07
|
add components ContributionMessagesList.vue
|
2022-08-23 11:19:10 +02:00 |
|