 Joaquin
|
4050e95cc3
|
fixed conflict
|
2025-05-06 09:30:30 -07:00 |
|
|
Joaquin
|
ae3ddbeaeb
|
Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into dev
|
2025-05-06 09:30:22 -07:00 |
|
|
Joaquin
|
54566f05b7
|
feature/fully implemented ejs inclusion to main files
|
2025-05-05 21:56:47 -07:00 |
|
|
Joaquin
|
decdb299b7
|
Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into feature/layoutPage
|
2025-05-05 21:17:50 -07:00 |
|
|
Joaquin
|
c8bf2e49ab
|
feature/completed most of ejs implementation into other pages
|
2025-05-05 21:12:52 -07:00 |
|
|
Joaquin
|
f6640b23cf
|
feature/some progress made on layouts
|
2025-05-05 17:07:51 -07:00 |
|
|
Joaquin
|
4be7ca3a8e
|
Merge branch 'dev' into feature/layoutPage
|
2025-05-05 16:30:51 -07:00 |
|
|
Joaquin
|
10541d2428
|
merge feature/navBar with dev
|
2025-05-05 16:26:01 -07:00 |
|
|
Joaquin
|
7fa75457c9
|
feature/completed navbar/header functionality
|
2025-05-05 16:24:25 -07:00 |
|
|
Joaquin
|
8b6ff1354b
|
resolved merge conflict
|
2025-05-05 14:27:24 -07:00 |
|
|
Joaquin
|
4bcf8dd812
|
feature/started work on layout.ejs
|
2025-05-05 14:21:30 -07:00 |
|
|
Joaquin Paredes
|
02a8374a58
|
feature/most nav bar functionality done
|
2025-05-02 13:15:38 -07:00 |
|
|
Joaquin
|
e4a6c7ef36
|
merge feature/routing with dev
|
2025-04-30 17:17:00 -07:00 |
|
|
Joaquin
|
3ef8129196
|
update/created routing for pages
|
2025-04-30 17:15:23 -07:00 |
|