|
|
42040e5562
|
Merge branch 'master' into test-transaction-resolver
|
2022-10-21 12:46:37 +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 |
|
ogerly
|
6c94dae7b1
|
fix Pagination Contributions jumps to wrong Page
|
2022-10-20 13:36:47 +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
|
d6cc240b7d
|
Merge branch 'master' into 2247-links-in-contribution-messages-clickable
|
2022-10-20 13:12:54 +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
|
1e56dac726
|
Merge branch 'master' into 2247-links-in-contribution-messages-clickable
|
2022-10-20 13:05:04 +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 |
|
Moriz Wahl
|
6970cc1725
|
fix: Include Deleted Email Contacts in User Search
|
2022-10-20 11:51:37 +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 |
|
|
|
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 |
|
Alexander Friedland
|
c941a3c57b
|
Merge branch 'master' into 2247-links-in-contribution-messages-clickable
|
2022-10-19 06:14:54 +02:00 |
|
joseji
|
259475755c
|
fixed wrong responsabilities of exception throwing and implementation of calculateBalance()
|
2022-10-18 23:24:43 +02:00 |
|
joseji
|
d90d366946
|
fixed unnecessary params
|
2022-10-18 20:24:30 +02:00 |
|
joseji
|
1848db1ba1
|
added some log tests
|
2022-10-18 19:51:10 +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 |
|
jjimenezgarcia
|
f6f2ec1a71
|
Merge branch 'master' into test-transaction-resolver
|
2022-10-17 23:17:46 +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 |
|
