mahula
|
e17e1b43f5
|
Merge branch 'master' into 2077-copy-text-after-transaction-link-creation
|
2022-07-27 12:33:49 +02:00 |
|
mahula
|
cc6e568e82
|
fix linting and locales
|
2022-07-27 12:17:04 +02:00 |
|
mahula
|
3c539a6edf
|
make the wording more precise wherever a link can be copied
|
2022-07-27 11:21:47 +02:00 |
|
mahula
|
d1cc3115ba
|
add unit tests for copying a created transaction link with username, amount and memo text
|
2022-07-27 11:07:58 +02:00 |
|
mahula
|
21c9bc22a7
|
adapt existing unit tests for copying a created transaction link
|
2022-07-27 10:13:00 +02:00 |
|
Claus-Peter Hübner
|
afd123e133
|
correct the merge-conflict solving
|
2022-07-27 01:09:55 +02:00 |
|
Claus-Peter Hübner
|
9ff2105fd4
|
Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-07-27 01:02:00 +02:00 |
|
Claus-Peter Hübner
|
ae6c83becf
|
add two variants to store a deny of a contribution
|
2022-07-27 00:34:50 +02:00 |
|
mahula
|
80eaf1c8ea
|
add fucntionality to copy link and text after creating a transaction link
|
2022-07-26 18:34:40 +02:00 |
|
Moriz Wahl
|
99c81bf4f4
|
Merge pull request #2053 from gradido/insert-missing-contributions-migration
feat: Insert Missing Contributions Migration
|
2022-07-26 17:33:37 +02:00 |
|
Moriz Wahl
|
99c194ec81
|
Merge branch 'master' into insert-missing-contributions-migration
|
2022-07-26 17:22:11 +02:00 |
|
Moriz Wahl
|
cecbd47115
|
Merge pull request #2090 from gradido/2078-wallet-improvments
[Bug] Wallet improvments for Contributions
|
2022-07-26 17:21:54 +02:00 |
|
Moriz Wahl
|
552705a666
|
Merge branch 'master' into 2078-wallet-improvments
|
2022-07-26 17:12:54 +02:00 |
|
Moriz Wahl
|
ba1bf68819
|
Merge pull request #2093 from gradido/2089-fix-created-at-contribution-date
[Fix] Add createdAt & contributionDate to ContributionListItems
|
2022-07-26 17:12:36 +02:00 |
|
Moriz Wahl
|
307f853992
|
Merge branch 'master' into insert-missing-contributions-migration
|
2022-07-26 17:06:42 +02:00 |
|
Moriz Wahl
|
46a6540a82
|
Merge branch 'master' into 2089-fix-created-at-contribution-date
|
2022-07-26 17:03:50 +02:00 |
|
Moriz Wahl
|
194bce760a
|
Merge branch 'master' into 2078-wallet-improvments
|
2022-07-26 17:02:51 +02:00 |
|
Wolfgang Huß
|
f9e8697df9
|
Merge pull request #2086 from gradido/2084-contribution-form-does-not-delete-amount-etc
fix: 🍰 Reset Amount In Contribution Form And Write A Test
|
2022-07-26 17:02:42 +02:00 |
|
Moriz Wahl
|
96a7f8a2bf
|
Update frontend/src/components/Contributions/ContributionListItem.vue
|
2022-07-26 16:57:53 +02:00 |
|
Moriz Wahl
|
89b72f90c5
|
Update frontend/src/components/Contributions/ContributionListItem.spec.js
|
2022-07-26 16:57:39 +02:00 |
|
Wolfgang Huß
|
e41be4d832
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:52:39 +02:00 |
|
elweyn
|
3be2e00ff8
|
Test that date is always createdAt
|
2022-07-26 16:42:13 +02:00 |
|
Wolfgang Huß
|
8b596de97e
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:32:29 +02:00 |
|
Wolfgang Huß
|
1ae5c7cfac
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:32:21 +02:00 |
|
Wolfgang Huß
|
e171abfa7d
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:32:13 +02:00 |
|
Wolfgang Huß
|
52c48f16e4
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:31:50 +02:00 |
|
Wolfgang Huß
|
67048de5c7
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:31:41 +02:00 |
|
Wolfgang Huß
|
cc8f0d0ee7
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:31:33 +02:00 |
|
Wolfgang Huß
|
539e50cad2
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:31:26 +02:00 |
|
Wolfgang Huß
|
0489130f4c
|
Update frontend/src/components/Contributions/ContributionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-26 16:31:16 +02:00 |
|
elweyn
|
722886fedc
|
Add contributionDate month & year to list items.
|
2022-07-26 16:27:44 +02:00 |
|
Wolfgang Huß
|
14360fb8af
|
Cleanup a little
|
2022-07-26 16:26:10 +02:00 |
|
Wolfgang Huß
|
7eb6fc6c51
|
Refactor and enhance tests, try
|
2022-07-26 16:20:49 +02:00 |
|
elweyn
|
16d098d808
|
Add new locales for contribution date.
|
2022-07-26 16:20:41 +02:00 |
|
Wolfgang Huß
|
b590a82b04
|
Change reset button to cancel and dev comments
|
2022-07-26 16:20:29 +02:00 |
|
Wolfgang Huß
|
91538b72de
|
Change reset button to cancel and add tests
|
2022-07-26 16:10:05 +02:00 |
|
Wolfgang Huß
|
704eec7c17
|
Merge branch 'master' of github.com:gradido/gradido into 2084-contribution-form-does-not-delete-amount-etc
|
2022-07-26 15:51:33 +02:00 |
|
Wolfgang Huß
|
c808ecc3f4
|
Fix linting and cleanup
|
2022-07-26 15:47:51 +02:00 |
|
Moriz Wahl
|
bd957c38f9
|
Merge branch 'master' into insert-missing-contributions-migration
|
2022-07-26 13:51:20 +02:00 |
|
elweyn
|
b6ead39ff2
|
Change 'myContributionNoteList' to new text
|
2022-07-26 13:11:52 +02:00 |
|
elweyn
|
69f415e082
|
Change 'my contributions' to 'my contributions to the common good'
|
2022-07-26 13:05:07 +02:00 |
|
elweyn
|
57f06280ce
|
Remove nav prev and nav next year arrows.
|
2022-07-26 13:00:08 +02:00 |
|
Hannes Heine
|
3df99ef018
|
Merge pull request #2088 from gradido/2081-contribution-memo-error-message
[Feat] Replace logic to validation-provider.
|
2022-07-26 12:36:13 +02:00 |
|
Hannes Heine
|
e7acfcd7cf
|
Merge branch 'master' into 2081-contribution-memo-error-message
|
2022-07-26 12:25:55 +02:00 |
|
Moriz Wahl
|
082475511d
|
Merge pull request #2087 from gradido/add-confirm-dialog-on-delete-contribution
fix: Add Confirm Dialog on Delete Contribution
|
2022-07-26 12:23:04 +02:00 |
|
Moriz Wahl
|
55cb72c0b7
|
Merge branch 'master' into add-confirm-dialog-on-delete-contribution
|
2022-07-26 12:12:36 +02:00 |
|
Moriz Wahl
|
38af57bbec
|
Merge pull request #2085 from gradido/fix-admin-edit-contribution
fix: Admin Cannot Edit User Contribution
|
2022-07-26 12:12:23 +02:00 |
|
Moriz Wahl
|
5fb70341c2
|
Merge branch 'master' into fix-admin-edit-contribution
|
2022-07-26 12:04:00 +02:00 |
|
Moriz Wahl
|
e165325cbe
|
Merge pull request #2083 from gradido/fix-bibi-creation-seed
fix: Update contribution_date when Moved by Seed
|
2022-07-26 12:03:46 +02:00 |
|
Moriz Wahl
|
2eaf93bb34
|
errors in red, datepicker localized
|
2022-07-26 12:01:14 +02:00 |
|