3358 Commits

Author	SHA1	Message	Date
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
Alexander Friedland	343ce350f4	Merge branch 'master' into 2247-links-in-contribution-messages-clickable	2022-10-24 09:01:21 +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
Alexander Friedland	595fb46b4d	Merge branch 'master' into 2278-Pagination-Contributions-jumps-to-wrong-Page	2022-10-21 13:15:40 +02:00
ogerly	6c94dae7b1	fix Pagination Contributions jumps to wrong Page	2022-10-20 13:36:47 +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
Moriz Wahl	886a8291c9	release: Version 1.13.1	2022-10-20 10:56:19 +02:00
ogerly	60a9bd1f4e	changed text	2022-10-20 06:20:14 +02:00
Alexander Friedland	c941a3c57b	Merge branch 'master' into 2247-links-in-contribution-messages-clickable	2022-10-19 06:14:54 +02:00
Moriz Wahl	9551d6f8a2	release: Version 1.13.0	2022-10-18 15:39:44 +02:00
Moriz Wahl	79e4bce06d	unify list transaction link query	2022-10-18 15:21:01 +02:00
ogerly	024d66af9c	chnage name from linkyfi to linkifiedMessage	2022-10-15 07:57:29 +02:00
ogerly	cb39745b23	change linkify to computed	2022-10-15 07:54:58 +02:00
ogerly	50a1b67a70	delete IsModerator.vue IsNotModerator.vue in frontend and backend	2022-10-14 14:22:06 +02:00
ogerly	e5ec048e9d	merge master, resolve conflicts	2022-10-14 14:15:53 +02:00
ogerly	90dfd1063b	pattern const added	2022-10-14 13:31:34 +02:00
ogerly	67dbbfae48	fix lint	2022-10-14 13:03:17 +02:00
ogerly	85804a1cfa	pattern in data for ContributionForm	2022-10-14 13:00:57 +02:00
mahula	505181b975	Merge branch 'master' into 2246-bug-redeem-code-is-lost	2022-10-13 17:23:34 +02:00
mahula	5547e8fa53	Merge branch 'master' into 2246-bug-redeem-code-is-lost	2022-10-13 17:15:25 +02:00
Moriz Wahl	1e965c6db0	Merge branch 'master' into 2249-bug-disable-change-of-month-on-update-contribution	2022-10-13 17:12:27 +02:00
Moriz Wahl	025a10f3ba	Update frontend/src/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-10-13 15:53:54 +02:00
mahula	80fcde8c13	Merge branch 'master' into 2249-bug-disable-change-of-month-on-update-contribution	2022-10-13 14:32:50 +02:00
mahula	43a9ec2a4c	adapt contribution form unit tests to changes	2022-10-13 13:34:51 +02:00
mahula	bb65a1b11b	disable contribution form datepicker when editing existing contribution	2022-10-13 13:34:09 +02:00
Wolfgang Huß	cc63c627c2	Merge branch 'master' of github.com:gradido/gradido into do-not-list-expired-contribution-links	2022-10-13 13:30:15 +02:00
mahula	b0352aadf2	Merge branch 'master' into 2246-bug-redeem-code-is-lost	2022-10-13 10:49:27 +02:00
mahula	3439bdc673	change import path for auth links mixin	2022-10-13 10:28:29 +02:00
mahula	b161114861	Merge branch 'master' into 2246-bug-redeem-code-is-lost	2022-10-13 09:50:03 +02:00
mahula	dc510edf28	adapt unit tests to changes on auth nav bar component	2022-10-13 09:43:51 +02:00
mahula	70e11b8e49	use computed auth links from mixins	2022-10-12 18:16:02 +02:00
Wolfgang Huß	642b408d1e	Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation	2022-10-12 17:39:44 +02:00
mahula	7702b88083	add link computation to auth nav bar	2022-10-12 16:59:51 +02:00
Wolfgang Huß	6d06c0f2d8	Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation ... # Conflicts: # backend/src/graphql/resolver/UserResolver.test.ts # backend/src/seeds/factory/contributionLink.ts # backend/src/seeds/factory/creation.ts	2022-10-12 16:23:04 +02:00
mahula	00e7ea776d	remove usage of jsonwebtoken from transaction list unit tests	2022-10-12 13:01:01 +02:00
Moriz Wahl	505463a3f8	show default text when no contribution links are present	2022-10-11 20:03:52 +02:00
mahula	832dd17f3e	Merge branch 'master' into 2069-verify-token-before-redeeming-a-link	2022-10-07 11:05:29 +02:00
mahula	2c31e4e87f	fix linting	2022-10-07 10:49:30 +02:00
mahula	1fd4764928	adapt unit tests to changes in page TransactionLink.vue	2022-10-07 10:44:15 +02:00
mahula	6bf1eec463	add node module jsonwebtoken (required for testing) to package.json	2022-10-07 10:36:40 +02:00
mahula	e93e8e6b0a	fix language dependency in unit tests for ContributionMessagesListItem	2022-10-06 18:23:54 +02:00
mahula	0b7313d216	add checking token expiration time to TransactionLink.vue	2022-10-06 18:05:04 +02:00
mahula	40e505f6e5	fix unit test error	2022-10-06 10:39:42 +02:00
mahula	1bd90cf427	wallet frontend: add tests for ContributionMessagesListItem	2022-10-06 10:14:36 +02:00
mahula	d37b8d3e50	remove default prop value from ContributionMessagesListItem	2022-10-05 17:08:39 +02:00
ogerly	68e24a5973	strip html from text	2022-10-05 08:19:11 +02:00
mahula	0426665adc	Merge branch 'master' into 2172-merge-contribution-message-compoments	2022-10-04 17:29:07 +02:00