406 Commits

Author	SHA1	Message	Date
Moriz Wahl	2e25c280cf	Merge branch 'master' into paginate-user-table	2022-01-18 12:54:59 +01:00
Moriz Wahl	ddd9e4ecc0	perPage as data parameter	2022-01-18 12:51:59 +01:00
Moriz Wahl	9b87b26fa2	change text to users	2022-01-18 12:47:00 +01:00
Ulf Gebhardt	ac4eaeb381	Merge branch 'master' into new_deployment_stage2	2022-01-17 13:45:05 +01:00
Ulf Gebhardt	90effb41b5	changed syntax again due to shell replacing $variables	2022-01-14 18:49:35 +01:00
Moriz Wahl	0c6d63331f	test watchers	2022-01-14 13:39:34 +01:00
Moriz Wahl	d88c16a66c	pagination for user list on creation page	2022-01-14 13:32:44 +01:00
Moriz Wahl	5d9cc6ae24	get the tests working again	2022-01-14 13:18:34 +01:00
Moriz Wahl	9244fc4e1a	Add pagination buttons to search users	2022-01-14 13:12:49 +01:00
Ulf Gebhardt	5217b347be	replace all $1 url variables with something meaningfull, since $1 is replaced in scripting	2022-01-14 10:24:47 +01:00
elweyn	bea99f6904	New login page is on localhost/login no vue anymore.	2022-01-14 08:06:50 +01:00
Hannes Heine	b046f94744	Merge branch 'master' into fix-token-logout-redirect-to-wallet-login	2022-01-14 07:47:30 +01:00
Ulf Gebhardt	dda39550ab	corrected templates	2022-01-13 22:48:25 +01:00
Ulf Gebhardt	8fcc3b31ad	improved installscript alot ... - proper order - templates for all configs to fill in automatically	2022-01-13 22:34:17 +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
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
Ulf Gebhardt	d387ae9592	corrected two urls	2022-01-12 21:32:47 +01:00
Ulf Gebhardt	6adb2298c0	admin must be reachable under /admin even locally - till we parameterize this there is no other solution	2022-01-12 21:21:23 +01:00
Ulf Gebhardt	b6bd3f839d	unified all urls of our services. every server now serves on / and nginxs routes accordingly	2022-01-12 21:21:22 +01:00
Ulf Gebhardt	aba2b272f6	include express explicitly since its required for the run script	2022-01-12 21:21:21 +01:00
Ulf Gebhardt	644c55b573	corrected admin port	2022-01-12 21:21:21 +01:00
Ulf Gebhardt	00ecc2b999	cleanup run script (frontend) ... include new run script(admin)	2022-01-12 21:21:21 +01:00
Ulf Gebhardt	acd04b3432	removed /vue from tests, configs and references	2022-01-12 21:21:21 +01:00
elweyn	a3682a424e	Fix redirect to /logout, now redirects to the wallet login.	2022-01-12 11:52:30 +01:00
elweyn	06fdbf863e	Fix removing from masscreationlist now gives right item to the left list.	2022-01-12 11:36:36 +01:00
elweyn	4c098b0124	Withdrew space at the end of an locale definition.	2022-01-12 10:39:22 +01:00
Hannes Heine	b63674b00b	Merge branch 'master' into 1241-admin-logout-sends-to-wallet-login	2022-01-12 07:52:52 +01:00
Moriz Wahl	e4c8225799	Merge branch 'master' into fix-admin-creation-list	2022-01-11 13:01:30 +01:00
Moriz Wahl	075cf862ae	Merge branch 'master' into pass-language-to-admin-interface	2022-01-11 12:27:23 +01:00
Moriz Wahl	a679b90425	get the user table test up again	2022-01-11 10:03:57 +01:00
Moriz Wahl	370994b353	get the tests running	2022-01-11 09:58:17 +01:00
Moriz Wahl	fbf88d6d5b	fix: Pass Language to Admin Interface	2022-01-11 09:56:45 +01:00
Moriz Wahl	d07755f95a	get the tests running	2022-01-10 16:40:37 +01:00
Moriz Wahl	3abce024ba	filter transactions for type creation due to the first transaction is always a decay	2022-01-10 16:40:30 +01:00
elweyn	d857ee02a8	Window.location.assign instead of window.location =, so we can test it.	2022-01-10 13:56:25 +01:00
Moriz Wahl	5c3c22780a	get the tests running	2022-01-10 13:45:38 +01:00
Moriz Wahl	814f9e18dd	fix update of open creations	2022-01-10 13:25:35 +01:00
Moriz Wahl	933275c367	.global.error to .error as global is not defined so far	2022-01-10 13:03:05 +01:00
elweyn	c08cd7e37c	Admin Logout redirectes to the wallet login page.	2022-01-10 12:03:38 +01:00
Alexander Friedland	b4e59b3e85	Merge branch 'master' into 1231-Event-fuer-Button-alle-unregistrierte-Emails	2022-01-07 14:22:17 +01:00
Alexander Friedland	5235513bc9	Merge branch 'master' into 1231-Event-fuer-Button-alle-unregistrierte-Emails	2022-01-07 14:09:37 +01:00
Alexander Friedland	b8a39585a8	Merge branch 'master' into 1234-Detailansicht-in-Mehrfachschoepfung-automatisch-schliessen	2022-01-07 14:09:05 +01:00
Alexander Friedland	382b13db38	Merge branch 'master' into 1235-Daten-aktualisieren-beim-bearbeiten-einer-Schoepfung	2022-01-07 13:31:52 +01:00
Alexander Friedland	4b0b6e342b	Merge branch 'master' into 1234-Detailansicht-in-Mehrfachschoepfung-automatisch-schliessen	2022-01-07 13:31:47 +01:00
ogerly	19f9ccd639	yarn test fixed	2022-01-07 13:30:39 +01:00
ogerly	20b61d82b7	reverse filter for unregistered emails	2022-01-07 13:20:23 +01:00
Alexander Friedland	4d31f74ac6	Merge branch 'master' into 1234-Detailansicht-in-Mehrfachschoepfung-automatisch-schliessen	2022-01-07 13:07:24 +01:00
Ulf Gebhardt	5e5f7057d1	Merge branch 'master' into 1230-Details-für-wiederholte-Email-bestaetigen-versenden	2022-01-07 13:07:16 +01:00