5473 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	4cadbf0f69	Merge pull request #1259 from gradido/1226-Text-nach-erster-Anmeldung-entfernen ... transactionCount false or transactionCount error text hide	2022-01-15 13:25:52 +01:00
Hannes Heine	8390ce2767	Merge branch 'master' into 1226-Text-nach-erster-Anmeldung-entfernen	2022-01-14 08:52:03 +01:00
elweyn	151f497252	Changed the logic of no transactions, sets -1 if error was thrown so that we dont have the error if no transactions are present.	2022-01-14 08:47:07 +01:00
Hannes Heine	c5d96b561a	Merge pull request #1270 from gradido/1265-Mouse-Hovering-Over-Pencil-in-Settings ... 1265 mouse hovering over pencil in settings	2022-01-14 08:30:58 +01:00
Hannes Heine	c43827f2d2	Merge branch 'master' into 1265-Mouse-Hovering-Over-Pencil-in-Settings	2022-01-14 08:21:47 +01:00
Hannes Heine	df982842b4	Merge pull request #1285 from gradido/fix-token-logout-redirect-to-wallet-login ... Fix redirect to /logout, now redirects to the wallet login.	2022-01-14 08:20:35 +01:00
Hannes Heine	47078a9a01	Merge branch 'master' into 1226-Text-nach-erster-Anmeldung-entfernen	2022-01-14 08:08:26 +01:00
elweyn	bea99f6904	New login page is on localhost/login no vue anymore.	2022-01-14 08:06:50 +01:00
elweyn	d830fa8d7b	Merge branch '1265-Mouse-Hovering-Over-Pencil-in-Settings' of https://github.com/gradido/gradido into 1265-Mouse-Hovering-Over-Pencil-in-Settings	2022-01-14 08:01:14 +01:00
elweyn	03c7d664c3	Changed href=#! to class cursor-pointer.	2022-01-14 08:00:50 +01:00
Hannes Heine	7ab0f4abab	Merge branch 'master' into 1265-Mouse-Hovering-Over-Pencil-in-Settings	2022-01-14 07:48:20 +01:00
Hannes Heine	b046f94744	Merge branch 'master' into fix-token-logout-redirect-to-wallet-login	2022-01-14 07:47:30 +01:00
Moriz Wahl	b53fe452c8	Merge pull request #1224 from gradido/test-send-email ... feat: Test and Refactor Send Email	2022-01-13 10:32:49 +01:00
elweyn	173a25dc3a	Removed href='#!' and replaced it with class='cursor-pointer'	2022-01-13 10:19:20 +01:00
Moriz Wahl	25dbfef8a8	Merge branch 'master' into test-send-email	2022-01-13 10:12:19 +01:00
elweyn	11941b2e43	Merge branch 'master' into 1265-Mouse-Hovering-Over-Pencil-in-Settings	2022-01-13 09:52:25 +01:00
elweyn	2848504fe1	Merge branch 'master' into 1265-Mouse-Hovering-Over-Pencil-in-Settings	2022-01-13 09:40:00 +01:00
Ulf Gebhardt	c50f886d6b	Merge pull request #1220 from gradido/new_deployment ... new_deployment	2022-01-13 09:31:43 +01:00
Ulf Gebhardt	94dc5d3962	Merge branch 'master' into new_deployment	2022-01-13 09:14:13 +01:00
Hannes Heine	53470b8cc0	Merge branch 'master' into fix-token-logout-redirect-to-wallet-login	2022-01-13 09:12:41 +01:00
Hannes Heine	ab7c8dac9e	Merge pull request #1283 from gradido/1242-admin-creation-test-remove-space ... Withdrew space at the end of an locale definition.	2022-01-13 09:03:35 +01:00
elweyn	9d29c00ebb	Remove route from apolloProvider.test and changed the test that checks the redirect on wallet login.	2022-01-13 08:58:26 +01:00
Hannes Heine	4b0fc4a8a2	Merge branch 'master' into 1242-admin-creation-test-remove-space	2022-01-13 08:51:40 +01:00
Hannes Heine	f802318d95	Merge pull request #1284 from gradido/1208-admin-multiple-creation-fix ... Fix removing from masscreationlist now gives right item to the left l…	2022-01-13 08:50:03 +01:00
Hannes Heine	e8aa403ec7	Merge branch 'master' into 1208-admin-multiple-creation-fix	2022-01-13 08:39:19 +01:00
Ulf Gebhardt	fa105abde0	Merge branch 'master' into new_deployment	2022-01-13 06:06:22 +01:00
Ulf Gebhardt	28c369ba1b	Merge pull request #1148 from gradido/onboarding_process ... onboarding process document	2022-01-12 22:11:40 +01:00
Ulf Gebhardt	c13e1d1791	Merge branch 'master' into onboarding_process	2022-01-12 22:01:13 +01:00
Ulf Gebhardt	d387ae9592	corrected two urls	2022-01-12 21:32:47 +01:00
Ulf Gebhardt	4be6ca83dc	fix nginx workflow	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	66e5aa2594	last url (this document)	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	5036ecf515	more urls	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	8e4d7a3e3a	more urls	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	696ac3275f	another broken url	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	06b9671970	corrected url	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	eaa59180d3	removed github webhook, its now external	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	2efdb41232	disable debugging logs	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	85101f02b7	more git ignores	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	601f5de061	remove directory output	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	8df6fe859b	corrected argument definition for webhook	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	4a175f0ef8	removed github webhook, its now external	2022-01-12 21:21:27 +01:00
Ulf Gebhardt	6dbec1bd26	do not start with --no-treekill, checkout correct branch	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	670099f765	corrected hook id	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	7e1a7482ef	webhook debug command	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	e5955a8067	remove wait time alltogether	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	df8c6ef8f7	use webhook tool	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	125857dd1b	saving some time	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	53c7991a03	fixed exit code to be numeric	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	45d9d81ae7	readd --no-treekill for debugging	2022-01-12 21:21:26 +01:00
Ulf Gebhardt	b6f191f157	try exporting things	2022-01-12 21:21:26 +01:00