clauspeterhuebner
|
a78f6ab8b6
|
Merge branch 'master' into 2274-feature-concept-manuel-user-registration-for-admins
|
2022-10-21 14:00:03 +02:00 |
|
Alexander Friedland
|
0103c629f6
|
Merge pull request #2276 from gradido/2270-Text-changes-contribution-request
fix: Changed some texts in E-Mails and Frontend
|
2022-10-21 12:52:49 +02:00 |
|
|
|
6b793e7ff2
|
Merge branch 'master' into 2270-Text-changes-contribution-request
|
2022-10-21 12:43:57 +02:00 |
|
Hannes Heine
|
895f3e4341
|
Merge pull request #2236 from gradido/2139-add-deleted-by-to-contributions
Feat: 🍰 Add `deletedBy` To Contributions And Admin Can Not Delete Own User Contribution
|
2022-10-21 12:00:52 +02:00 |
|
Claus-Peter Hübner
|
c6c7a83d09
|
further detailed description
|
2022-10-21 01:31:34 +02:00 |
|
Hannes Heine
|
2827f30d08
|
Merge branch 'master' into 2139-add-deleted-by-to-contributions
|
2022-10-20 13:36:43 +02:00 |
|
elweyn
|
1e25bde9c5
|
Change database version for the feature, resolve merge conflicts.
|
2022-10-20 13:36:25 +02:00 |
|
Alexander Friedland
|
94644d4194
|
Merge pull request #2277 from gradido/2271-Show-rejected-Contributions
deleted contributions are displayed to the user
|
2022-10-20 13:12:12 +02:00 |
|
Alexander Friedland
|
f88470de75
|
Merge branch 'master' into 2270-Text-changes-contribution-request
|
2022-10-20 13:02:22 +02:00 |
|
Alexander Friedland
|
295ea212d1
|
Merge branch 'master' into 2271-Show-rejected-Contributions
|
2022-10-20 13:01:26 +02:00 |
|
ogerly
|
a4bf122bf4
|
change E-Mail Subject
|
2022-10-20 11:46:19 +02:00 |
|
Moriz Wahl
|
b9b84e206e
|
Merge pull request #2279 from gradido/release-1.13.1
release: Version 1.13.1
|
2022-10-20 11:23:45 +02:00 |
|
Moriz Wahl
|
886a8291c9
|
release: Version 1.13.1
|
2022-10-20 10:56:19 +02:00 |
|
|
|
137307bb86
|
Merge pull request #2273 from gradido/fix_test_email_mode
Fix: correctly evaluate to EMAIL_TEST_MODE to false
|
2022-10-20 10:46:50 +02:00 |
|
Moriz Wahl
|
39df2a4e96
|
test send email with test modus true
|
2022-10-20 10:21:39 +02:00 |
|
ogerly
|
2d7bef3e7e
|
dleted contributions are displayed to the user
|
2022-10-20 10:00:53 +02:00 |
|
Moriz Wahl
|
e9f40bc638
|
fix unit test
|
2022-10-20 09:47:59 +02:00 |
|
ogerly
|
60a9bd1f4e
|
changed text
|
2022-10-20 06:20:14 +02:00 |
|
Claus-Peter Hübner
|
74d57a010f
|
first draft
|
2022-10-19 23:47:12 +02:00 |
|
|
|
02f9439bd2
|
correctly evaluate to false
|
2022-10-19 19:16:21 +02:00 |
|
jjimenezgarcia
|
d847303fef
|
Merge pull request #2231 from gradido/contribution-resolver-logs-and-events
Refactor: Contribution resolver logs and events
|
2022-10-19 11:08:08 +02:00 |
|
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 |
|
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 |
|
joseji
|
7d17735d7f
|
decimals from db tested propperly and merged master
|
2022-10-14 13:05:00 +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 |
|
