3748 Commits

Author SHA1 Message Date
ogerly
8260d844fb Merge remote-tracking branch 'origin/master' into 00x-table-footer-componente 2021-05-07 11:19:12 +02:00
ogerly
7f24bc0673 befor merge master 2021-05-07 11:18:02 +02:00
Moriz Wahl
aefbbeaab1
Merge pull request #339 from gradido/update-transactions
feat: Update Transactions When GddTable Is Rendered
2021-05-07 10:58:56 +02:00
ogerly
b0b237122b 233-Support-Button fix, and col error fix 2021-05-07 10:01:40 +02:00
Alexander Friedland
86ccb27301
Merge pull request #337 from gradido/283-My-profile-is-shown-in-the-menu
my profile auskommentiert
2021-05-07 07:30:31 +02:00
ogerly
0dc0701633 mt-5 margin top 5 eingebunden 2021-05-07 07:05:50 +02:00
Moriz Wahl
58f65831c5 Update transactions when GddTable is rendered. Track count of transactions 2021-05-06 17:58:26 +02:00
832d380455
Merge pull request #273 from gradido/community_gdd_float_balance
give balance as float value in GDD (not longer GDD cent)
2021-05-06 15:51:49 +02:00
ogerly
10029e3cec fix yarn lint 2021-05-06 15:11:04 +02:00
Moriz Wahl
c14e3ba4aa removed deprecated comment 2021-05-06 14:49:18 +02:00
Moriz Wahl
449018a3a3 decay is the balance shown, max 5 transactions in overview 2021-05-06 14:43:27 +02:00
Alexander Friedland
f77417e6d5
Merge pull request #335 from gradido/326-Link-to-All-Transactions-on-AccountOverview-is-Not-Translated
transaction.show_all in en.json hinzugefügt
2021-05-06 14:21:16 +02:00
ogerly
dc547bb16c fix yarn test 2021-05-06 14:11:57 +02:00
Moriz Wahl
ed554073dc Merge branch 'master' into community_gdd_float_balance 2021-05-06 13:59:41 +02:00
Moriz Wahl
8e3fd90a9e
Merge pull request #332 from gradido/transactions-params
refactor: Add Paramerts to ListTransactions API Call
2021-05-06 13:55:44 +02:00
ogerly
34d00d865e my profile auskommentiert 2021-05-06 13:47:04 +02:00
Alexander Friedland
afad1bc4bf
Merge pull request #272 from gradido/change-css-mobile
css abstände vom rand in mobilen style
2021-05-06 12:32:40 +02:00
Alexander Friedland
27a412475e
Merge pull request #304 from gradido/240-Create-user-error-not-caught
error messages are displayed
2021-05-06 12:32:06 +02:00
Alexander Friedland
34fbc3554f
Merge pull request #334 from gradido/291-Send-GDD-Cancel-Button
cancel to reset, form rest event added
2021-05-06 12:30:28 +02:00
ogerly
9ee6149141 fix yarn test 2021-05-06 11:17:51 +02:00
ogerly
ad9b2e7b58 transaction.show_all in en.json hinzugefügt 2021-05-06 11:14:03 +02:00
ogerly
789817e31d cancel to reset, form rest event added 2021-05-06 10:23:07 +02:00
ogerly
6e99665045 xx deleted 2021-05-06 09:25:10 +02:00
Alexander Friedland
f8c7823b0d
Merge branch 'master' into change-css-mobile 2021-05-06 09:14:47 +02:00
Alexander Friedland
cff3590024
change label messageError and showError 2021-05-06 09:10:20 +02:00
Moriz Wahl
59161e7ad2 Add Paramerts to TransactionList API Call 2021-05-05 23:50:03 +02:00
einhornimmond
50788b492c Merge branch 'master' into community_gdd_float_balance 2021-05-05 20:22:37 +02:00
Alexander Friedland
7a3c952cf4
Merge pull request #324 from gradido/303-Decay-is-not-properly-displayed
transactionslist load and icon
2021-05-05 17:55:50 +02:00
Alexander Friedland
afcd5748d2
Merge pull request #305 from gradido/286-Sending-GDD-results-in-THX-as-message
THX changed to Thank you
2021-05-05 17:53:20 +02:00
Moriz Wahl
60bf8c31f5 Merge branch 'master' into change-css-mobile 2021-05-05 17:52:56 +02:00
Alexander Friedland
e8dcf5619d
add class header 2021-05-05 17:49:56 +02:00
Moriz Wahl
e7e5b20b09 Merge branch 'master' into 303-Decay-is-not-properly-displayed 2021-05-05 16:56:07 +02:00
Moriz Wahl
b3529c0ea3 remove testData, fix test 2021-05-05 16:53:09 +02:00
Alexander Friedland
88c05578be
to showError 2021-05-05 16:01:59 +02:00
Alexander Friedland
ff65c78244
update 2021-05-05 15:57:45 +02:00
Alexander Friedland
7c972a1c72
lehrzeichen entfernt 2021-05-05 15:57:13 +02:00
ogerly
54c9665792 transactionslist load and icon 2021-05-05 15:45:11 +02:00
Moriz Wahl
70562c6a18
Merge pull request #271 from gradido/restructure-overview
feat: Restructure Overview
2021-05-05 13:25:11 +02:00
ogerly
46bf1e2e93 THX changed to Thank you 2021-05-05 09:11:07 +02:00
ogerly
3bff6c1d6f error messages are displayed 2021-05-05 08:57:14 +02:00
Moriz Wahl
c62faf0d86 use dynamic balance in user profile 2021-05-04 15:28:14 +02:00
Moriz Wahl
5306ff3fc6 linting 2021-05-04 13:31:53 +02:00
Moriz Wahl
cf0d2ea486 adjust frontend to chaged made in backend (factor 10000) 2021-05-04 12:59:03 +02:00
ogerly
b12676bc2d css abstände vom rand in mobilen style 2021-05-03 11:41:52 +02:00
Moriz Wahl
1133e2c9b9 removed UserProfile.vue, tests for GddSend.vue 2021-04-30 17:10:21 +02:00
Moriz Wahl
d5ba30df6f renamed KontoOverview to AccountOverview. Moved AccountOverview folder into Pages folder 2021-04-30 15:34:52 +02:00
Moriz Wahl
1dad6dff06
Merge pull request #270 from gradido/test-store
refactor: Test and Clean Up Store
2021-04-30 13:07:37 +02:00
Moriz Wahl
ad89cd7b32 GDT / 10000 2021-04-30 12:39:05 +02:00
23abf89636
Merge pull request #267 from gradido/265-Disable-Settings-Activities
remove links to not work
2021-04-30 12:13:47 +02:00
ogerly
37f3689d7f fix test nabǘabr li elements from 5 to 3 2021-04-30 10:53:09 +02:00