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 |
|
elweyn
|
53d315749d
|
Change import from ../enum to @enum
|
2022-10-24 16:01:48 +02:00 |
|
elweyn
|
68aa0a5d07
|
Withdrew createdAt = new Date() and use updatedAt or createdAt from the contribution.
|
2022-10-24 16:00:08 +02:00 |
|
|
|
c0a062c25f
|
Merge branch 'master' into left-join-with-deleted-email-contacts
|
2022-10-24 15:53:57 +02:00 |
|
|
|
0871314bf1
|
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham
|
2022-10-24 15:44:44 +02:00 |
|
elweyn
|
ce73e2c447
|
Change value from new to old value.
|
2022-10-24 13:40:28 +02:00 |
|
elweyn
|
94e9039c86
|
Add changed values to the new contribution message.
|
2022-10-24 13:23:42 +02:00 |
|
elweyn
|
c17291f74d
|
Remove the posibility of null of the contribution entity.
|
2022-10-24 13:19:10 +02:00 |
|
elweyn
|
e29c9a111d
|
Add a contribution message when things are changed.
|
2022-10-24 12:15:54 +02:00 |
|
elweyn
|
43705b3a40
|
Merge master into this branch, resolve merge conflicts
|
2022-10-24 12:03:27 +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 |
|
Claus-Peter Hübner
|
5e6003f742
|
Merge branch '2274-feature-concept-manuel-user-registration-for-admins' of github.com:gradido/gradido into 2274-feature-concept-manuel-user-registration-for-admins
|
2022-10-21 22:11:58 +02:00 |
|
Claus-Peter Hübner
|
e89dd03eb8
|
further details of description
|
2022-10-21 22:10:42 +02:00 |
|
clauspeterhuebner
|
a78f6ab8b6
|
Merge branch 'master' into 2274-feature-concept-manuel-user-registration-for-admins
|
2022-10-21 14:00:03 +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 |
|
|
|
2615f4a052
|
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID
|
2022-10-21 12:45:13 +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 |
|
Claus-Peter Hübner
|
c6c7a83d09
|
further detailed description
|
2022-10-21 01:31:34 +02:00 |
|
ogerly
|
6c94dae7b1
|
fix Pagination Contributions jumps to wrong Page
|
2022-10-20 13:36:47 +02:00 |
|
Hannes Heine
|
2827f30d08
|
Merge branch 'master' into 2139-add-deleted-by-to-contributions
|
2022-10-20 13:36:43 +02:00 |
|
elweyn
|
1e25bde9c5
|
Change database version for the feature, resolve merge conflicts.
|
2022-10-20 13:36:25 +02:00 |
|
Alexander Friedland
|
d6cc240b7d
|
Merge branch 'master' into 2247-links-in-contribution-messages-clickable
|
2022-10-20 13:12:54 +02:00 |
|
Alexander Friedland
|
94644d4194
|
Merge pull request #2277 from gradido/2271-Show-rejected-Contributions
deleted contributions are displayed to the user
|
2022-10-20 13:12:12 +02:00 |
|
Alexander Friedland
|
1e56dac726
|
Merge branch 'master' into 2247-links-in-contribution-messages-clickable
|
2022-10-20 13:05:04 +02:00 |
|
Alexander Friedland
|
f88470de75
|
Merge branch 'master' into 2270-Text-changes-contribution-request
|
2022-10-20 13:02:22 +02:00 |
|
Alexander Friedland
|
295ea212d1
|
Merge branch 'master' into 2271-Show-rejected-Contributions
|
2022-10-20 13:01:26 +02:00 |
|
Moriz Wahl
|
6970cc1725
|
fix: Include Deleted Email Contacts in User Search
|
2022-10-20 11:51:37 +02:00 |
|
ogerly
|
a4bf122bf4
|
change E-Mail Subject
|
2022-10-20 11:46:19 +02:00 |
|
Moriz Wahl
|
b9b84e206e
|
Merge pull request #2279 from gradido/release-1.13.1
release: Version 1.13.1
|
2022-10-20 11:23:45 +02:00 |
|
Moriz Wahl
|
886a8291c9
|
release: Version 1.13.1
|
2022-10-20 10:56:19 +02:00 |
|
|
|
137307bb86
|
Merge pull request #2273 from gradido/fix_test_email_mode
Fix: correctly evaluate to EMAIL_TEST_MODE to false
|
2022-10-20 10:46:50 +02:00 |
|
Moriz Wahl
|
39df2a4e96
|
test send email with test modus true
|
2022-10-20 10:21:39 +02:00 |
|
ogerly
|
2d7bef3e7e
|
dleted contributions are displayed to the user
|
2022-10-20 10:00:53 +02:00 |
|
Moriz Wahl
|
e9f40bc638
|
fix unit test
|
2022-10-20 09:47:59 +02:00 |
|
ogerly
|
60a9bd1f4e
|
changed text
|
2022-10-20 06:20:14 +02:00 |
|
Claus-Peter Hübner
|
74d57a010f
|
first draft
|
2022-10-19 23:47:12 +02:00 |
|
