IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,786 Commits 1 Branch 0 Tags
Commit Graph

13786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
95303c30e0 add previous transaction relation 2023-04-03 18:38:09 +02:00
Moriz Wahl
466b755a3d middleware to ensure best possible decay displayed 2023-04-03 15:55:15 +02:00
Moriz Wahl
166debcc7d add previous balance to unit tests 2023-04-03 15:10:01 +02:00
Moriz Wahl
545e556599 previuos balance from server, displayed in decay details 2023-04-03 14:55:22 +02:00
Moriz Wahl
0a62c87dd9 locales for new and old balance 2023-04-03 14:54:48 +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
9a04c4a5d4 Merge remote-tracking branch 'origin/1006-Numbers-Transaction-List-always-aligned-by-the-comma' into feat-previous-balance 2023-04-03 12:56:33 +02:00
Moriz Wahl
60ccdc5beb feat(backend): previuos balance in transaction 2023-04-03 12:54:11 +02:00
Hannes Heine
f617c8d766
Merge pull request #2889 from gradido/2825-add-download-link-to-qr-code 
feat(frontend): add link to download QR-Code
 2023-04-01 10:15:25 +02:00
elweyn
386b451dd6 Call toDataUrl on canvasEl and expect data on href 2023-03-31 16:09:50 +02:00
elweyn
06523f38fa Unit tests for FigureQrCode 2023-03-31 16:02:05 +02:00
elweyn
bd29624c79 Refactor downloadImg to refs 2023-03-31 16:01:43 +02:00
Hannes Heine
e5e18288bc
Merge branch 'master' into 2825-add-download-link-to-qr-code 2023-03-31 12:46:34 +02:00
Ulf Gebhardt
1ace87c540
Merge pull request #2904 from gradido/delete-node-modules-delete-tmp-on-start 
fix(other): delete node_modules and /tmp/yarn--* on start.sh
 2023-03-31 11:49:29 +02:00
Ulf Gebhardt
510a8d7755
Merge branch 'master' into delete-node-modules-delete-tmp-on-start 2023-03-31 11:37:25 +02:00
mahula
4a8420bfc6
Merge pull request #2880 from gradido/2481-fix-admin-no-confirmation-when-changing-user-role 
fix(admin): add confirmation modal for user role change and user (un)deletion
 2023-03-31 11:35:41 +02:00
mahula
8a505bb1ba fix linting 2023-03-31 11:16:58 +02:00
mahula
01afe6a068
update admin/src/components/DeletedUserFormular.vue 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-03-31 10:32:45 +02:00
mahula
2f67f0634c
update admin/src/components/DeletedUserFormular.vue 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-03-31 10:27:49 +02:00
elweyn
594fb8fe60 Merge branch 'master' into 2481-fix-admin-no-confirmation-when-changing-user-role 2023-03-31 10:00:58 +02:00
elweyn
c25a9f936a Center the canvas and remove bottom gap 2023-03-31 09:40:28 +02:00
mahula
cc91cd32dc fix linting 2023-03-31 09:35:14 +02:00
mahula
e70552b3fb add user recovery tests to user search page 2023-03-31 09:31:18 +02:00
mahula
f238a3ddb1 adapt change user formular unit tests to changes 2023-03-31 09:30:15 +02:00
elweyn
2a37358fe1 Merge branch 'master' into 2825-add-download-link-to-qr-code 2023-03-31 09:13:23 +02:00
Moriz Wahl
042f13fce7
Merge pull request #2811 from gradido/2803-open-contribution-edit-button 
fix(admin): admin open contribution edit button
 2023-03-30 18:57:17 +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
Ulf Gebhardt
b6a9bd3dec
Merge branch 'master' into delete-node-modules-delete-tmp-on-start 2023-03-30 18:21:58 +02:00
Ulf Gebhardt
a43c58e5b7
Merge pull request #2911 from gradido/fix-import-order 
fix(backend): import order
 2023-03-30 18:18:13 +02:00
Ulf Gebhardt
7d7eb34aeb
fix order 2023-03-30 18:04:43 +02:00
Ulf Gebhardt
9407386de7
fix alphabetical sort 2023-03-30 17:57:15 +02:00
Ulf Gebhardt
80ff97e72a
more lint fixes 2023-03-30 17:39:09 +02:00
mahula
941663af36 adapt delete user formular unit tests to changes 2023-03-30 17:35:55 +02:00
mahula
d685a01742 remove check data from delete user formular 2023-03-30 17:34:00 +02:00
Ulf Gebhardt
b0c19eda47
fix import order 2023-03-30 17:28:03 +02:00
Ulf Gebhardt
36b7c74e5e
Merge pull request #2910 from gradido/federation-fix-env-template 
fix(other): use default values for undefined .env database values
 2023-03-30 16:56:38 +02:00
Moriz Wahl
769e36bea5 no Float in query 2023-03-30 16:55:00 +02:00
Ulf Gebhardt
cc98227de0
use default values for undefined .env database values 2023-03-30 16:40:56 +02:00
Moriz Wahl
43e2f5fbc8 do not allow user to edit admin contributions 2023-03-30 16:40:07 +02:00
Moriz Wahl
64d896f973 do not allow user to edit admin contributions 2023-03-30 16:14:36 +02:00
Ulf Gebhardt
9e07f7ae9a
Merge branch 'master' into delete-node-modules-delete-tmp-on-start 2023-03-30 16:10:29 +02:00
Moriz Wahl
cdfcaefa84 show moderator id 2023-03-30 15:50:20 +02:00
Moriz Wahl
10022c2247 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 15:11:18 +02:00
Ulf Gebhardt
002dfe5a73
Merge pull request #2827 from gradido/eslint-plugin-import-fixes 
refactor(backend): eslint plugin import + fixes
 2023-03-30 14:20:32 +02:00
Ulf Gebhardt
5b451520d0
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-30 14:06:21 +02:00
Ulf Gebhardt
fee1a49295
Merge pull request #2900 from gradido/event-tests-for-transactionLinks 
refactor(backend): missing event tests
 2023-03-30 10:13:54 +02:00
ogerly
c0680d332d Transaction info, right-justified, so that the commas 2023-03-29 16:43:03 +02:00