10922 Commits

Author SHA1 Message Date
Moriz Wahl
c97dd76e25 target blank for contribution message links 2022-10-28 11:16:59 +02:00
Moriz Wahl
fd0ebe2be2 fix: Contribution Message Links Target Blank 2022-10-28 11:16:12 +02:00
Moriz Wahl
87e0f82a9f
Merge pull request #2305 from gradido/fix-link-in-messages
fix: Link in Contribution Messages
2022-10-28 09:21:43 +02:00
Moriz Wahl
235b58255f fix link in admin interface 2022-10-28 09:00:15 +02:00
Moriz Wahl
4327c600f9 fix: Link in Contribution Messages 2022-10-28 08:59:13 +02:00
Moriz Wahl
5ef00bce97
Merge pull request #2217 from gradido/2202-refactor-creations-query
Refactor: 🍰 Change the query so that we only look on the ``contributions`` table.
2022-10-27 20:35:01 +02:00
Moriz Wahl
c3b624f36f add order by clause 2022-10-27 19:55:23 +02:00
Moriz Wahl
568a6cdd2c
Merge branch 'master' into 2202-refactor-creations-query 2022-10-27 15:01:40 +02:00
jjimenezgarcia
945972c1d2
Merge pull request #2244 from gradido/admin-resolver-events-and-logging
Refactor: Admin Resolver Events and Logging
2022-10-26 11:51:40 +02:00
joseji
1407ea0e8b skipped test for changing month 2022-10-26 11:26:04 +02:00
Moriz Wahl
b2a1d7d672 include pending contributions for validation of contribution link, test it 2022-10-26 06:38:49 +02:00
Moriz Wahl
b5edc5f476 clean up 2022-10-25 13:45:43 +02:00
jjimenezgarcia
705365cb8e
Merge branch 'master' into admin-resolver-events-and-logging 2022-10-25 12:37:58 +02:00
joseji
7662d281f7 fixed test with new info 2022-10-25 12:37:08 +02:00
Moriz Wahl
d1a1059158 Merge branch 'master' into 2202-refactor-creations-query 2022-10-25 12:15:51 +02:00
joseji
2bf1bd6d36 fixed collisions 2022-10-25 12:01:30 +02:00
Moriz Wahl
3a8ee19bfb
Merge pull request #2248 from gradido/2247-links-in-contribution-messages-clickable
contibution messages, links are recognised
2022-10-25 11:57:02 +02:00
Moriz Wahl
f8022abd1f
Merge branch 'master' into 2247-links-in-contribution-messages-clickable 2022-10-25 02:59:13 +02:00
Moriz Wahl
8fdf44b762 Merge branch '2247-links-in-contribution-messages-clickable' of github.com:gradido/gradido into 2247-links-in-contribution-messages-clickable 2022-10-25 02:58:28 +02:00
Moriz Wahl
5b9cfe5f28 computed for linkified message object in linkify message component 2022-10-25 02:58:09 +02:00
Moriz Wahl
da7ac58a22 computed for linkified message object in linkify message component 2022-10-25 02:49:56 +02:00
jjimenezgarcia
65247f56fe
Merge pull request #2263 from gradido/test-transaction-resolver 2022-10-25 02:22:06 +02:00
jjimenezgarcia
4940622e59
Merge branch 'master' into test-transaction-resolver 2022-10-24 22:06:18 +02:00
ogerly
447bf02a42 fix Pagination Contributions jumps to wrong Page 2022-10-24 22:05:17 +02:00
ogerly
5d3dda78de change E-Mail Subject 2022-10-24 22:05:17 +02:00
ogerly
7df64eac22 changed text 2022-10-24 22:05:17 +02:00
Moriz Wahl
fcd9e1776c fix: Include Deleted Email Contacts in User Search 2022-10-24 22:05:17 +02:00
joseji
f0c39703f1 fixed wrong removals of negative numbers 2022-10-24 22:05:17 +02:00
joseji
f8ef64054d Merge branch 'master' into test-transaction-resolver 2022-10-24 22:02:18 +02:00
joseji
3bd339d798 fixed wrong removals of negative numbers 2022-10-24 22:01:19 +02:00
Moriz Wahl
307466b6ab
Merge branch 'master' into 2247-links-in-contribution-messages-clickable 2022-10-24 17:07:08 +02:00
Moriz Wahl
a11352aaad linkify messages as component in admin interface 2022-10-24 16:49:05 +02:00
Moriz Wahl
8409e0b751 linkify messages as component 2022-10-24 16:45:26 +02:00
Moriz Wahl
8ca4de8005
Merge pull request #2281 from gradido/left-join-with-deleted-email-contacts
fix: Include Deleted Email Contacts in User Search
2022-10-24 16:32:40 +02:00
Moriz Wahl
f23d7f16cf Merge branch '2247-links-in-contribution-messages-clickable' of github.com:gradido/gradido into 2247-links-in-contribution-messages-clickable 2022-10-24 16:31:26 +02:00
Moriz Wahl
d513fc2ca5 add tests for the links in messages 2022-10-24 16:31:11 +02:00
c0a062c25f
Merge branch 'master' into left-join-with-deleted-email-contacts 2022-10-24 15:53:57 +02:00
Alexander Friedland
343ce350f4
Merge branch 'master' into 2247-links-in-contribution-messages-clickable 2022-10-24 09:01:21 +02:00
Alexander Friedland
ad2454ad41
Merge pull request #2284 from gradido/2278-Pagination-Contributions-jumps-to-wrong-Page
fix: Pagination Contributions jumps to wrong Page
2022-10-24 09:00:55 +02:00
jjimenezgarcia
902222b9c8
Update backend/src/util/validate.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-10-24 08:05:37 +02:00
Moriz Wahl
ad99406060
Merge branch 'master' into left-join-with-deleted-email-contacts 2022-10-24 06:05:19 +02:00
Moriz Wahl
fa7bb026e0
Merge branch 'master' into 2247-links-in-contribution-messages-clickable 2022-10-24 06:04:07 +02:00
Moriz Wahl
e37a2bdf2c linkify messages without v-html 2022-10-24 06:02:06 +02:00
Moriz Wahl
24b1584ff8 linkify messages without v-html 2022-10-24 05:55:28 +02:00
Alexander Friedland
595fb46b4d
Merge branch 'master' into 2278-Pagination-Contributions-jumps-to-wrong-Page 2022-10-21 13:15:40 +02:00
Alexander Friedland
0103c629f6
Merge pull request #2276 from gradido/2270-Text-changes-contribution-request
fix: Changed some texts in E-Mails and Frontend
2022-10-21 12:52:49 +02:00
42040e5562
Merge branch 'master' into test-transaction-resolver 2022-10-21 12:46:37 +02:00
6b793e7ff2
Merge branch 'master' into 2270-Text-changes-contribution-request 2022-10-21 12:43:57 +02:00
Hannes Heine
895f3e4341
Merge pull request #2236 from gradido/2139-add-deleted-by-to-contributions
Feat: 🍰 Add `deletedBy` To Contributions And Admin Can Not Delete Own User Contribution
2022-10-21 12:00:52 +02:00
ogerly
6c94dae7b1 fix Pagination Contributions jumps to wrong Page 2022-10-20 13:36:47 +02:00