6562 Commits

Author SHA1 Message Date
Einhornimmond
692433ce51 try fix linting 2022-02-13 09:22:05 +01:00
Einhornimmond
cdd31ccba9 fix nested where conditions 2022-02-12 12:41:13 +01:00
Moriz Wahl
bbd90b8314
Merge branch 'master' into admin-email-confirmation 2022-02-12 07:52:03 +01:00
Alexander Friedland
93484425b9
Merge branch 'master' into 1459-List-Data-again-on-Confirm-Creation 2022-02-11 17:15:18 +01:00
Alexander Friedland
c4942799b8
Merge pull request #1455 from gradido/538-Unify-all-buttons
538 unify all buttons
2022-02-11 17:06:21 +01:00
ogerly
a562b3cdd1 remove unused code, set corectly function 2022-02-11 16:58:15 +01:00
ogerly
9433813608 merge master, resolve conflict 2022-02-11 16:54:43 +01:00
ogerly
19e5cd196d add Overlay.spec.js 2022-02-11 16:30:23 +01:00
Moriz Wahl
15a9af4552
Merge branch 'master' into admin-email-confirmation 2022-02-11 16:29:05 +01:00
Alexander Friedland
7408a90a68
Merge branch 'master' into 538-Unify-all-buttons 2022-02-11 16:21:22 +01:00
Alexander Friedland
2963306b9e
Merge pull request #1460 from gradido/833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful
833 old error is shown for a second even if transaction is successful
2022-02-11 16:20:19 +01:00
Alexander Friedland
03dcdf5100
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-11 16:18:25 +01:00
Alexander Friedland
e722054c50
Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-11 16:15:19 +01:00
Alexander Friedland
623d19e57c
Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-11 16:15:07 +01:00
Alexander Friedland
fea89a0ac7
Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-11 16:14:55 +01:00
Alexander Friedland
e607645fe3
Update frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-11 16:14:45 +01:00
ogerly
2ac912d584 yarn lint --fix 2022-02-11 15:31:39 +01:00
ogerly
78064c49f3 changes in the order of the data 2022-02-11 15:30:35 +01:00
Moriz Wahl
d3136adf33 linting 2022-02-11 15:27:23 +01:00
Moriz Wahl
8796e683d7
Merge branch 'master' into 833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful 2022-02-11 15:25:53 +01:00
ogerly
82f3c0d580 datetime add for creation month 2022-02-11 15:22:10 +01:00
Moriz Wahl
95c6a5594f
Merge branch 'master' into 538-Unify-all-buttons 2022-02-11 15:16:39 +01:00
ogerly
a87874ea9a yarn locale --fix 2022-02-11 15:09:27 +01:00
ogerly
7834054a77 add components Overlay.vue, add localize for Overlay.vue 2022-02-11 15:08:09 +01:00
Moriz Wahl
e9149d9644
Merge branch 'master' into admin-email-confirmation 2022-02-11 15:05:06 +01:00
Moriz Wahl
5dafcb6890
Merge pull request #1446 from gradido/fix-email-spelling
fix: Wrong Email Spelling in German
2022-02-11 15:04:52 +01:00
Moriz Wahl
14373ff302 Merge branch 'master' into admin-email-confirmation 2022-02-11 15:03:29 +01:00
Moriz Wahl
ec42f7239e
Merge branch 'master' into fix-email-spelling 2022-02-11 14:56:37 +01:00
Moriz Wahl
6cce2cf7ac
Merge pull request #1445 from gradido/fix-redirect-after-register
fix: Redirect to Login after Register
2022-02-11 14:56:23 +01:00
Moriz Wahl
a347b337c6 take createdAt if updatedAt is not present 2022-02-11 14:55:31 +01:00
Moriz Wahl
f2e2c495ed
Merge branch 'master' into fix-redirect-after-register 2022-02-11 14:43:53 +01:00
Moriz Wahl
89740b38dd
Merge pull request #1443 from gradido/split-table-component
refactor: Split User Table Component in Admin Interface
2022-02-11 14:43:33 +01:00
ogerly
bc68db6b21 confirm pending creation box, confirmbutton right, yarn lint 2022-02-11 14:01:31 +01:00
ogerly
26f537f6e3 confirm pending creation box, confirmbutton right 2022-02-11 14:00:53 +01:00
ogerly
5319f6de1e remove string 'recipiant not known' to 'recipiant not known' 2022-02-11 12:10:00 +01:00
ogerly
7c7339e85b send variable error by send to set in false, remove string 'recipiant not known' to 'recipiant not known' 2022-02-11 12:09:45 +01:00
ogerly
c12a1c469d remove string 'recipiant not known' to 'recipiant not known' 2022-02-11 11:56:19 +01:00
ogerly
2c6666f73c setting button change language 2022-02-11 11:37:15 +01:00
ogerly
27c8c37a98 yarn lint fix 2022-02-11 11:34:55 +01:00
ogerly
56a13cde95 change status disable in computed 2022-02-11 11:34:29 +01:00
ogerly
0742b9f604 setting button passwort change disable 2022-02-11 11:30:05 +01:00
ogerly
530dca224a setting button name disable in variante light 2022-02-11 11:02:52 +01:00
ogerly
67693368b2 yarn test fixed, yarn lint fixed 2022-02-11 10:48:13 +01:00
ogerly
dd3797fd84 remove unused files and code 2022-02-11 10:36:32 +01:00
ogerly
39d9278363 add collaps icon in gdt list 2022-02-11 10:29:00 +01:00
Einhornimmond
6e63bacba7 let handle mysql the paging 2022-02-11 10:15:09 +01:00
ogerly
4441a8c717 fixed test problems and calculation for last Transaction decay 2022-02-11 09:43:25 +01:00
ogerly
36c1116654 gdd balance pass down in AccountOverview 2022-02-10 21:36:41 +01:00
ogerly
df7f3d7668 gdd balance pass down 2022-02-10 21:27:35 +01:00
ogerly
07c43b800f show decay info for decay from last transaction 2022-02-10 20:58:16 +01:00