Commit Graph

247 Commits

Author SHA1 Message Date
31087f82dd Updated interface, fixed bug 2023-12-21 22:56:27 +02:00
Dmitrii Cravcenco
8ef00d83ef Merge pull request #49 from lumijiez/testing_branch
Testing branch
2023-12-12 22:18:33 +02:00
Dmitrii Cravcenco
2e403e57b6 Merge branch 'master' into testing_branch 2023-12-12 22:18:05 +02:00
Dmitrii Cravcenco
9faf6e00bc Add user data update possibility 2023-12-12 22:16:36 +02:00
Dmitrii Cravcenco
3fbd7a1440 Merge pull request #48 from lumijiez/testing_branch
Testing branch
2023-12-12 10:20:35 +02:00
Dmitrii Cravcenco
67f2180f49 Merge branch 'master' into testing_branch 2023-12-12 10:19:55 +02:00
Dmitrii Cravcenco
7f0a173685 Add promoting/demoting user (change user role) 2023-12-12 10:18:50 +02:00
Dmitrii Cravcenco
da1076042e Merge pull request #47 from lumijiez/testing_branch
Testing branch
2023-12-12 09:51:07 +02:00
Dmitrii Cravcenco
d03f3bd552 Merge branch 'master' into testing_branch 2023-12-12 09:50:26 +02:00
Dmitrii Cravcenco
3a79741101 Add password update 2023-12-12 09:49:51 +02:00
Daniel
5809cf0284 Merge pull request #46 from lumijiez/front-v3
Much better UI
2023-12-11 00:08:50 +02:00
75d081fd88 Front upd 2023-12-11 00:08:05 +02:00
Dmitrii Cravcenco
8420f15732 Add user deleting 2023-12-10 15:14:30 +02:00
Dmitrii Cravcenco
ca1c1473a4 User data returns user role 2023-12-10 14:43:20 +02:00
Daniel
81fe558dbb Merge pull request #45 from lumijiez/front-v3
Better UI
2023-12-10 13:57:51 +02:00
ee4c885ae6 Front upd 2023-12-10 13:57:07 +02:00
Dmitrii Cravcenco
dc0252333e Merge pull request #44 from lumijiez/testing_branch
Make income/expense return created instance's id
2023-12-10 13:00:21 +02:00
Dmitrii Cravcenco
a373daa58c Make income/expense return created instance's id 2023-12-10 12:59:26 +02:00
Daniel
f98b9ac3e7 Merge pull request #43 from lumijiez/front-v3
Front v3
2023-12-09 00:39:37 +02:00
3335b1edc4 Front upd 2023-12-09 00:38:56 +02:00
cda5913aa9 Front upd 2023-12-09 00:38:46 +02:00
9483b7a233 Front upd 2023-12-09 00:38:38 +02:00
1cc271d590 Front upd 2023-12-09 00:38:31 +02:00
8103a36394 Front upd 2023-12-09 00:38:23 +02:00
b22f3c32d0 Front upd 2023-12-09 00:38:15 +02:00
d70fd2975b Front upd 2023-12-09 00:38:08 +02:00
420f9010e4 Front upd 2023-12-09 00:38:00 +02:00
2e41979897 Front upd 2023-12-09 00:37:49 +02:00
45b40c8987 Front upd 2023-12-09 00:37:39 +02:00
d750593d24 Front upd 2023-12-09 00:37:23 +02:00
b74cb462cd Front upd 2023-12-09 00:37:05 +02:00
09fd20d071 Front upd 2023-12-09 00:36:43 +02:00
Daniel
f4a03e438b Merge pull request #42 from lumijiez/front-v3
Front v3
2023-12-08 19:57:53 +02:00
1696965557 Front upd 2023-12-08 19:57:17 +02:00
Dmitrii Cravcenco
f6fa5542f7 Merge pull request #41 from lumijiez/testing_branch
Testing branch
2023-12-08 17:47:06 +02:00
Dmitrii Cravcenco
5cbee61f71 Merge branch 'master' into testing_branch 2023-12-08 17:46:13 +02:00
Dmitrii Cravcenco
cf9a18cd33 Add income service test function 2023-12-08 17:45:43 +02:00
3c724a395b Front upd 2023-12-07 12:24:11 +02:00
Dmitrii Cravcenco
2a83718dd6 Lombok optimization 2023-12-06 17:23:05 +02:00
Dmitrii Cravcenco
40f7db9dc7 Add file for tesing income service 2023-12-06 16:54:05 +02:00
4a25e8fc66 Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into front-v3 2023-12-05 20:37:31 +02:00
Dmitrii Cravcenco
673dfa374e Merge pull request #40 from lumijiez/testing_branch
Testing branch
2023-12-05 16:58:17 +02:00
Dmitrii Cravcenco
4fac06b680 Add expense repository CRUD actions test 2023-12-05 16:55:05 +02:00
Dmitrii Cravcenco
ee39ac605f Add income repository CRUD actions test 2023-12-05 15:35:12 +02:00
Dmitrii Cravcenco
f70fb1f0a2 Merge branch 'master' into testing_branch 2023-12-05 10:11:47 +02:00
Dmitrii Cravcenco
0eecbd5907 Income Testing Add 2023-12-05 10:11:10 +02:00
20a2799869 Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into front-v3 2023-12-04 21:01:08 +02:00
Dmitrii Cravcenco
48281b46a4 Remove oauth2, because breaks controllers 2023-12-04 17:03:14 +02:00
b5742b9761 Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into front-v3 2023-12-04 00:24:43 +02:00
Dmitrii Cravcenco
0fcacc3e88 Merge pull request #39 from lumijiez/dimas_timedebug
Transaction filter hotfix
2023-11-28 19:40:54 +02:00