Commit Graph

79 Commits

Author SHA1 Message Date
Daniel
128a1fabc1 Merge pull request #16 from lumijiez/security_branch_fix_jwt_roles
Security branch fix jwt roles
2023-10-06 22:22:34 +03:00
DmitriiCravcenco
2ba128b7ed Merge remote-tracking branch 'origin/security_branch_fix_jwt_roles' into security_branch_fix_jwt_roles 2023-10-05 22:25:28 +03:00
DmitriiCravcenco
7f6a0c1f92 Fixed JWT Role assignment and method access 2023-10-05 22:25:05 +03:00
DmitriiKaban
7fb60a6f00 Merge branch 'master' into security_branch_fix_jwt_roles 2023-10-05 20:00:19 +03:00
DmitriiCravcenco
a6ed3794fe Fix mapper + DTO 2023-10-05 19:52:13 +03:00
DmitriiCravcenco
e17eb3deec Merge updates from master 2023-10-05 19:10:53 +03:00
DmitriiCravcenco
c666092cd3 Delete file 2023-10-05 19:04:38 +03:00
Dima
b586e9fabd Merge pull request #15 from lumijiez/dimas
dto hotfix
2023-10-05 14:11:28 +03:00
mirrerror
735b2bc90c update dto 2023-10-05 14:08:37 +03:00
Uber Mahomedov
07272f052d Merge pull request #14 from lumijiez/dimas
add dto, refactor names, update controllers
2023-10-05 13:42:37 +03:00
mirrerror
5350fc3adf add dto, refactor names, update controllers 2023-10-05 13:13:53 +03:00
mirrerror
eca2b68ad9 Merge branch 'master' into dimas 2023-10-05 11:24:31 +03:00
Dima
fd581fc2ee Merge pull request #13 from lumijiez/dimas
update controllers and services, stick to crud
2023-10-04 16:28:03 +03:00
DmitriiCravcenco
b396c1c137 Fix bugs caused by Expense/Income controllers 2023-10-04 09:00:24 +03:00
DmitriiCravcenco
5e0000d532 Add JWT authentication 2023-10-03 12:28:42 +03:00
mirrerror
f4ca6b8f08 Merge branch 'dimas' of https://github.com/lumijiez/ExpenseTrackerFAF into dimas 2023-10-03 11:53:27 +03:00
mirrerror
46dad36166 remove debugging 2023-10-03 11:52:35 +03:00
mirrerror
5119b506b2 set repositories to final 2023-10-02 17:23:44 +03:00
mirrerror
f512c50aaf fix controllers 2023-10-02 10:00:11 +03:00
mirrerror
16d74c0ab6 update controllers and services 2023-10-02 08:58:17 +03:00
mirrerror
51b5537558 update expense serivce, controller 2023-10-02 08:49:01 +03:00
DmitriiCravcenco
f8b0c58034 Merge branch 'master' into security_branch 2023-10-02 08:33:28 +03:00
Daniel
3b7d58f736 Delete src/main/resources/application.properties 2023-10-02 08:31:32 +03:00
mirrerror
336359f267 optimize code 2023-10-02 08:26:18 +03:00
mirrerror
32066bb47a optimize code 2023-10-02 08:25:41 +03:00
DmitriiCravcenco
15f9a6418a Merge updates from master 2023-10-02 08:25:10 +03:00
DmitriiCravcenco
35fb05ac01 Add JWT authorization 2023-10-02 08:18:57 +03:00
Daniel
ddfa5583ce Merge pull request #12 from lumijiez/daniel
Daniel
2023-10-01 14:14:32 +03:00
16453571f9 Implemented service, repository and controller for each entity 2023-09-30 22:26:17 +03:00
95dc727dc3 Merge remote-tracking branch 'origin/daniel' into daniel 2023-09-30 22:19:56 +03:00
972f25a263 Implemented service, repository and controller for each entity 2023-09-30 22:19:44 +03:00
Daniel
2be3094705 Merge branch 'master' into daniel 2023-09-30 22:18:21 +03:00
f235921744 Implemented service, repository and controller for each entity 2023-09-30 22:13:46 +03:00
Dmitrii Cravcenco
4775911e50 Merge updates 2023-09-21 14:58:01 +03:00
Dmitrii Cravcenco
c0f3a7f7a7 Add repositories 2023-09-21 14:55:38 +03:00
Dmitrii Cravcenco
c05093a2cf Add repositories 2023-09-21 14:49:49 +03:00
Dima
53ae0d502c Merge pull request #8 from lumijiez/dimas
finally move to mysql
2023-09-21 14:21:00 +03:00
mirrerror
769b523b80 move to mysql finally 2023-09-21 14:19:59 +03:00
mirrerror
917f551094 fix gitignore 2023-09-21 13:49:48 +03:00
Dima
c808d5c7f9 Merge pull request #7 from lumijiez/dimas
fix expenses and incomes
2023-09-21 13:42:42 +03:00
mirrerror
908b223399 fix expenses and incomes 2023-09-21 13:41:40 +03:00
b34c5884b1 Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel
# Conflicts:
#	src/main/resources/application.properties
2023-09-21 13:40:17 +03:00
Dima
77cf9e4d92 Merge pull request #6 from lumijiez/dimas
Dimas
2023-09-21 13:36:45 +03:00
mirrerror
48476e405c fix expenses and incomes 2023-09-21 13:35:39 +03:00
mirrerror
bd5514380b remove an unnecessary comment 2023-09-21 13:26:05 +03:00
Dima
34703c5664 Delete src/main/resources/application.properties 2023-09-21 13:24:49 +03:00
mirrerror
48bf511dea Merge remote-tracking branch 'origin/dimas' into dimas 2023-09-21 13:23:34 +03:00
mirrerror
6628a3ea20 test 2023-09-21 13:22:59 +03:00
Dima
7d334c7c8d Delete src/main/resources/application.properties 2023-09-21 13:22:09 +03:00
mirrerror
e793191685 Change .gitignore and connect to the DB 2023-09-21 13:18:56 +03:00