252 Commits

Author SHA1 Message Date
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
9ec97ed9fe Changed folder structure 2023-09-21 13:08:43 +03:00
e2280070e9 Changed folder structure 2023-09-21 13:08:07 +03:00
Daniel
f5c69ef316 Merge pull request #5 from lumijiez/daniel 2023-09-21 13:00:50 +03:00
Daniel
4c2486edb1 Delete src/main/java/com/faf223/expensetrackerfaf/controllers directory 2023-09-21 13:00:20 +03:00
4c97a09d84 Changed folder structure 2023-09-21 12:58:08 +03:00
474cd3a6f6 Changed folder structure 2023-09-21 12:55:08 +03:00
Dmitrii Cravcenco
248982d128 Edit entities, add security package 2023-09-21 12:44:43 +03:00
Dima
dd178c7774 Merge pull request #4 from lumijiez/dimas
Add more requests
2023-09-21 12:44:27 +03:00
fad1a8e284 Changed folder structure 2023-09-21 12:43:40 +03:00
mirrerror
7232cc2f8a Add more requests 2023-09-21 12:41:37 +03:00
dd86d669bf Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel
# Conflicts:
#	src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java
#	src/main/resources/application.properties
2023-09-21 12:38:56 +03:00
984304a465 Changed folder structure 2023-09-21 12:37:28 +03:00
Dmitrii Cravcenco
1e9a547ffc Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into security_branch 2023-09-21 12:13:37 +03:00
DmitriiKaban
5ca297c348 Merge pull request #3 from lumijiez/dimas
Merge categories into one file, add new categories
2023-09-21 12:12:31 +03:00
mirrerror
86dd4f0c15 Merge categories into one file, add some new ones 2023-09-21 12:07:20 +03:00
mirrerror
89faf93a66 Merged categories into one file 2023-09-21 11:48:43 +03:00
Dmitrii Cravcenco
9ece427da2 Merge from master 2023-09-21 11:46:29 +03:00
Dmitrii Cravcenco
690e29a578 Add dependency 2023-09-21 11:41:53 +03:00
DmitriiKaban
3fb67e80c2 Merge pull request #2 from lumijiez/dimas
Add new entities
2023-09-21 11:38:41 +03:00
mirrerror
0918a51f7a Add new entities 2023-09-21 11:33:44 +03:00
Daniel
2e6cc544c6 Merge pull request #1 from lumijiez/dimas
Added main controller and user entity
2023-09-21 10:23:43 +03:00
mirrerror
ccea0d393c Added main controller and user entity 2023-09-21 10:21:31 +03:00
ac175a6bd2 Merge remote-tracking branch 'origin/master' 2023-09-19 01:26:15 +03:00
4d3c3e70a1 Changed folder structure 2023-09-19 01:26:07 +03:00
Daniel
2613de2065 Update README.md 2023-09-18 21:24:52 +03:00
0bbdfd4120 Merge remote-tracking branch 'origin/master' 2023-09-18 16:07:44 +03:00
f9d96b67cc First commit 2023-09-18 16:07:31 +03:00