9538 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
einhornimmond	89854923dc	Merge branch 'master' into move_users_creation_date	2022-07-11 13:00:55 +02:00
einhornimmond	dc941773f7	Merge branch 'master' into archive_transform_valid_transactions	2022-07-11 13:00:26 +02:00
Einhornimmond	72a4c1145d	remove forgotten drop transactions_temp table	2022-07-11 12:39:35 +02:00
Hannes Heine	4e6ac97906	Merge branch 'master' into 2000-contribution-list	2022-07-11 12:38:15 +02:00
elweyn	9239f93096	Add no non nullable assertion to admin Creation.	2022-07-11 12:21:51 +02:00
Alexander Friedland	a1d86962ee	Merge pull request #2037 from gradido/2036-change-text-start-page ... change text from page	2022-07-11 12:17:01 +02:00
elweyn	ae52b520dd	Withdrew where clause to an variable with inline condition.	2022-07-11 12:04:46 +02:00
elweyn	a2eccb12ed	Change the variable name contribution to contributions.	2022-07-11 11:42:39 +02:00
elweyn	3718f0dc56	Change the test so that we can test if the contribution list finds only created but not confirmed contribution	2022-07-11 11:42:24 +02:00
Alexander Friedland	971473965a	Update en.json	2022-07-11 10:59:27 +02:00
Einhornimmond	1841d9969d	finalize	2022-07-10 08:39:25 +02:00
Einhornimmond	d9c6836f89	finalize, merge with current master	2022-07-10 08:10:26 +02:00
Einhornimmond	0e821434a3	Merge branch 'archive_transform_valid_transactions' of github.com:gradido/gradido into archive_transform_valid_transactions	2022-07-10 08:09:23 +02:00
Einhornimmond	6423c66b0b	Merge branch 'master' into archive_transform_valid_transactions	2022-07-10 08:08:38 +02:00
elweyn	f373562d83	Merge branch 'master' into 2000-contribution-list	2022-07-08 12:08:30 +02:00
Moriz Wahl	9840017f0c	Update README.md ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-07-07 13:47:24 +02:00
Moriz Wahl	1543c568ae	Update README.md ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-07-07 13:47:14 +02:00
ogerly	ca84fc3bae	change text from page	2022-07-07 07:42:39 +02:00
Claus-Peter Hübner	859ac2cebd	increase CONFIG_VERSION	2022-07-07 02:53:43 +02:00
Claus-Peter Hübner	642a3e647c	increase CONFIG_VERSION after adding Event-Protocol Switch	2022-07-07 02:53:04 +02:00
Claus-Peter Hübner	d6fe798545	replace event emitting with event writing	2022-07-07 01:49:16 +02:00
Claus-Peter Hübner	46e2473a88	remove EventEmitter from events-modul and replace it with ... writeEvent-Methode	2022-07-07 01:48:33 +02:00
Claus-Peter Hübner	c570e5d2e5	Merge remote-tracking branch 'origin/master' into ... 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol remove EnumEventType table	2022-07-07 01:47:07 +02:00
Claus-Peter Hübner	f3be93e072	Merge remote-tracking branch 'origin/master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol	2022-07-07 01:43:21 +02:00
mahula	2f67e5f98a	Merge pull request #2030 from gradido/link-text-for-emails ... Transaction link: copy link, text and more	2022-07-06 11:57:47 +02:00
mahula	9272ca87cd	fix unit test	2022-07-06 11:39:59 +02:00
Moriz Wahl	37dad1ca84	Merge branch 'master' into link-text-for-emails	2022-07-06 11:24:20 +02:00
Moriz Wahl	067e7c3ef7	improve documentation	2022-07-06 10:56:02 +02:00
elweyn	18ff51aacf	Merge master into this branch.	2022-07-06 10:51:35 +02:00
Hannes Heine	e834d06704	Merge branch 'master' into 2000-contribution-list	2022-07-06 10:48:28 +02:00
Hannes Heine	9da967faff	Merge branch 'master' into 2000-contribution-delete	2022-07-06 10:45:34 +02:00
Alexander Friedland	4b924be72d	Merge pull request #2025 from gradido/2015-Change-welcome-text ... change welcome in community text	2022-07-06 10:36:33 +02:00
einhorn_b	2774594f13	apply suggestions, remove added transactions from creation date fix sql queries	2022-07-06 10:32:34 +02:00
einhornimmond	a2ffab2d4d	Update database/migrations/0041-update_transactions_for_blockchain.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-07-06 10:27:21 +02:00
Hannes Heine	e2b7c9dece	Merge branch 'master' into 2000-contribution-delete	2022-07-06 10:15:03 +02:00
Alexander Friedland	3e57cfa033	Merge branch 'master' into 2015-Change-welcome-text	2022-07-06 09:56:18 +02:00
Alexander Friedland	69bb329188	Merge pull request #2024 from gradido/2023-switched-link-color ... changed link color in navbar and language switch	2022-07-06 09:55:16 +02:00
Alexander Friedland	e1186100bd	Merge branch 'master' into 2023-switched-link-color	2022-07-06 07:50:50 +02:00
Alexander Friedland	d8fd6cb9b7	Merge branch 'master' into 2015-Change-welcome-text	2022-07-06 07:50:45 +02:00
Claus-Peter Hübner	4fb135cc36	new switch for event protocol enabling	2022-07-06 03:05:05 +02:00
Claus-Peter Hübner	127faf45cd	Merge remote-tracking branch 'origin/master' into ... 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol linting	2022-07-06 03:04:11 +02:00
Claus-Peter Hübner	5251571ca9	Merge remote-tracking branch 'origin/master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol	2022-07-06 02:33:07 +02:00
Claus-Peter Hübner	575453fd54	modify event emitting on new event type specific usage	2022-07-06 02:31:37 +02:00
Claus-Peter Hübner	314e211a4f	modify EventEmitter to new Eventtype specific handling	2022-07-06 02:30:52 +02:00
Claus-Peter Hübner	3f706dc5f0	add EventType specific handling	2022-07-06 02:30:04 +02:00
einhorn_b	6b3813a0c8	add code for moving user creation date if transaction before exist	2022-07-05 17:09:31 +02:00
einhorn_b	19253d7ce7	change generic mysql query to easy raw mysql queries	2022-07-05 16:18:34 +02:00
Moriz Wahl	e4a4744f4e	fix unit tests	2022-07-05 13:17:52 +02:00
mahula	a9a518c9bb	fix linting errors	2022-07-05 13:17:52 +02:00
mahula	ca8732bd75	Update frontend/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-07-05 13:17:52 +02:00