Commit Graph
257 Commits
Author SHA1 Message Date
Nícolas Agostini b346ee6222 Merge pull request #40 from JoaquinPar/fix/calculation-depreciation
Fix/calculation depreciation
2025-05-22 13:09:59 -07:00
nicoagostini 343a4f8275 fix/depreciation again 2025-05-22 13:09:26 -07:00
nicoagostini 0129315523 fix/depreciation again 2025-05-22 13:02:04 -07:00
knighthawk4227 f498386f96 Merge branch 'dev' 2025-05-22 12:39:46 -07:00
knighthawk4227 b3b06226ee fix/mobile layout 2025-05-22 12:39:17 -07:00
SowinskiBraeden d82bfd5b56 fix/name allow spaces 2025-05-22 12:23:34 -07:00
Joaquin Paredes a7bb955c8a Merge pull request #39 from JoaquinPar/dev
Merge dev into main
Sprint_4_deliverable
2025-05-22 11:14:30 -07:00
SowinskiBraeden 19081e3bd3 merge latest dev 2025-05-22 11:13:00 -07:00
SowinskiBraeden 7269814501 fix/limit age 2025-05-22 11:12:36 -07:00
nicoagostini 16f267bcd4 fix/calculations capped if you try to retire today 2025-05-22 11:09:15 -07:00
nicoagostini 8998283552 Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into dev 2025-05-22 10:43:29 -07:00
nicoagostini 5b6ce3b09d fix/Depreciation fixed, if asset value < 1000, use the input value 2025-05-22 10:42:53 -07:00
SowinskiBraeden e45b7ca946 merge latest dev 2025-05-22 10:38:50 -07:00
SowinskiBraeden c0e2d01ea6 fix/asset name aphanum restriction 2025-05-22 10:38:22 -07:00
nicoagostini 3d55a2b0d0 fix/ vehicle depreciation capped at one thousand 2025-05-22 10:37:05 -07:00
nicoagostini ec309fbafd fix/ Reinforce user to complete the financial questionnaire 2025-05-22 10:33:13 -07:00
knighthawk4227 c1adb31657 fixing indigo button 2025-05-22 00:21:35 -07:00
knighthawk4227 05fa5558e3 open modal of plan after pressing create new plan 2025-05-21 17:02:35 -07:00
knighthawk4227 d2e69f230f fixing conflicts 2025-05-21 16:54:17 -07:00
Nícolas Agostini 0672981e69 Merge pull request #38 from JoaquinPar/feature/vehicle-depreciation
feature/vehicle depreciation calculated towards total assets value
2025-05-21 16:40:15 -07:00
nicoagostini 5b147d4f46 feature/vehicle depreciation calculated towards total assets value 2025-05-21 16:39:19 -07:00
SowinskiBraeden d6425043cf Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-05-21 16:38:01 -07:00
SowinskiBraeden cf3d3738f1 fix/default hide year on asset create 2025-05-21 16:37:48 -07:00
knighthawk4227 cc6fd937db buttons blue 2025-05-21 16:16:29 -07:00
SowinskiBraeden b12d4bebe1 update/add year to car assets 2025-05-21 15:40:29 -07:00
SowinskiBraeden 7c09df0924 fix/asset modified date + des whitespace 2025-05-21 15:13:09 -07:00
SowinskiBraeden 44e674c7c9 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-05-21 15:03:45 -07:00
SowinskiBraeden 7c9e92345d fix/assets empty description 2025-05-21 15:03:26 -07:00
nicoagostini 17e3bdf4f4 fix/margin top on assets.ejs changed to match the application 2025-05-21 14:40:08 -07:00
SowinskiBraeden da0bfea655 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-05-21 13:59:20 -07:00
SowinskiBraeden 7fe94e1934 fix/password 2025-05-21 13:58:39 -07:00
nicoagostini 7fd7fa28ff fix/Router after editing fixed to plan/PlanId 2025-05-21 13:56:56 -07:00
SowinskiBraeden 163cb73b9d fix/validation error messages 2025-05-21 12:06:57 -07:00
SowinskiBraeden 9a61d362be update/project structure 2025-05-21 11:38:16 -07:00
SowinskiBraeden db392d1878 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-05-21 11:33:43 -07:00
SowinskiBraeden e50047b26a refactor/add headers to client side scripts 2025-05-21 11:33:26 -07:00
Joaquin 5bc26e334e fix/fixed input fields on login/signup not being required 2025-05-21 11:22:36 -07:00
SowinskiBraeden ce9345fad9 refactor/add required indicators 2025-05-21 11:17:12 -07:00
SowinskiBraeden 90d507e33c refactor/format assets 2025-05-21 11:14:47 -07:00
SowinskiBraeden dd9a0a1027 fix/allow decimal values in assets 2025-05-21 11:04:42 -07:00
Joaquin 231aca9ec5 fix/added required tooltips to some field forms 2025-05-21 11:04:08 -07:00
SowinskiBraeden 796dc245b2 fix/password reset email body 2025-05-21 10:53:34 -07:00
SowinskiBraeden 3dc1faaed5 fix/password reset 2025-05-21 10:47:27 -07:00
Joaquin 5b3d5cdce1 fix/improved user info retention on signup/login forms 2025-05-21 09:39:13 -07:00
nicoagostini 07b8325a14 fix/required fields are marked 2025-05-20 20:12:28 -07:00
nicoagostini c0174c2b22 fix/ now assets display the location currency OR CAD as default 2025-05-20 16:45:49 -07:00
nicoagostini 08397a1c89 refactor/edit plan 'reset' button added 2025-05-20 14:56:03 -07:00
Nícolas Agostini 273009f91f Merge pull request #37 from JoaquinPar/refactor/plans
refactor/ new plan as a modal pop up. Deletion and edition on plan cr…
2025-05-20 14:27:20 -07:00
knighthawk4227 436e242cf1 message if no plans 2025-05-20 14:25:48 -07:00
nicoagostini f1afcbd785 refactor/ new plan as a modal pop up. Deletion and edition on plan created 2025-05-20 14:25:27 -07:00