Moriz Wahl
|
f030493439
|
Merge branch 'master' into contribution-resolver-logs-and-events
|
2022-10-18 17:03:03 +02:00 |
|
Moriz Wahl
|
52459cfc8b
|
Merge pull request #2269 from gradido/release-v1.13.0
release: Version 1.13.0
|
2022-10-18 17:00:56 +02:00 |
|
Moriz Wahl
|
9551d6f8a2
|
release: Version 1.13.0
|
2022-10-18 15:39:44 +02:00 |
|
Moriz Wahl
|
52d84dd43c
|
Merge pull request #2268 from gradido/fix-linked-user-email
fix: Linked User Email in Transaction List
|
2022-10-18 15:38:17 +02:00 |
|
Moriz Wahl
|
26249f361c
|
fix query to get email of linked user
|
2022-10-18 15:24:06 +02:00 |
|
Moriz Wahl
|
79e4bce06d
|
unify list transaction link query
|
2022-10-18 15:21:01 +02:00 |
|
Moriz Wahl
|
0119899d41
|
Merge branch 'master' into contribution-resolver-logs-and-events
|
2022-10-18 12:04:43 +02:00 |
|
clauspeterhuebner
|
34ee0470fa
|
Merge pull request #2148 from gradido/2144-feature-usecase-concept-setting-alias-in-user-profile
concept capturing alias
|
2022-10-18 03:37:54 +02:00 |
|
clauspeterhuebner
|
92ed556420
|
Merge branch 'master' into 2144-feature-usecase-concept-setting-alias-in-user-profile
|
2022-10-18 03:27:14 +02:00 |
|
jjimenezgarcia
|
49ea82783d
|
Merge branch 'master' into contribution-resolver-logs-and-events
|
2022-10-17 23:31:19 +02:00 |
|
joseji
|
cbdb68f385
|
missed 1 decimal check on tests
|
2022-10-17 23:22:04 +02:00 |
|
jjimenezgarcia
|
f6f2ec1a71
|
Merge branch 'master' into test-transaction-resolver
|
2022-10-17 23:17:46 +02:00 |
|
clauspeterhuebner
|
417e348a34
|
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham
|
2022-10-17 22:52:34 +02:00 |
|
clauspeterhuebner
|
54542ef9ad
|
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID
|
2022-10-17 22:50:54 +02:00 |
|
Moriz Wahl
|
ea519ded22
|
Merge pull request #2265 from gradido/fix-daily-redeem-rule
fix: 🍰 Daily Redeem Of Contribution Link
|
2022-10-17 15:36:58 +02:00 |
|
Moriz Wahl
|
9ae023842b
|
fix: Daily Redeem of Contribution Link
|
2022-10-17 08:54:53 +02:00 |
|
ogerly
|
024d66af9c
|
chnage name from linkyfi to linkifiedMessage
|
2022-10-15 07:57:29 +02:00 |
|
ogerly
|
cb39745b23
|
change linkify to computed
|
2022-10-15 07:54:58 +02:00 |
|
ogerly
|
50a1b67a70
|
delete IsModerator.vue IsNotModerator.vue in frontend and backend
|
2022-10-14 14:22:06 +02:00 |
|
ogerly
|
e5ec048e9d
|
merge master, resolve conflicts
|
2022-10-14 14:15:53 +02:00 |
|
joseji
|
2fd37a7503
|
fixed tests and negative numbers are now detected
|
2022-10-14 13:59:41 +02:00 |
|
joseji
|
b58851000b
|
Merge branch 'master' into test-transaction-resolver
|
2022-10-14 13:55:53 +02:00 |
|
ogerly
|
90dfd1063b
|
pattern const added
|
2022-10-14 13:31:34 +02:00 |
|
joseji
|
7d17735d7f
|
decimals from db tested propperly and merged master
|
2022-10-14 13:05:00 +02:00 |
|
ogerly
|
67dbbfae48
|
fix lint
|
2022-10-14 13:03:17 +02:00 |
|
ogerly
|
85804a1cfa
|
pattern in data for ContributionForm
|
2022-10-14 13:00:57 +02:00 |
|
Wolfgang Huß
|
cc02b19fb5
|
Revert "Increase config version from 'v1.2022-03-18' to 'v10.2022-09-20'"
This reverts commit 267a48c970d56a5c7b04588122ff59f42162a3fa.
|
2022-10-14 08:41:45 +02:00 |
|
Hannes Heine
|
4cf2297d93
|
Merge branch 'master' into 2140-add-updated-at-to-contributions
|
2022-10-13 17:48:32 +02:00 |
|
mahula
|
5c68186d40
|
Merge pull request #2260 from gradido/2246-bug-redeem-code-is-lost
fix: 🐛 Prevent Loosing Redeem Code When Changing Between Register and Login in Auth Navbar
|
2022-10-13 17:34:29 +02:00 |
|
mahula
|
505181b975
|
Merge branch 'master' into 2246-bug-redeem-code-is-lost
|
2022-10-13 17:23:34 +02:00 |
|
Moriz Wahl
|
c4b61d70aa
|
Merge branch 'master' into 2139-add-deleted-by-to-contributions
|
2022-10-13 17:23:21 +02:00 |
|
mahula
|
fc56be334e
|
Merge pull request #2264 from gradido/2249-bug-disable-change-of-month-on-update-contribution
fix: Disable Change of Month on Update Contribution
|
2022-10-13 17:22:24 +02:00 |
|
Hannes Heine
|
c7d1d42434
|
Merge branch 'master' into 2139-add-deleted-by-to-contributions
|
2022-10-13 17:19:17 +02:00 |
|
elweyn
|
eb18bb8e7c
|
Add deletedBy value on deleteContribution mutation.
|
2022-10-13 17:18:56 +02:00 |
|
elweyn
|
c9f8b70201
|
Resolve merge conflict.
|
2022-10-13 17:17:39 +02:00 |
|
mahula
|
5547e8fa53
|
Merge branch 'master' into 2246-bug-redeem-code-is-lost
|
2022-10-13 17:15:25 +02:00 |
|
Moriz Wahl
|
1e965c6db0
|
Merge branch 'master' into 2249-bug-disable-change-of-month-on-update-contribution
|
2022-10-13 17:12:27 +02:00 |
|
Moriz Wahl
|
19833a2df6
|
Merge pull request #2261 from gradido/jest-extension-decimal-equal
feat: 🍰 Global Jest Extension For Decimal Equal
|
2022-10-13 17:11:44 +02:00 |
|
Moriz Wahl
|
90c1e18aa3
|
Merge branch 'master' into jest-extension-decimal-equal
|
2022-10-13 17:01:49 +02:00 |
|
Moriz Wahl
|
4b6dd5376d
|
Merge pull request #2262 from gradido/daily-rule-for-contribution-links-frontend
feat: 🍰 Daily Rule For Contribution Links In Admin Interface
|
2022-10-13 17:01:20 +02:00 |
|
Moriz Wahl
|
833bc909de
|
Merge branch 'daily-rule-for-contribution-links-frontend' of github.com:gradido/gradido into daily-rule-for-contribution-links-frontend
|
2022-10-13 16:51:42 +02:00 |
|
Moriz Wahl
|
5d37bd6df6
|
Merge branch 'master' into daily-rule-for-contribution-links-frontend
|
2022-10-13 16:51:11 +02:00 |
|
Moriz Wahl
|
10a6398d55
|
Merge pull request #2257 from gradido/do-not-list-expired-contribution-links
feat: 🍰 Do Not Show Expired Contribution Links In Wallet
|
2022-10-13 16:27:03 +02:00 |
|
Moriz Wahl
|
0b079397f9
|
remove unused computed property
|
2022-10-13 15:59:19 +02:00 |
|
Moriz Wahl
|
81651e4c7e
|
Update backend/src/graphql/resolver/TransactionLinkResolver.test.ts
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-10-13 15:57:51 +02:00 |
|
Moriz Wahl
|
2ef5efde20
|
Merge branch 'master' into daily-rule-for-contribution-links-frontend
|
2022-10-13 15:56:21 +02:00 |
|
Moriz Wahl
|
795a16627c
|
Merge branch 'master' into do-not-list-expired-contribution-links
|
2022-10-13 15:55:03 +02:00 |
|
Moriz Wahl
|
025a10f3ba
|
Update frontend/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-10-13 15:53:54 +02:00 |
|
Moriz Wahl
|
3bddcda53b
|
Merge pull request #2258 from gradido/disable-change-month-for-contribution-updates
fix: 🍰 Disable Change Of Month For Update Contribution (wallet and admin)
|
2022-10-13 15:53:20 +02:00 |
|
mahula
|
80fcde8c13
|
Merge branch 'master' into 2249-bug-disable-change-of-month-on-update-contribution
|
2022-10-13 14:32:50 +02:00 |
|