IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,809 Commits 1 Branch 0 Tags
Commit Graph

2809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
01b58d5f6b fixed error handling, change reviews fixed 2021-08-11 08:24:52 +02:00
Moriz Wahl
ae1aaa9741 added mocks for store and i18n to fix test 2021-08-10 19:26:07 +02:00
Moriz Wahl
0b86820060 set gdtBalance again by transactionList API call 2021-08-10 18:13:09 +02:00
Moriz Wahl
b5e06dc681 move API call for Gdt Transactions into GdtTransactionList 2021-08-10 16:50:05 +02:00
Moriz Wahl
f04f05778b fix tests 2021-08-10 16:19:44 +02:00
ogerly
e695046677 merge graphql 2021-08-10 15:53:29 +02:00
Moriz Wahl
ad12dd46f4 fix test, linting 2021-08-10 15:42:30 +02:00
Moriz Wahl
281a6beadd Merge branch 'master' into 650-View-for-the-GDT-Transaction-List 2021-08-10 12:50:29 +02:00
ogerly
e2636ee1af ../docker-compose.override.yml change community-server : add: external-net 2021-08-10 11:55:47 +02:00
ogerly
fac1cd6a78 pre final step gradido transform transaction list 2021-08-10 11:52:37 +02:00
einhornimmond
80cae76faa fix test 2021-08-10 11:47:18 +02:00
einhornimmond
4fbc01b907 remove gdt from listTransactions because it is already in listGDTTransactions, prevent synchronous call to gdt server, prevent double modificator 2021-08-10 11:45:11 +02:00
ogerly
b48bbbb711 step db request ok 2021-08-09 13:00:52 +02:00
ogerly
d61b7d36d1 Merge branch '650-View-for-the-GDT-Transaction-List' of https://github.com/gradido/gradido into 650-View-for-the-GDT-Transaction-List 2021-08-09 11:39:26 +02:00
ogerly
188d809d45 step pre pull dario 2021-08-09 11:38:59 +02:00
einhornimmond
4c25ae5d3f add staging gdt server to community server config 2021-08-09 11:07:34 +02:00
ogerly
355ec8618c db request test 2 2021-08-09 10:44:57 +02:00
ogerly
3e73a0ff4b db request test, style gdt 2021-08-09 08:46:26 +02:00
ogerly
0f8e29ac06 Merge branch '650-View-for-the-GDT-Transaction-List' of https://github.com/gradido/gradido into 650-View-for-the-GDT-Transaction-List 2021-08-06 12:47:15 +02:00
ogerly
f04d8a598e step3, pre merge step 2 from dario 2021-08-06 12:46:43 +02:00
einhornimmond
13fc29b875 fix wrong path 2021-08-06 11:02:16 +02:00
einhornimmond
4d2eb5b216
Merge pull request #699 from gradido/apollo_community_calls 
Apollo sendCoins via Login-Server
 2021-08-06 10:43:57 +02:00
einhornimmond
e36ee0467d
Merge pull request #700 from gradido/login_increase_coverage 
increase coverage to 34%
 2021-08-05 17:51:20 +02:00
einhornimmond
9146d584d8 increase coverage 2021-08-05 17:32:50 +02:00
Moriz Wahl
3a9a9004e2
Merge pull request #683 from gradido/522-Userprofile-change-password-mobile-friendly-2 
mobile friendly, add text, change text
 2021-08-05 16:08:31 +02:00
Moriz Wahl
22044e0089 only one a-element to click 2021-08-05 16:00:31 +02:00
Alexander Friedland
dcba687278
Merge pull request #646 from gradido/604-CSS-of-InputPassword-Component 
Css color input error
 2021-08-05 15:52:35 +02:00
einhornimmond
57a1a39a80
Merge pull request #686 from gradido/apollo_gdt 
Apollo gdt
 2021-08-05 15:51:43 +02:00
einhornimmond
dbd509cfe9 login-server expects amount in GDD Cent form (10,00 GDD => 100000) 2021-08-05 15:50:20 +02:00
ogerly
c17871f82b pull dario 2021-08-05 15:40:46 +02:00
einhornimmond
afdf112a9c call createTransaction directly from login-server 2021-08-05 14:54:40 +02:00
einhornimmond
69cb870444 optimize 2021-08-05 14:31:17 +02:00
Dario Rekowski on RockPI
79f80e2af8 update doc 2021-08-05 12:12:50 +00:00
Dario Rekowski on RockPI
402a0af5c1 add doc 2021-08-05 11:47:04 +00:00
Dario Rekowski on RockPI
343789c309 handing over result from updated gdt server 2021-08-05 11:18:31 +00:00
Moriz Wahl
dcf3b78b95 remove unused class/css, check that email is present before rendering qrcode 2021-08-04 17:22:28 +02:00
Moriz Wahl
cf8262c6cc fix: cancel edit is called when cancel is clicked 2021-08-04 16:50:41 +02:00
Moriz Wahl
5d7a69a147 Merge branch 'master' into 522-Userprofile-change-password-mobile-friendly-2 2021-08-04 16:10:52 +02:00
Moriz Wahl
40dbcb6a92
Merge pull request #584 from gradido/backend_setup 
Backend Setup
 2021-08-04 12:17:21 +02:00
Moriz Wahl
8ad64d85a0 remove remains of GetUserInfo 2021-08-04 11:58:15 +02:00
Moriz Wahl
403826a6d9 final changes before merge 2021-08-04 11:51:50 +02:00
Moriz Wahl
729aa02035 fix update user infos 2021-08-03 18:54:31 +02:00
Dario Rekowski on RockPI
c4a01aec73 fill missing lines of list gdt transactions 2021-08-03 15:44:51 +00:00
Dario Rekowski on RockPI
fb22adf38c Merge branch 'community_list_gdt' into 650-View-for-the-GDT-Transaction-List 2021-08-03 15:20:00 +00:00
ogerly
e3f9a83ec5 step 1 2021-08-03 17:17:45 +02:00
einhornimmond
46eb857629 fix 2021-08-03 15:14:13 +02:00
einhornimmond
3834871071 Merge remote-tracking branch 'origin/backend_setup' into apollo_gdt 2021-08-03 15:12:00 +02:00
einhornimmond
d2b4254015 fix bugs 2021-08-03 14:22:44 +02:00
Moriz Wahl
800e4e04fd remove eom directives 2021-08-03 13:59:22 +02:00
Moriz Wahl
628f0a541f sendCoins implemented 2021-08-03 13:35:44 +02:00