3336 Commits

Author SHA1 Message Date
mahula
3e277bcb79 adapt community resolver unit tests to changes 2023-04-07 15:59:50 +02:00
Hannes Heine
1d547736a4
Merge branch 'master' into 2595-visualize-the-federation 2023-04-06 17:02:09 +02:00
27a89a2734
removed obsolete comment 2023-04-06 14:21:26 +02:00
e4fc4438fb
removed obsolete comment 2023-04-06 14:20:41 +02:00
f2ad6cc24a
fix merge problem 2023-04-06 14:10:46 +02:00
657c171898
merge 2023-04-06 14:05:50 +02:00
8d8900c463
fix eslint.rc 2023-04-06 13:39:04 +02:00
1a0edb08c5
Merge branch 'master' into vscode-intellisense-fixes 2023-04-06 12:35:34 +02:00
e438502d46
Merge branch 'master' into import-no-cycle-refactor-events 2023-04-05 19:02:12 +02:00
Moriz Wahl
6065cfee33 remove unused file 2023-04-05 13:25:12 +02:00
Moriz Wahl
bb887be74c refactor(backend): get transaction list 2023-04-05 13:22:21 +02:00
Moriz Wahl
248737c446
Merge branch 'master' into feat-previous-balance 2023-04-05 12:16:18 +02:00
84bd3aca6a
use ** glob pattern 2023-04-05 03:38:32 +02:00
faf6881ffb
things resolve correctly 2023-04-05 03:35:49 +02:00
46d76c26ab
update related packages 2023-04-05 03:22:46 +02:00
bd9442169d
properly resolve all paths 2023-04-05 03:22:36 +02:00
642aa0369f
Merge branch 'master' into eslint-update-packages 2023-04-04 17:08:44 +02:00
Moriz Wahl
ee90928782 remove middleware 2023-04-04 17:06:29 +02:00
Moriz Wahl
c3ebc33ae5 Merge branch 'master' into feat-previous-balance 2023-04-04 16:55:22 +02:00
Moriz Wahl
a1ed92b643
Merge branch 'master' into feat-send-coins-via-gradido-ID 2023-04-04 15:26:23 +02:00
47cef4c11d
Merge branch 'master' into import-no-cycle-refactor-events 2023-04-03 21:40:52 +02:00
6696f9be26
lint fixes 2023-04-03 21:35:57 +02:00
e656a848fd
Merge branch 'master' into eslint-update-packages 2023-04-03 21:32:26 +02:00
Moriz Wahl
1fdd2e1014 get previuos transaction from database 2023-04-03 18:42:17 +02:00
Moriz Wahl
466b755a3d middleware to ensure best possible decay displayed 2023-04-03 15:55:15 +02:00
Moriz Wahl
adbd8b1e5d add previous balance to virtual transaction link transaction 2023-04-03 14:50:22 +02:00
Moriz Wahl
d578273589 correct calculation of previuos balance 2023-04-03 14:17:42 +02:00
Moriz Wahl
60ccdc5beb feat(backend): previuos balance in transaction 2023-04-03 12:54:11 +02:00
f623cbaee0
Merge branch 'master' into cleanup-database 2023-04-03 12:50:52 +02:00
1daa7e2ef4
Merge branch 'master' into import-no-cycle-refactor-events 2023-04-03 12:48:21 +02:00
35855f80ed
remove fileextension import rule from n, its covered in import 2023-03-31 13:14:21 +02:00
89d775324f
Merge branch 'master' into exlint-plugin-n 2023-03-31 13:00:03 +02:00
7a44a223e9
lint fixes 2023-03-31 12:51:51 +02:00
875c1f692b
lint fixes 2023-03-31 12:48:42 +02:00
c57c259db8
merge 2023-03-31 12:48:14 +02:00
ae8405e8f6
merge 2023-03-31 12:48:09 +02:00
1fa6d3e469
lint fixes 2023-03-31 12:10:50 +02:00
05fc48198e
merge conflicts 2023-03-31 12:08:55 +02:00
959487c3bb
Merge branch 'master' into import-no-cycle-refactor-events 2023-03-31 12:08:15 +02:00
Moriz Wahl
c0141c1801 no doubled imports 2023-03-30 19:18:51 +02:00
Moriz Wahl
976940047e Merge branch 'master' into feat-send-coins-via-gradido-ID 2023-03-30 19:14:09 +02:00
Moriz Wahl
695d037a2d do not allow edit contribution for admin contributions in backend 2023-03-30 18:33:36 +02:00
Moriz Wahl
d3ac556885 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 18:26:02 +02:00
Moriz Wahl
6dff07a7ba Revert "do not allow user to edit admin contributions"
This reverts commit 43e2f5fbc839921b5b0fe3deadc85c15baeb104f.
2023-03-30 18:25:47 +02:00
7d7eb34aeb
fix order 2023-03-30 18:04:43 +02:00
9407386de7
fix alphabetical sort 2023-03-30 17:57:15 +02:00
80ff97e72a
more lint fixes 2023-03-30 17:39:09 +02:00
b0c19eda47
fix import order 2023-03-30 17:28:03 +02:00
Moriz Wahl
43e2f5fbc8 do not allow user to edit admin contributions 2023-03-30 16:40:07 +02:00
Moriz Wahl
10022c2247 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 15:11:18 +02:00