12310 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	d0d84af7ee	fix merging errors	2022-10-27 06:50:25 +02:00
Moriz Wahl	f2903f839e	linting	2022-10-27 06:45:14 +02:00
Moriz Wahl	0ac2a4d2c8	Merge branch 'master' into setup-hyperswarm	2022-10-27 06:42:57 +02:00
ogerly	4af8513740	add pages: settings, top storys, favorites	2022-10-26 12:49:33 +02:00
elweyn	69004d5659	Merge branch 'master' into 2140-add-updated-at-to-contributions	2022-10-26 12:05:49 +02:00
elweyn	0d304f9d71	Remove TODO comments and change the written message to only the old values no prefix.	2022-10-26 12:05:27 +02:00
elweyn	2c3db9da01	Move updatedAt before deleted variables.	2022-10-26 12:04:07 +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
ogerly	460ed9e5c5	add pages: settings, top storys, favorites	2022-10-26 10:54:00 +02:00
Moriz Wahl	01b9a856ff	fix: Change Orange Color	2022-10-26 07:31:45 +02:00
Moriz Wahl	b2a1d7d672	include pending contributions for validation of contribution link, test it	2022-10-26 06:38:49 +02:00
clauspeterhuebner	039d62432e	Merge branch 'master' into 2267-feature-gradido-roadmap	2022-10-25 22:51:00 +02:00
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
Ulf Gebhardt	c0a062c25f	Merge branch 'master' into left-join-with-deleted-email-contacts	2022-10-24 15:53:57 +02:00
Ulf Gebhardt	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