3185 Commits

Author SHA1 Message Date
Moriz Wahl
449018a3a3 decay is the balance shown, max 5 transactions in overview 2021-05-06 14:43:27 +02:00
einhornimmond
511ace7a8e
Merge pull request #276 from gradido/login_fix_wrong_reset_password_email
fix error with password reset email
2021-05-06 14:22:06 +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
einhornimmond
3c566aca9b
Update community_server/src/Model/Table/TransactionsTable.php
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-05-06 12:28:14 +02:00
einhornimmond
973908466a
Merge pull request #330 from gradido/stagetest_fixes
remove  from error messages because its no longer exist
2021-05-06 12:23:38 +02:00
einhornimmond
35160c7d86
Update docu/community-server.api.md
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-05-06 12:19:49 +02:00
einhornimmond
7754fa01fb
Update centToFloat.ctp
An additional security patch.
2021-05-06 12:17:02 +02:00
einhornimmond
7c63d8b149
Update community_server/src/Controller/AppRequestsController.php
you are right.

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-05-06 12:02:22 +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
Alexander Friedland
317267dea1
Merge pull request #333 from gradido/307-xx-on-404-Page
xx deleted
2021-05-06 10:26:47 +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
Dario Rekowski on RockPI
851c7cad06 remove minus from decay 2021-05-05 18:57:26 +00:00
einhornimmond
c6653285c5
Merge pull request #274 from gradido/login_group_add_host
fix bug on Login group add host
2021-05-05 20:33:04 +02:00
einhornimmond
50788b492c Merge branch 'master' into community_gdd_float_balance 2021-05-05 20:22:37 +02:00
Dario Rekowski on RockPI
fdc43b0444 remove from error messages because its no longer exist 2021-05-05 17:58:27 +00:00
Dario Rekowski on RockPI
837e0f4fc6 calculate only once 2021-05-05 17:42:18 +00:00
Dario Rekowski on RockPI
f326adb6a6 don't show decays smaller than 0,01 GDD 2021-05-05 17:40:30 +00:00
einhornimmond
92ec8999b6 Merge branch 'master' into login_fix_wrong_reset_password_email 2021-05-05 19:14:41 +02:00
Dario Rekowski on RockPI
9ef2c82bbc test for float instead of int 2021-05-05 16:48:57 +00:00
Dario Rekowski on RockPI
db33e2a2df expect gradido now as decimal 2021-05-05 16:24:55 +00: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
Dario Rekowski on RockPI
4e7c1fa490 layout for listTransactions 2021-05-05 15:39:09 +00:00
Dario Rekowski on RockPI
b10886a8d3 move gradido to float into view element 2021-05-05 15:30:24 +00: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
einhornimmond
6a8e0b48ea fix visual studio build on windows 2021-05-05 14:01:31 +02:00
af7dd35127
Merge pull request #284 from gradido/fix_bug_template
fix_bug_template
2021-05-05 13:39: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
Moriz Wahl
f5bd8a8da5
Merge pull request #278 from gradido/balance-in-user-profile
fix: Dynamic Balance in User Profile
2021-05-05 12:14:52 +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