3380 Commits

Author SHA1 Message Date
Einhornimmond
e963a34b36 add settings as key value approach 2021-10-01 18:42:48 +02:00
Einhornimmond
161fae9ba2 Merge branch 'master' into 585-Coin-animation-on-and-off-switchable 2021-10-01 11:39:48 +02:00
einhornimmond
830d11633e
Merge pull request #893 from gradido/apollo_listTransactions
Apollo list transactions
2021-09-30 19:02:47 +02:00
einhornimmond
d4d19b7801
Update backend/src/util/decay.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-09-30 18:52:12 +02:00
einhorn_b
bf8bd24abf fixed decay and missing user data bugs 2021-09-29 14:37:26 +02:00
einhorn_b
94e95240eb Merge branch 'master' into apollo_listTransactions 2021-09-29 12:03:11 +02:00
einhorn_b
dba6a1b8d6 change datatype for timestamps to string 2021-09-29 12:02:16 +02:00
367713e77c
Merge pull request #912 from gradido/remove_api_endpoints_from_frontend_config
Remove api endpoints from frontend config
2021-09-28 19:04:05 +02:00
einhorn_b
ef0db3cb02 fix linting 2021-09-28 16:56:10 +02:00
Alexander Friedland
47119fe01a
Merge pull request #908 from gradido/816-Refactor-Register-Page-Buttons
register process simplified
2021-09-28 16:53:14 +02:00
Alexander Friedland
6883fc3778
Update Register.spec.js 2021-09-28 16:40:47 +02:00
Alexander Friedland
78db69592b
Merge branch 'master' into 816-Refactor-Register-Page-Buttons 2021-09-28 15:20:26 +02:00
ogerly
fd2ae0f242 remove select 'null' in LanguageSwitchSelect.vue 2021-09-28 14:55:14 +02:00
Alexander Friedland
3220548ae7
Merge pull request #905 from gradido/902-arranging-the-settings-translations
Cleaned up locales for settings and adjusted texts in files
2021-09-28 13:50:21 +02:00
ogerly
a8faa7b51b add test - enable disable button on submit register 2021-09-28 13:47:22 +02:00
01abcce931
removed LOGIN_API_URL & COMMUNITY_API_URL from .env.dist 2021-09-28 13:44:40 +02:00
e1197c5a6c
removed LOGIN_API_URL & COMMUNITY_API_URL from frontend config 2021-09-28 13:44:40 +02:00
Einhornimmond
aa2565d294 debugging stuff 2021-09-28 13:11:22 +02:00
ogerly
1a42aa17e4 register process simplified, reset function removed, submit button replaced with disable function 2021-09-28 12:29:45 +02:00
ogerly
f5915d0ada setting changed to settings, remove delete rows 2021-09-28 09:41:07 +02:00
Moriz Wahl
8548b36a61
Merge pull request #903 from gradido/correct-type-for-balance
fix: Warnings in Gdd Transaction List Spec
2021-09-27 23:08:45 +02:00
Moriz Wahl
01ea24099a warnings throw errors when running unit tests 2021-09-27 21:26:07 +02:00
16ec10948d
Merge pull request #868 from gradido/docu_release_plan
docu release plan
2021-09-27 21:01:35 +02:00
Einhornimmond
0d33202946 fix what don't work 2021-09-27 19:52:46 +02:00
Einhornimmond
06c80ebdfd implement listTransactions and neccessary changes for it 2021-09-27 18:57:36 +02:00
einhornimmond
5eb40c4819
Merge pull request #890 from gradido/login_update_password
update password check, allow every special char
2021-09-27 18:02:06 +02:00
Moriz Wahl
33e4f40f4f Merge branch 'login_update_password' of github.com:gradido/gradido into login_update_password 2021-09-27 16:47:28 +02:00
ogerly
4dec84321a Cleaned up locales for settings and adjusted texts in files 2021-09-27 15:35:17 +02:00
einhornimmond
5afe8fe741 add \r to js regexp 2021-09-27 13:35:39 +02:00
Moriz Wahl
342649ae1e no white space rule in password 2021-09-27 13:34:58 +02:00
einhornimmond
b9854f494c Merge branch 'login_update_password' of github.com:gradido/gradido into login_update_password 2021-09-27 13:32:12 +02:00
einhornimmond
d53ef3fc28 entferne 'ein' 2021-09-27 13:31:56 +02:00
einhornimmond
9ef5f1e811 exclude space, tab, newline from special chars 2021-09-27 13:30:18 +02:00
einhornimmond
8a7acbf3ce remove unnecessary .* from regexp 2021-09-27 13:09:01 +02:00
Moriz Wahl
362f439aaf fix: Warnings in Gdd Transaction List Spec 2021-09-27 12:58:56 +02:00
Moriz Wahl
77b5f9939e fix wrong German translation 2021-09-27 12:30:32 +02:00
Moriz Wahl
decf4d5013 implement at least one special char rule for password in frontend 2021-09-27 12:24:19 +02:00
einhornimmond
9211f52d7f
Merge pull request #897 from gradido/bugfix_apollo
fix error with apollo, typeorm and build
2021-09-24 17:00:29 +02:00
einhornimmond
dfab363f35
Merge branch 'master' into bugfix_apollo 2021-09-24 16:51:05 +02:00
Dario Rekowski on RockPI
fb39441f41 fix for working alos with build 2021-09-24 14:48:05 +00:00
31c2bb3990
Merge pull request #894 from gradido/db_check_with_typeorm
Db check with typeorm
2021-09-24 16:18:51 +02:00
Alexander Friedland
9f87fb69b3
Merge pull request #895 from gradido/Bug-remove-col-error-in-console
fix bug col to cols on <b-col>
2021-09-24 15:00:22 +02:00
Alexander Friedland
2bd88ce4f1
Merge pull request #896 from gradido/825-Some-entries-on-GDT-List-cannot-be-opened
bug fix givenType 2,3,5,6 change to givenType 1
2021-09-24 14:58:16 +02:00
Einhornimmond
f862736662 Merge branch 'master' into apollo_listTransactions 2021-09-24 14:53:42 +02:00
Einhornimmond
e2f6d1a006 work on implementing 2021-09-24 14:53:23 +02:00
einhornimmond
62940bd583
Merge pull request #891 from gradido/apollo_listGDTTransactions
Apollo list gdt transactions
2021-09-24 14:52:34 +02:00
ogerly
c9839dce21 bug fix givenType 2,3,5,6 change to givenType 1 2021-09-24 14:47:59 +02:00
e092af22e3
removed some logic from index 2021-09-24 14:44:18 +02:00
66324fe1ca
fix connection error for case database not running 2021-09-24 14:42:07 +02:00
8326eaac95
removed dead code 2021-09-24 14:32:33 +02:00