252 Commits

Author SHA1 Message Date
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
mirrerror
5a8a8f1197 optimize transaction filter 2023-11-28 19:38:10 +02:00
cb6c03fe76 Front upd 2023-11-28 19:23:26 +02:00
Dima
71448a6c21 Merge pull request #38 from lumijiez/security_branch
Security branch
2023-11-27 08:30:52 +02:00
Dmitrii Cravcenco
fddd02b9ce Clean security code 2023-11-22 08:40:45 +02:00
Dmitrii Cravcenco
3bf3f92551 Merge master 2023-11-22 08:14:16 +02:00
mirrerror
ee8a61ba8b update pom.xml 2023-11-21 21:43:44 +02:00
mirrerror
eb93ca73ce refactor code, add defaults for personal expenses and incomes 2023-11-21 20:58:26 +02:00
Dmitrii Cravcenco
fa99d42bee Merge master 2023-11-21 15:39:45 +02:00
Dmitrii Cravcenco
c45cd0549f Create endpoint for google oauth, generate JWT token, save to DB by email 2023-11-21 15:36:51 +02:00
Daniel
a21277bfe7 Merge pull request #37 from lumijiez/front-v3
Front v3
2023-11-21 14:54:32 +02:00
bee800428e Merge remote-tracking branch 'origin/master' into front-v3 2023-11-21 14:53:14 +02:00
a6ef16b569 Front upd 2023-11-21 14:51:49 +02:00
Dima
444f3a07fa Merge pull request #36 from lumijiez/dimas_restupdate
refactor code, add more flexibility for filtering transactions by periods of time
2023-11-21 12:48:59 +02:00
mirrerror
a484e8e6d2 refactor code, add more flexibility for filtering transactions by periods of time 2023-11-21 12:46:55 +02:00
Dmitrii Cravcenco
07c9ed63ee Merge remote-tracking branch 'origin/security_branch' into security_branch
# Conflicts:
#	src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java
2023-11-20 18:14:33 +02:00
Dmitrii Cravcenco
d03e256425 Add starter redirection for github/google oauth2 2023-11-20 13:42:39 +02:00
mirrerror
c13056ae7f added date filtering for transactions, refactor code 2023-11-20 09:03:34 +02:00
Dima
7481f91b11 Merge pull request #35 from lumijiez/dimas_restupdate
add validation
2023-11-20 08:17:36 +02:00
Daniel
4410694993 Merge pull request #34 from lumijiez/front-v2
Front v2
2023-11-17 12:58:45 +02:00
4404eedeec Separated expenses and incomes frontend 2023-11-17 12:58:04 +02:00
021be06f40 Separated expenses and incomes frontend 2023-11-17 12:57:36 +02:00
mirrerror
fb2695e58a add validation 2023-11-15 09:16:27 +02:00
Dima
ab3641dacb Merge pull request #33 from lumijiez/dimas_restupdate
Update Rest API
2023-11-13 10:55:06 +02:00
mirrerror
2d981c5af8 change error message 2023-11-13 10:20:36 +02:00
mirrerror
f1c8211f7a stick to one error response class 2023-11-13 10:15:11 +02:00
mirrerror
3ba95647b4 add exception handling 2023-11-13 10:11:44 +02:00
mirrerror
acbb6285d9 add possibility to get expenses by date and month 2023-11-13 09:08:16 +02:00
Daniel
04aa41e354 Merge pull request #32 from lumijiez/front-v2
Fixed user registration, now doesn't crash when no expenses/incomes
2023-11-06 08:53:15 +02:00
71ef9aefe1 Fixed forms trying to input strings instead of ints 2023-11-06 08:52:32 +02:00
mirrerror
f635ca3cb7 fix abstraction for previous commits 2023-10-27 21:14:31 +03:00
mirrerror
ffd0fa36ec Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF 2023-10-27 21:06:16 +03:00
DmitriiKaban
c0e0c21da7 Merge pull request #31 from lumijiez/dmitrii-cravcenco-fixes
Add expense/income update
2023-10-27 17:53:51 +03:00
Dmitrii Cravcenco
eb2d0e53dc Add expense/income update 2023-10-27 17:53:15 +03:00
DmitriiKaban
76b515b129 Merge pull request #30 from lumijiez/dmitrii-cravcenco-fixes
Dmitrii Cravcenco add incomes/expenses deletion
2023-10-27 16:34:20 +03:00
Dmitrii Cravcenco
6fc12d22b5 Merge remote-tracking branch 'origin/dmitrii-cravcenco-fixes' into dmitrii-cravcenco-fixes
# Conflicts:
#	src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
#	src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
2023-10-27 16:32:24 +03:00
Dmitrii Cravcenco
55dc6125ad Add expense/income deletion 2023-10-27 16:31:25 +03:00
Dmitrii Cravcenco
1ea883ae5f Add expense/income deletion 2023-10-27 16:25:44 +03:00
Daniel
00d56b7e19 Merge pull request #29 from lumijiez/front-v2
Fixed forms trying to input strings instead of ints
2023-10-27 01:28:16 +03:00
Daniel
94ef63253e Update README.md 2023-10-27 01:27:32 +03:00
Daniel
4403d60dc6 Update README.md 2023-10-27 01:27:07 +03:00
Daniel
4fdd67fa21 Update README.md 2023-10-27 01:25:52 +03:00
Daniel
7befb0dac7 Update README.md 2023-10-27 01:24:43 +03:00
525729a725 Fixed forms trying to input strings instead of ints 2023-10-27 01:09:12 +03:00
mirrerror
9fe17438f7 Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF 2023-10-27 00:53:16 +03:00
mirrerror
7bc9a460ed resolve conflicts 2023-10-27 00:53:06 +03:00