SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity
231 Commits 40 Branches 5 Tags
7c09df09240c557e1afc6e179d60fc6d29ee67ba
Commit Graph
231 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joaquin 6ecd1ee848 implemented more page 2025-05-16 00:22:13 -07:00
Joaquin c839d023a7 fix/removed scrolling from login/signup pages 2025-05-15 21:46:58 -07:00
Joaquin cfcfd7778d feature/more page in nav bar completed 2025-05-15 21:30:58 -07:00
SowinskiBraeden 450e46f9e5 Merge pull request #30 from JoaquinPar/update/password_security 
update/password security
 2025-05-15 13:38:17 -07:00
SowinskiBraeden 3940089fa6 update/password security 2025-05-15 08:20:28 -07:00
knighthawk4227 0834723c99 Merge branch 'dev' into feature/dashboardInfo 2025-05-14 21:51:26 -07:00
knighthawk4227 1acb749f1f name of js file 2025-05-14 21:50:41 -07:00
knighthawk4227 563fa502d1 progress bar on dashboard & number formatting 2025-05-14 21:47:50 -07:00
SowinskiBraeden aa9e412fa1 Merge pull request #29 from JoaquinPar/refactor/assets 
Refactor/assets
 2025-05-14 15:06:00 -07:00
SowinskiBraeden 60238b7a9a add dropdown scripts 2025-05-14 15:05:14 -07:00
SowinskiBraeden 61db8e162f Merge dev into refactor/assets 2025-05-14 14:46:34 -07:00
SowinskiBraeden 1c5031f48c split assets into partials 2025-05-14 14:43:34 -07:00
SowinskiBraeden b040f12eaf split assets into partials 2025-05-14 14:43:17 -07:00
nicoagostini 4a02b75a4d fix/Footer scripts moved to a dedicated file 2025-05-14 12:53:58 -07:00
Joaquin f7377f6844 feature/most functionality created 2025-05-14 12:42:50 -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