3348 Commits

Author SHA1 Message Date
Moriz Wahl
a0583cbb50 fix: Double Redirect After Logout with Expired JWT 2021-09-28 14:27:59 +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
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
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
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
ogerly
7164b53407 fix bug col to cols on <b-col> 2021-09-24 14:24:18 +02:00
255244fbec
have schema extern
have cors extern
have plugins exter
have context extern
2021-09-24 14:21:14 +02:00
4601c3df34
build schema in graphql folder not in index 2021-09-24 14:10:54 +02:00
91849b5130
externalize resolver import 2021-09-24 14:02:01 +02:00
d6dbc50c92
check db version with typeORM 2021-09-24 13:46:09 +02:00
Alexander Friedland
4a3588315e
Merge pull request #886 from gradido/826-Different-Design-of-GDD-and-GDT-Lists
826 different design of gdd and gdt lists
2021-09-24 13:45:46 +02:00
Alexander Friedland
441ab98711
Merge branch 'master' into 826-Different-Design-of-GDD-and-GDT-Lists 2021-09-24 13:35:09 +02:00
Alexander Friedland
d5ee9c96fb
Merge pull request #815 from gradido/636-Display-of-Decay-in-Transaction-Details
decay calculation is calculated
2021-09-24 13:23:18 +02:00
Alexander Friedland
c1f5a425b4
Update en.json 2021-09-24 13:14:51 +02:00
ogerly
05bab6e757 remove formal totale sum 2021-09-24 13:10:04 +02:00
Einhornimmond
2d1a0d8c4e now in the correct file 2021-09-24 13:08:01 +02:00
Einhornimmond
1f99be5eec exchange t for typeorm with db for db model.. it's more clear 2021-09-24 12:29:41 +02:00
ogerly
4c574c1081 add lacales, fix locales, fix lint 2021-09-24 12:27:39 +02:00
ogerly
092d3f6f5d Better explanation and presentation of the calculation of the total sum with the inclusion of decay 2021-09-24 12:13:48 +02:00
Alexander Friedland
922b823459
Merge pull request #887 from gradido/850-851-859-Borders-on-Profile-Page
round corners removed from profile settings page
2021-09-24 12:10:37 +02:00
Einhornimmond
1830b277f8 Merge branch 'master' into apollo_listGDTTransactions 2021-09-24 11:43:11 +02:00
einhornimmond
9f632399b7
Merge pull request #831 from gradido/apollo_updateBalance
Implement getBalance in Apollo
2021-09-24 11:42:23 +02:00
ogerly
d5c1d3bca0 class clo to element b-col 2021-09-24 11:33:49 +02:00
Einhornimmond
fa191c2d85 Merge branch 'apollo_updateBalance' of github.com:gradido/gradido into apollo_updateBalance 2021-09-24 11:18:13 +02:00
Einhornimmond
3bf0c2ad9c minimal change to trigger rebuild 2021-09-24 11:17:58 +02:00
Moriz Wahl
f792d8e02b
Merge pull request #889 from gradido/hadnle-expired-jwt
feat: Redirect to Login when JWT has expired
2021-09-24 11:17:53 +02:00