SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity
167 Commits 40 Branches 5 Tags
4a02b75a4dd2065d9174bbdfee98275c044f902f
Commit Graph
167 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
nicoagostini 4a02b75a4d fix/Footer scripts moved to a dedicated file 2025-05-14 12:53:58 -07:00
SowinskiBraeden 34c6dd2c66 Merge pull request #28 from JoaquinPar/fix/account_details_update 
Fix/account details update
 2025-05-14 12:16:34 -07:00
SowinskiBraeden 1f3109a68f Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into fix/account_details_update 2025-05-14 12:13:04 -07:00
SowinskiBraeden 9ae23ce25e fix account details not updating + update personal info 2025-05-14 12:12:48 -07:00
Nícolas Agostini c41f38ce6b Merge pull request #27 from JoaquinPar/feature/ai-challenge2 
Feature/ai challenge2
Challenge_2_deliverable 		2025-05-14 11:24:40 -07:00
Nícolas Agostini 5771f1372f Merge branch 'dev' into feature/ai-challenge2 2025-05-14 11:24:31 -07:00
nicoagostini 73d61d76de feature/AI feature updated to accept user input 2025-05-14 11:22:28 -07:00
nicoagostini 50e2d95fda feature/AI feature updated to accept user input 2025-05-14 11:21:10 -07:00
Joaquin 370d5d3292 merge dev into feature/challenge1_error_message 2025-05-14 09:41:39 -07:00
Joaquin c12bbe8336 removed debugging code 2025-05-14 09:40:06 -07:00
Joaquin 0d59c60a28 merge dev into feature/challenge1_error_message 2025-05-14 09:39:12 -07:00
Joaquin 5e2ac94212 fully implemented error handling for challenge 1 2025-05-14 09:37:09 -07:00
SowinskiBraeden f5bc2de24a Merge pull request #26 from JoaquinPar/fix/session_issues 
fix/login signup logout session bugs
 2025-05-14 09:36:38 -07:00
SowinskiBraeden 3771288123 fix/login+signup+logout session bugs 2025-05-14 09:34:32 -07:00
Nícolas Agostini ccae6a51ff Merge pull request #25 from JoaquinPar/feature/ai-challenge2 
Feature/ai challenge2
 2025-05-13 14:19:17 -07:00
nicoagostini 206b31e785 feature/ Surprise challenge #2 - AI pun button added and basic suggestion integrated in the plans 2025-05-13 14:18:21 -07:00
Joaquin 8166245ab1 feature/basic functionality added 2025-05-13 13:17:18 -07:00
Joaquin Paredes 79f0caa3c1 Merge pull request #23 from JoaquinPar/dev 
End of Sprint 2
Sprint_2_deliverable 		2025-05-10 16:35:08 -07:00
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