6793 Commits

Author SHA1 Message Date
Moriz Wahl
18318404eb Merge branch 'master' into test-login-user-resolver 2022-03-08 18:06:16 +01:00
Moriz Wahl
c5ff18f461 use @paths 2022-03-08 18:04:55 +01:00
Moriz Wahl
8300449324
Merge pull request #1572 from gradido/refactor-backend-relative-paths
refactor: Resolve Relative Paths in Backend
2022-03-08 18:01:21 +01:00
Moriz Wahl
982be8d1ac
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 14:06:52 +01:00
Moriz Wahl
82ebcc0ae9
Merge branch 'master' into test-login-user-resolver 2022-03-08 14:06:21 +01:00
Moriz Wahl
ad44cf74dc
Merge pull request #1571 from gradido/refactor-frontend-directories
refactor: Frontend Directory Structure and Routes
2022-03-08 14:05:48 +01:00
Moriz Wahl
3a51ee645d
Merge branch 'master' into refactor-frontend-directories 2022-03-08 13:48:11 +01:00
Moriz Wahl
881b8a37c2
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 13:46:00 +01:00
Alexander Friedland
650163c00a
Merge pull request #1578 from gradido/show-community-name-in-creation-transaction
community name in creation transaction is displayed cleanly
2022-03-08 13:39:51 +01:00
ogerly
680d43b2cd community name in creation transaction is displayed cleanly 2022-03-08 09:41:05 +01:00
Alexander Friedland
412ce993f5
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 09:33:45 +01:00
Alexander Friedland
6186b314bb
Merge branch 'master' into refactor-frontend-directories 2022-03-08 09:09:59 +01:00
clauspeterhuebner
034828a6f8
Merge pull request #1567 from gradido/1170_Send_new_Users_Gradido
Planning: send new users gradido
2022-03-08 01:20:56 +01:00
clauspeterhuebner
c3e2168d17
Merge branch 'master' into 1170_Send_new_Users_Gradido 2022-03-08 00:31:57 +01:00
Moriz Wahl
75a1feb7ee no relative paths in tests 2022-03-07 22:03:54 +01:00
Moriz Wahl
9879c4550e path to models 2022-03-07 21:58:30 +01:00
Moriz Wahl
7e4c3ec3ce more resolved paths 2022-03-07 21:56:03 +01:00
Moriz Wahl
b361f12325 resolve relative paths in directives 2022-03-07 21:44:29 +01:00
Moriz Wahl
f0e7cc2a50 resolve relative paths in arg 2022-03-07 21:42:57 +01:00
Moriz Wahl
8b57327d22 remove empty files, resolve relative paths in model 2022-03-07 21:40:41 +01:00
Moriz Wahl
0136a22f0c resolve relative paths in resolvers 2022-03-07 21:35:50 +01:00
Moriz Wahl
e44bc316bf refactor: Resolve Relative Paths in Backend 2022-03-07 21:35:23 +01:00
Moriz Wahl
92c5fe2d96 resolve more relative paths 2022-03-07 20:48:36 +01:00
Moriz Wahl
5883b18a93 correct link in comment 2022-03-07 20:36:14 +01:00
Moriz Wahl
83cbb22cb3 correct link in comment 2022-03-07 20:29:50 +01:00
Moriz Wahl
4e331e3ae9 remove unused package 2022-03-07 20:26:15 +01:00
Moriz Wahl
9c246c62bd move user settings in subfolder 2022-03-07 20:20:54 +01:00
Moriz Wahl
07dbce59dc move UserProfile folder to components 2022-03-07 19:49:18 +01:00
Moriz Wahl
137408cda4 move SendOverview to components 2022-03-07 19:34:35 +01:00
Moriz Wahl
9d14e9dcb6 move folder AccountOverview to components 2022-03-07 19:29:20 +01:00
Moriz Wahl
574c1cf203 rename route for reset-password 2022-03-07 19:23:08 +01:00
Moriz Wahl
33fc918429 change route for reset password email 2022-03-07 19:22:15 +01:00
Moriz Wahl
bcc3ca4907 rename password with forgot-password 2022-03-07 19:07:14 +01:00
Moriz Wahl
14dcb3fa93 resolve relative paths, rename pages 2022-03-07 18:47:14 +01:00
Moriz Wahl
c790211870 remove views folder 2022-03-07 17:29:32 +01:00
Moriz Wahl
3c6817eec7 Merge branch 'master' into refactor-frontend-directories 2022-03-07 17:26:24 +01:00
Moriz Wahl
507db8b40e add module alias package 2022-03-07 17:26:00 +01:00
Alexander Friedland
77f5668648
Merge pull request #1548 from gradido/refactor_arithmetic_merge
Refactor arithmetic merge
2022-03-07 17:24:30 +01:00
Moriz Wahl
a430d9cd6e remove depricated test 2022-03-07 16:46:07 +01:00
Alexander Friedland
187deba1a8
Merge branch 'master' into refactor_arithmetic_merge 2022-03-07 16:38:37 +01:00
Alexander Friedland
ef3a0ea9be
Merge pull request #1550 from gradido/adminarea-creation-transactionlist-show
Adminarea creation transactionlist show
2022-03-07 16:36:48 +01:00
31721337ba
Merge branch 'master' into adminarea-creation-transactionlist-show 2022-03-07 16:24:29 +01:00
Alexander Friedland
5847f723c6
Merge branch 'master' into refactor_arithmetic_merge 2022-03-07 16:18:45 +01:00
a6467c4f12
Merge pull request #1568 from gradido/fix_validate_password_update_user_infos
Fix: Validate password on UpdateUserInfos
2022-03-07 16:18:25 +01:00
c8977ea749
Merge branch 'master' into fix_validate_password_update_user_infos 2022-03-07 16:09:24 +01:00
Alexander Friedland
651bb725d9
Merge branch 'master' into adminarea-creation-transactionlist-show 2022-03-07 16:09:09 +01:00
ec6ed74cb9
Merge pull request #1549 from gradido/fix_send_to_use_without_transactions
Fix: Allow sending to user without transactions
2022-03-07 16:08:59 +01:00
Hannes Heine
fb2945df71
Merge branch 'master' into fix_validate_password_update_user_infos 2022-03-07 16:01:59 +01:00
5cae087a26
Merge branch 'master' into fix_send_to_use_without_transactions 2022-03-07 16:00:27 +01:00
Alexander Friedland
30269d060c
Merge branch 'master' into refactor_arithmetic_merge 2022-03-07 15:54:01 +01:00