11683 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	2db6329a46	Merge branch 'master' into fix_docker_production_build	2022-11-29 23:45:54 +01:00
Ulf Gebhardt	10ad42babe	missing files to be copied	2022-11-29 16:37:25 +01:00
Wolfgang Huß	84b5479610	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-29 14:21:50 +01:00
Wolfgang Huß	317224db7a	Refactor some readme's by moving their content into 'CONTRIBUTING.md'	2022-11-29 14:09:15 +01:00
Wolfgang Huß	a7ee30fc3f	Fix some comments and readme spellings	2022-11-29 13:42:37 +01:00
Wolfgang Huß	3d55c7da9e	Fix production by copying missing email templates and locale files into the build folder	2022-11-29 13:41:42 +01:00
Wolfgang Huß	88cae0e528	Move email '*.pug' templates in 'templates' folder	2022-11-29 13:40:08 +01:00
joseji	7fe7b98dfe	removing non necessary functions	2022-11-29 13:10:33 +01:00
joseji	81f6066754	removed unused code	2022-11-29 13:06:17 +01:00
joseji	7e78f1c893	migration fixed	2022-11-29 13:03:10 +01:00
mahula	e00fe51017	Merge pull request #2424 from gradido/2342-bug-moderators-can-send-messages-twice-by-clicking-fast ... fix(frontend): in contribution messages formular a message can be send twice, when clicking the submit button fast	2022-11-29 11:36:41 +01:00
mahula	b662f957b4	Merge branch 'master' into 2342-bug-moderators-can-send-messages-twice-by-clicking-fast	2022-11-29 11:06:19 +01:00
mahula	403e68480c	change variable name to our standard naming	2022-11-29 11:05:26 +01:00
Wolfgang Huß	8afe0aaf3b	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-29 07:58:17 +01:00
Ulf Gebhardt	7f9190f276	lint fix	2022-11-29 06:31:57 +01:00
Ulf Gebhardt	fa5b7e6b81	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.test.ts # backend/src/graphql/resolver/UserResolver.ts	2022-11-29 06:15:31 +01:00
clauspeterhuebner	4c3847e68f	Merge pull request #2201 from gradido/2179-bug-wrong-month-for-contribution-near-turn-of-month ... fix(backend): wrong month for contribution near turn of month	2022-11-29 01:33:58 +01:00
clauspeterhuebner	1e4d922c88	Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month	2022-11-29 01:06:14 +01:00
joseji	e350307e6a	removing keys and passphrases	2022-11-28 23:59:57 +01:00
clauspeterhuebner	f2380c6dfa	Merge pull request #2374 from gradido/2367-feature-add-federation-configs ... feat(backend): add federation config properties	2022-11-28 22:56:35 +01:00
clauspeterhuebner	0d9b759bea	Update deployment/bare_metal/.env.dist ... set federation diabled as default Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-28 15:09:00 +01:00
clauspeterhuebner	b297e81787	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-28 15:07:31 +01:00
ogerly	694a9fa09e	lint fix	2022-11-28 12:38:56 +01:00
ogerly	a758374f86	add switch transactionslists GDT amount in Components	2022-11-28 12:18:21 +01:00
ogerly	ff5485e598	add GDT in Components	2022-11-28 11:23:37 +01:00
Wolfgang Huß	dc7957a0fb	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables ... # Conflicts: # backend/src/util/utilities.ts	2022-11-28 11:22:25 +01:00
Wolfgang Huß	4ae96a2213	Translate 'Gradido (nicht antworten)'	2022-11-28 11:13:04 +01:00
Wolfgang Huß	3b47330c92	Remove remainders of old untranslated emails	2022-11-28 11:05:12 +01:00
Wolfgang Huß	93e3562318	Remove old untranslated email 'sendTransactionReceivedEmail'	2022-11-28 11:04:34 +01:00
Wolfgang Huß	9894b02f51	Test 'sendTransactionReceivedEmail'	2022-11-28 10:54:31 +01:00
Wolfgang Huß	3903e29e16	Refactor 'sendTransactionReceivedEmail' email to HTML and translatable	2022-11-28 10:54:10 +01:00
Wolfgang Huß	0cccdb56de	Test that 'sendEmailTranslated' on 'CONFIG.EMAIL_TEST_MODUS = true' replaces the receiver with by the fake test mail accaount	2022-11-28 09:38:19 +01:00
ogerly	ce558205ee	right side last transaction components	2022-11-28 09:32:12 +01:00
ogerly	8c96639acc	right side last transaction list style remove unused code	2022-11-27 13:19:26 +01:00
ogerly	5cb238bde2	right side last transaction list style	2022-11-27 12:57:23 +01:00
ogerly	5a7df6bfb8	css nav active style	2022-11-27 10:57:47 +01:00
ogerly	522f41df09	add mobile sidebar	2022-11-27 10:40:04 +01:00
Ulf Gebhardt	7bc99a86dc	Merge pull request #2385 from gradido/jest_is_dev_depenency ... fix(backend): moved all jest & type-definition related packages into the `devDependencies` section	2022-11-27 00:18:55 +01:00
Ulf Gebhardt	71b1d409b9	Merge branch 'master' into jest_is_dev_depenency	2022-11-27 00:05:22 +01:00
Wolfgang Huß	2b65c6b261	Remove old untranslated email 'sendTransactionLinkRedeemedEmail'	2022-11-26 15:45:41 +01:00
Wolfgang Huß	699daa8eec	Test 'sendTransactionLinkRedeemedEmail'	2022-11-26 15:43:44 +01:00
Wolfgang Huß	224613f6d4	Refactor 'sendTransactionLinkRedeemedEmail' email to HTML and translatable	2022-11-26 15:42:44 +01:00
Moriz Wahl	45d58fe6e5	Merge pull request #2425 from gradido/v1.15.0 ... chore(release): v1.15.0	2022-11-26 13:16:36 +01:00
Wolfgang Huß	4b097f6f66	Add line ends to all 'subject.pug' files	2022-11-26 12:59:06 +01:00
ogerly	d02b9ab52d	fix test for Settings.vue	2022-11-26 10:48:06 +01:00
Alexander Friedland	5cd847507f	Merge branch 'master' into 2290-New-Design	2022-11-26 10:47:10 +01:00
ogerly	5716f67100	fix locales	2022-11-26 10:37:28 +01:00
ogerly	4551e4b561	fix lint	2022-11-26 10:37:08 +01:00
Ulf Gebhardt	2caf0ee664	v1.15.0	2022-11-26 01:14:24 +01:00
Moriz Wahl	9556e196ab	Merge pull request #2423 from gradido/fix-balance-migration ... fix(database): wrong balance and decay values	2022-11-25 18:22:06 +01:00