SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity
249 Commits 40 Branches 5 Tags
19081e3bd34d1f2947c305858e934442d7188d2c
Commit Graph
249 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nícolas Agostini 4f73959cfb Merge pull request #22 from JoaquinPar/fix/16-hovering-hides-progress 
Progress bar background changed to black to avoid disappearing
 2025-05-09 15:54:45 -07:00
nicoagostini 6444d7afa7 Progress bar background changed to black to avoid disappearing 2025-05-09 15:53:40 -07:00
Nícolas Agostini daa984a48f Merge pull request #21 from JoaquinPar/fix/questionnaireFix 
Issue 19: Questionnaire more than once, fixed
 2025-05-09 14:04:31 -07:00
nicoagostini 383bd15263 Issue 19: Questionnaire more than once, fixed 2025-05-09 14:03:35 -07:00
knighthawk4227 1e44e8ddfb moving resetLink post to forgotpass.js 2025-05-09 11:25:36 -07:00
knighthawk4227 cc875b4e22 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-05-09 11:24:03 -07:00
knighthawk4227 f3dbbebb43 moving resetLink post to forgotpass.js 2025-05-09 11:18:25 -07:00
Joaquin 4ee885ac57 fix/reorganized scripts called in ejs files Challege_1_deliverable 2025-05-09 11:06:13 -07:00
knighthawk4227 f3b121fc71 Merge branch 'feature/forgotPass' into dev 2025-05-09 11:03:02 -07:00
knighthawk4227 07824e6355 merge cnflicts with dev 2025-05-09 11:02:31 -07:00
Joaquin 22850ab2a2 fix/removed redundant code and fixed UI challenge 1 problem 2025-05-09 10:55:02 -07:00
SowinskiBraeden 69fd776c0f fix/enhanced user input validation 2025-05-09 10:29:20 -07:00
knighthawk4227 671b67be9d Merge branch 'dev' into feature/forgotPass 2025-05-09 10:27:33 -07:00
knighthawk4227 99b36d3370 fixing conflict with dashboard.ejs 2025-05-09 10:26:18 -07:00
SowinskiBraeden 1f742d41c3 fix/signup using existing email 2025-05-09 10:23:34 -07:00
SowinskiBraeden 18bee21941 Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev 2025-05-09 10:07:16 -07:00
knighthawk4227 1fcd12c6da fixing merge conflicts 2025-05-09 10:04:24 -07:00
SowinskiBraeden 0a9c176274 fix/default asset icon creation 2025-05-09 10:00:51 -07:00
knighthawk4227 1587f363f7 fixing reset link session 2025-05-09 09:50:38 -07:00
SowinskiBraeden 540e191d27 refactor/remove debug statements 2025-05-09 09:49:14 -07:00
SowinskiBraeden 1e01e022bf Merge pull request #14 from JoaquinPar/feature/asset-select-icon 
update+fix/asset icons + load geolocation scripts
 2025-05-08 23:32:40 -07:00
SowinskiBraeden 73a510252b update+fix/asset icons + load geolocation scripts 2025-05-08 23:30:13 -07:00
SowinskiBraeden 42ea4ed8bc fix/issue #13 2025-05-08 21:40:39 -07:00
Nícolas Agostini 1ddb6a9900 Merge pull request #12 from JoaquinPar/feature/progressBar 
Progress bar calculations added, displaying and updating the database
 2025-05-08 20:10:37 -07:00
nicoagostini 9c0c560441 Progress bar calculations added, displaying and updating the database 2025-05-08 20:09:22 -07:00
SowinskiBraeden 5763f03288 fix/geolocation api key 2025-05-08 18:14:22 -07:00
SowinskiBraeden ed06b8731d fix/404 not found handling 2025-05-08 18:13:06 -07:00
SowinskiBraeden 345cbd2bf2 fix/database not awaited 2025-05-08 18:09:22 -07:00
SowinskiBraeden c4a90ceb15 fix/.env example + delete .vscode folder 2025-05-08 11:14:22 -07:00
SowinskiBraeden ac66323a78 fix/remove deprecated page 2025-05-08 11:02:10 -07:00
knighthawk4227 c64da1de46 fixing conflicts and merging dev 2025-05-08 10:44:38 -07:00
knighthawk4227 7a5d2e7490 fixing conflicts merging dev into this 2025-05-08 10:40:31 -07:00
Joaquin Paredes 32437a6e36 fix/fixed rendering pages 2025-05-08 10:38:32 -07:00
knighthawk4227 fc39bcf693 nodemailer dependencies 2025-05-08 10:32:10 -07:00
knighthawk4227 29d682c4e8 fixing joi validation 2025-05-07 19:26:00 -07:00
knighthawk4227 15dd4e0d20 forgot password validatation using joi 2025-05-07 19:09:25 -07:00
knighthawk4227 cb59e86d8a fixing merge conflicts and forgot password functionality 2025-05-07 17:44:06 -07:00
Joaquin cec777d1bf fix/fixed problem when routing to dashboard 2025-05-07 17:11:58 -07:00
Joaquin 605c7b3734 solved merge conflict 2025-05-07 17:02:09 -07:00
Joaquin 1b6c80f84d feature/fully implemented challenge 1 2025-05-07 16:56:26 -07:00
SowinskiBraeden ddf07eee11 fix/middleware+404 handling block plans 2025-05-07 16:24:09 -07:00
SowinskiBraeden 640ae859e5 Merge pull request #10 from JoaquinPar/feature/delete_account 
Feature/delete account
 2025-05-07 15:45:38 -07:00
SowinskiBraeden 54024bd7a2 fix/delete assets + plans on account delete 2025-05-07 15:33:07 -07:00
SowinskiBraeden 821843088d update/delete user account 2025-05-07 15:04:11 -07:00
Joaquin 2ad43139de merged dev and added some challenge 1 functionality 2025-05-07 13:06:22 -07:00
SowinskiBraeden 04a7fa428c Merge pull request #8 from JoaquinPar/feature/404 
fix/middleware preventing 404 redirect
 2025-05-07 13:04:54 -07:00
knighthawk4227 088f9ea55a reset pass logic 2025-05-07 13:03:26 -07:00
SowinskiBraeden cadbc2187d fix/middleware preventing 404 redirect 2025-05-07 13:01:24 -07:00
nicoagostini f417ac00fb fix/ Plans creation/display bug fixed 2025-05-07 11:37:33 -07:00
SowinskiBraeden b2e795427d fix/remove duplicated code 2025-05-07 10:53:28 -07:00