3330 Commits

Author SHA1 Message Date
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
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
ogerly
62f6b67c2b remove style from element 2021-09-24 11:07:15 +02:00
ogerly
23996c8ec5 change b-row 2021-09-24 10:43:35 +02:00
Einhornimmond
1315c5e1b1 use gdt call direct 2021-09-24 09:45:52 +02:00
ogerly
eca56af32a fix lint 2021-09-24 09:18:51 +02:00
ogerly
980fcc34bc border radius only right, no borders color 2021-09-24 09:08:58 +02:00
Moriz Wahl
823b4a1efc
Merge pull request #863 from gradido/queries-to-mutations
refactor: Queries to Mutations
2021-09-23 20:46:04 +02:00
einhorn_b
65e4b28c82 Merge branch 'master' into apollo_updateBalance 2021-09-23 17:13:31 +02:00
einhorn_b
c9e04d1e6f remove migration, update typeorm 2021-09-23 16:44:55 +02:00
einhorn_b
1952844c80 reset php changes 2021-09-23 16:44:23 +02:00
Moriz Wahl
0e61662119 feat: Redirect to Login when JWT has expired 2021-09-23 14:49:30 +02:00
einhorn_b
7d723986ce update yarn.lock 2021-09-23 14:24:08 +02:00
einhorn_b
d7c89c6e45 update commands 2021-09-23 14:21:00 +02:00
einhorn_b
c96ac68eca remove package-lock.json from git repository 2021-09-23 14:02:10 +02:00
ogerly
ab16f6f16b fix locales 2021-09-23 14:01:04 +02:00
ogerly
2ac14c460a fix row and col, remove fixed width 2021-09-23 13:55:15 +02:00
einhornimmond
536e97f8a6
Merge pull request #881 from gradido/community_test_db
Community-Server Test with new db migration
2021-09-23 13:47:08 +02:00