elweyn
f42ba05572
Change call of checkOptInCode since signature changed.
2022-08-04 11:35:34 +02:00
elweyn
3a183918c5
Change checkOptInCode to check if emailChecked before changing optInState.
2022-08-04 11:34:46 +02:00
Alexander Friedland
baa7f8df4a
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet
2022-08-04 11:02:45 +02:00
mahula
153b2a2c4e
set up cypress to utilize cucumber and for tests in typescript
2022-08-03 23:17:34 +02:00
mahula
37c6a36a7a
Merge branch 'master' into e2e-test-setup
2022-08-02 12:44:23 +02:00
Claus-Peter Hübner
0aa5111578
switch 0044 to 0045 Migration
2022-08-02 02:34:16 +02:00
Hannes Heine
f95831d6a0
Merge pull request #2104 from gradido/fix-pagination-ellipsis
...
Fix pagination ellipsis
2022-07-30 15:54:08 +02:00
elweyn
2fd84df469
v-bind on hide-ellipsis to have a boolean instead of a string.
2022-07-29 10:21:07 +02:00
elweyn
16700a271d
Merge branch 'master' into fix-pagination-ellipsis
2022-07-29 09:41:24 +02:00
elweyn
5271298704
Remove … from pagination
2022-07-29 09:40:40 +02:00
Moriz Wahl
144ee90bd6
Merge pull request #2103 from gradido/release-1.11.0
...
release: Version 1.11.0
2022-07-28 17:46:49 +02:00
Moriz Wahl
e4a96e3cb8
release: Version 1.11.0
2022-07-28 16:53:23 +02:00
mahula
572636536e
Merge pull request #2102 from gradido/fix-navbar-community-item
...
Fix navbar community item
2022-07-28 16:36:01 +02:00
elweyn
f1ad2f7a9b
Add item community to the test case.
2022-07-28 15:58:20 +02:00
elweyn
ea6dd83ebc
Remove exclamaition from locales.
2022-07-28 15:43:10 +02:00
elweyn
ff67e6f3c7
Remove exclamaition point for members area item.
2022-07-28 15:42:04 +02:00
elweyn
b5b5527b59
Add community item to the mobile device.
2022-07-28 15:41:16 +02:00
Hannes Heine
187f86fc4f
Merge pull request #2101 from gradido/2077-copy-text-after-transaction-link-creation
...
Add validation date info to copied text after transaction link creation
2022-07-28 15:26:09 +02:00
Hannes Heine
ac737e239d
Merge branch 'master' into 2077-copy-text-after-transaction-link-creation
2022-07-28 15:17:52 +02:00
mahula
cb91b0514a
add mixins
2022-07-28 15:07:41 +02:00
mahula
858b9910ee
fix mixin import paths
2022-07-28 14:48:08 +02:00
mahula
ca095af50f
adapt unit tests to code changes
2022-07-28 14:27:59 +02:00
mahula
a7d1ed4449
refactor TransactionLink.vue to use mixins for link copying
2022-07-28 13:07:57 +02:00
mahula
2d80c7029e
including validation date infos to link copying after transaction link creation
...
- adapt transaction link creation mutation to get the validation date
- add validation date and text to link copy
- utilize mixins to avoid code doubling
2022-07-28 13:06:42 +02:00
mahula
a42b75bada
Merge pull request #2099 from gradido/2094-remove-member-area-from-menu
...
Remove member area from menu (desktop and mobile), when user has no elopage account
2022-07-28 12:01:03 +02:00
Moriz Wahl
2f0b92c99c
Merge branch 'master' into 2094-remove-member-area-from-menu
2022-07-28 11:35:36 +02:00
Moriz Wahl
d2658b0c73
Merge pull request #2100 from gradido/fix-contributions-inner-join-users
...
fix: Use Inner Join for Contribution and User
2022-07-28 11:35:19 +02:00
Moriz Wahl
6f081c4cc9
fix: Use Inner Join for Contribution and User
2022-07-28 11:12:17 +02:00
mahula
a413851419
specify the wording of the unit tests regarding the number of nav items
2022-07-28 08:50:26 +02:00
mahula
bb120b8b82
improve unit test structure for better readability
2022-07-28 08:39:31 +02:00
mahula
a8437ee492
Merge branch 'master' into 2094-remove-member-area-from-menu
2022-07-27 22:32:42 +02:00
mahula
67453c8a27
remove the member area entry from sidebar menu and adjust the unit tests accordingly
2022-07-27 22:16:53 +02:00
mahula
7fdba919ca
fix removal of exclamation mark in navbar
2022-07-27 22:16:17 +02:00
mahula
a01c5a4b3f
remove the member area entry from navbar menu and adjust the unit tests accordingly
2022-07-27 21:50:02 +02:00
mahula
2c07ec98ab
remove the member area entry from the footer and adjust the unit tests accordingly
2022-07-27 21:06:49 +02:00
mahula
d134b7efe1
Merge pull request #2098 from gradido/2077-copy-text-after-transaction-link-creation
...
Enable copying the link, username, amount, and memo text after transaction link creation
2022-07-27 15:20:20 +02:00
mahula
dff0853bc7
remove member area from menu, if user has no elopage account
2022-07-27 14:38:53 +02:00
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
