11341 Commits

Author SHA1 Message Date
Claus-Peter Hübner
77227355d8 kleine Änderungen u Ergänzungen 2022-10-25 22:27:30 +02:00
Claus-Peter Hübner
7dceb05424 Ergebnisse aus Architekur-Mtg vom 25.10.2022 2022-10-25 22:10:58 +02:00
Claus-Peter Hübner
5973ce3036 some small corrections 2022-10-25 16:53:17 +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
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
ogerly
f7629cf6c7 test2 for layouts/DashboardLayout.spec.js 2022-10-24 12:53:52 +02:00
ogerly
952383792e test for layouts/DashboardLayout.spec.js 2022-10-24 12:51:01 +02:00
elweyn
e29c9a111d Add a contribution message when things are changed. 2022-10-24 12:15:54 +02:00
ogerly
77f627060e fix locales 2022-10-24 12:15:25 +02:00
ogerly
2764719619 remove local key members_area 2022-10-24 12:13:40 +02:00
elweyn
43705b3a40 Merge master into this branch, resolve merge conflicts 2022-10-24 12:03:27 +02:00
ogerly
8223fdd42b remove elopage links and methods 2022-10-24 12:00:39 +02:00
Alexander Friedland
cd4fc51629
Merge branch 'master' into 2004-Basic-Menu 2022-10-24 09:04:11 +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