5569 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
einhornimmond	201590db7d	fix user search function, adjust to new fields in db	2021-05-13 15:30:52 +02:00
staging new	b4481c1f4e	fix config	2021-05-13 14:38:30 +02:00
Alexander Friedland	533370b31a	Merge pull request #426 from gradido/402-Thanks-page-has-blue-background ... thx.vue coloured background removed. design adapted to app	2021-05-13 14:34:44 +02:00
einhornimmond	3df94ee88b	use config command line parameter (needed if running more than one login server at one webserver)	2021-05-13 13:48:47 +02:00
ogerly	f902a04eb4	thx.vue coloured background removed. design adapted to app	2021-05-13 13:36:20 +02:00
Dario Rekowski on RockPI	e9b5f33949	return value with runcate to work woth migration call	2021-05-13 11:36:02 +00:00
Alexander Friedland	6e218c00dc	Merge pull request #424 from gradido/408-Untranslated-password-requirements-on-reset-password ... translation password rules in Register.vue and ResetPasswort.vue fixed	2021-05-13 13:31:02 +02:00
Dario Rekowski on RockPI	64ecf03841	truncate state balances for migration	2021-05-13 11:25:24 +00:00
ogerly	892e243eaa	translation password rules in Register.vue and ResetPasswort.vue fixed	2021-05-13 13:03:58 +02:00
ogerly	237e915229	übersetzung haut jetzt hin	2021-05-13 12:55:55 +02:00
Dario Rekowski on RockPI	77f6f679d2	fix function to work also with empty table	2021-05-13 10:50:07 +00:00
Dario Rekowski on RockPI	97c570c08c	use new function for balance overview in old frontend, update balance in session on every php-request	2021-05-13 09:54:38 +00:00
Alexander Friedland	4da4f905a3	Merge pull request #419 from gradido/06x-style ... 06x style	2021-05-12 16:04:39 +02:00
ogerly	77d72cf472	specs status	2021-05-12 15:42:09 +02:00
ogerly	e8e828baf1	status add pending, sorry mogge	2021-05-12 15:21:42 +02:00
ogerly	3592393609	merge master, languange-switch test	2021-05-12 15:10:00 +02:00
ogerly	379b055c63	Merge branch '06x-style' of https://github.com/gradido/gradido into 06x-style	2021-05-12 14:43:31 +02:00
ogerly	4885fb2f89	header remove from app.vue	2021-05-12 14:43:04 +02:00
Alexander Friedland	7fe2ff11c9	Merge branch 'master' into 06x-style	2021-05-12 14:25:47 +02:00
ogerly	693a6aee67	logo background color gray remove	2021-05-12 13:55:19 +02:00
Moriz Wahl	d1b6c90db5	Merge pull request #396 from gradido/pending-balance ... feat: Dash is Shown When Balance is Loading	2021-05-12 13:49:01 +02:00
Moriz Wahl	f72f2550aa	linting	2021-05-12 13:32:43 +02:00
Moriz Wahl	dbc192cc01	Merge branch 'master' into pending-balance	2021-05-12 13:31:17 +02:00
Moriz Wahl	4a9533590c	Merge pull request #415 from gradido/refactor-gdd-send ... refactor: Split GddSend into Components	2021-05-12 13:27:26 +02:00
ogerly	1cb538ba9a	language end on menu margin text	2021-05-12 13:19:30 +02:00
ogerly	3a2fc28dbc	language end on menu	2021-05-12 13:13:38 +02:00
Moriz Wahl	bd106cd90e	do not show cero GDD when loading balance fails	2021-05-12 13:08:41 +02:00
Moriz Wahl	70793d3854	contsant to upper case	2021-05-12 13:06:28 +02:00
einhornimmond	9d0c1da9ad	Merge branch 'master' into login_build_alpine	2021-05-12 13:04:20 +02:00
einhornimmond	9689e82469	update for build with windows	2021-05-12 12:54:40 +02:00
ogerly	97bd3a6482	mobil menu close by click of send and transactions	2021-05-12 12:01:13 +02:00
ogerly	f892a90e6c	switch language in sidebar	2021-05-12 11:29:00 +02:00
ogerly	58faba9709	language switch component in authlayout_gdd	2021-05-12 09:37:12 +02:00
ogerly	bb63eaeab4	css mobil style, language in extra componente	2021-05-12 09:30:20 +02:00
Moriz Wahl	1b1f4adb93	even more compact code	2021-05-12 06:49:57 +02:00
Moriz Wahl	8c33d5e913	more compact code	2021-05-12 06:30:47 +02:00
Moriz Wahl	e8aad2e317	get the test working. ToDo: Test this component!	2021-05-12 04:30:15 +02:00
Moriz Wahl	2c3f3c0b87	steps of transaction are slots now	2021-05-12 04:13:32 +02:00
Moriz Wahl	1a4e70225a	Merge pull request #395 from gradido/max-transactions ... fix: Set Maximum Transactions Loaded to 1000	2021-05-12 03:06:17 +02:00
Moriz Wahl	d5a6927ff3	tests are running again	2021-05-12 02:59:24 +02:00
Moriz Wahl	897c185ba6	Transaction result as component	2021-05-12 02:32:35 +02:00
Moriz Wahl	b6aaa69bea	transaction confirmation as component	2021-05-12 02:14:40 +02:00
Moriz Wahl	5155318dd3	make transaction form a component	2021-05-12 01:52:27 +02:00
Moriz Wahl	8eb4364f64	make qr code scanner a component	2021-05-12 01:19:08 +02:00
Moriz Wahl	bb0a0d607c	finish tests for sidebar	2021-05-11 20:09:32 +02:00
Moriz Wahl	b60537c898	test sidebar component	2021-05-11 19:45:16 +02:00
Moriz Wahl	35f9c4a5b4	test that em-dash is shown while balance is loading	2021-05-11 18:58:12 +02:00
Moriz Wahl	b89ffde13b	em-dash is shown while balance is loaded	2021-05-11 18:52:29 +02:00
Alexander Friedland	610a2350c2	Merge pull request #394 from gradido/bug_prerelease_thx_transaction ... BUG : preRELEASE : thx transaction false	2021-05-11 17:21:30 +02:00
Moriz Wahl	e818f95744	set max items to 1000	2021-05-11 16:31:45 +02:00