2833 Commits

Author SHA1 Message Date
ogerly
78b1f85d1a Merge branch 'review-bugfixed' of https://github.com/gradido/gradido into review-bugfixed 2021-08-12 09:16:56 +02:00
ogerly
6b4f709326 fix bug tabs bigger, merge gdd-transactionlist to row and col 2021-08-12 09:11:22 +02:00
ogerly
ca70f20b87 Merge branch 'gdd-transactionlist-row-col-system' of https://github.com/gradido/gradido into gdd-transactionlist-row-col-system 2021-08-12 08:52:36 +02:00
ogerly
5caee9e9fc fix change gddTransactionList.vue to row & col fixed, yarn test fixed 2021-08-12 08:52:04 +02:00
Alexander Friedland
4f964545f1
Merge branch 'master' into review-bugfixed 2021-08-11 22:33:42 +02:00
Alexander Friedland
c1d360fced
Merge branch 'master' into gdd-transactionlist-row-col-system 2021-08-11 22:32:49 +02:00
ogerly
31b1dfb14e gdd transaction list change to row col system 2021-08-11 22:23:51 +02:00
ogerly
f78b5264ef Merge branch 'review-bugfixed' of https://github.com/gradido/gradido into review-bugfixed 2021-08-11 20:20:57 +02:00
ogerly
f6af2fdee1 gdt transaction lust to ROW and COL 2021-08-11 20:17:59 +02:00
Moriz Wahl
f8b0505833 fix test 2021-08-11 18:06:57 +02:00
ogerly
8e1014af7e step4 2021-08-11 17:54:40 +02:00
Moriz Wahl
92549faba4
Merge pull request #716 from gradido/gdt-list-pagination
feat: Add Pagination Buttons to GDT Transaction List
2021-08-11 17:45:59 +02:00
ogerly
f6006cae35 step3 2021-08-11 17:28:20 +02:00
ogerly
d3b14273e9 step2 2021-08-11 17:13:40 +02:00
ogerly
48be1b6cb6 fixed bugs, step 1 2021-08-11 17:01:36 +02:00
Moriz Wahl
1d61c6bee3 set pageSize to 25 2021-08-11 16:41:19 +02:00
Moriz Wahl
c77d5fcaba feat: Add Pagination Buttons to GDT Transaction List 2021-08-11 16:09:36 +02:00
Alexander Friedland
9cb03befa2
Merge pull request #712 from gradido/708-Last-Item-Transactionlist-AccountOverview-Show-Not-Details
fix bug, change statment from transaction infbox
2021-08-11 14:41:35 +02:00
Alexander Friedland
e4b36ebc1b
Merge pull request #687 from gradido/650-View-for-the-GDT-Transaction-List
650-display of the gdt transactions
2021-08-11 14:32:45 +02:00
einhornimmond
98b2625936
Merge pull request #714 from gradido/extend_name_validation
Login-Server bug fix, allow names with 2 characters also
2021-08-11 14:05:01 +02:00
einhornimmond
e4c033cfc0 fix test 2021-08-11 13:16:53 +02:00
einhornimmond
39ce3fcc0a put back gdt sum into listTransactions 2021-08-11 13:14:58 +02:00
Dario via Pythagoras
6a9524ef0a allow also names with only 2 characters 2021-08-11 13:08:06 +02:00
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
ogerly
55b020e3ac fix bug, change statment from transaction infbox 2021-08-10 13:54:02 +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