Commits on Source (79)
-
Akshita Amarnath authored3b59896a
-
Akshita Amarnath authored71ceacdd
-
Shangzhen Yang authoredVerified61a05cdb
-
Akshita Amarnath authorede35e2d54
-
Shangzhen Yang authoredVerified0a6e86bb
-
Rayana Lyons authored7258abbe
-
Shangzhen Yang authored
# Conflicts: # Products.java
7e31034c -
Shangzhen Yang authoredVerified981f489f
-
Akshita Amarnath authored04a50fe6
-
Tony authored0f38e27e
-
Tony authoredfbc19e41
-
Rayana Lyons authoreda0a33eaf
-
Bryan Zhao authored1cdb1a0a
-
Akshita Amarnath authoredf13b91cd
-
Tony authored
Update.
5d9c7cee -
Pranav Teegavarapu authoredda260263
-
Esther Kim authoreda50e5646
-
Esther Kim authored
Added gudetama.jpg See merge request !140
4161b3ee -
Akshita Amarnath authored
Akshiam staff page See merge request !136
f770e600 -
Boshan Chen authored4c42a065
-
Pranav Teegavarapu authored
# Conflicts: # Staff.java
51ef418c -
Rayana Lyons authored
# Conflicts: # Staff.java
316f5d45 -
Bryan Zhao authored25d64e2e
-
Boshan Chen authored7e70b2bc
-
Ben Oreizy authoredab077755
-
Ben Oreizy authored
Add staff member benore and TS product See merge request !147
47388480 -
Pranav Teegavarapu authoreda0435dc3
-
Pranav Teegavarapu authored98e10f39
-
Boshan Chen authored
# Conflicts: # Products.java # Staff.java
14330688 -
Boshan Chen authored
boschen See merge request !144
afc86bbe -
Pranav Teegavarapu authored6d0c5b5e
-
Matthew Wang authoredc5429c73
-
Esther authoreda471125b
-
Pranav Teegavarapu authored635c4317
-
Pranav Teegavarapu authored
update page pranavnt See merge request !143
e185cc50 -
Lindsey Wei authored7c6ac8f7
-
Lindsey Wei authored
Upload picture See merge request !152
2367920a -
Rayana Lyons authored
# Conflicts: # Products.java # Staff.java
1452f12c -
Rayana Lyons authored
Staff page See merge request !141
c3d9bd98 -
Rayana Lyons authoredf893a612
-
Esther Kim authored
# Conflicts: # Products.java # Staff.java
87063b6c -
Esther Kim authored
Added product and bio See merge request !153
2f2a30b5 -
Lindsey Wei authored73c2594b
-
Lindsey Wei authored
Chocolate Ice Cream See merge request !157
311cbc24 -
Bryan Zhao authoredfe3d51ba
-
Smayan Nirantare authoredabaf006b
-
Shangzhen Yang authored
# Conflicts: # Products.java # Staff.java
0bdd9361 -
Arohan Agate authoredaa405f96
-
Smayan Nirantare authored399a3791
-
Shangzhen Yang authoredVerifiedae4f190a
-
Kris Tong authored05c33d2e
-
Smayan Nirantare authored3608cf32
-
Shangzhen Yang authored
Add shangy24's work See merge request !132
bca8dda5 -
WILLIAM authored527f5432
-
Smayan Nirantare authored
added to Staff.java and Products.java and pics added See merge request !158
8dd8b62c -
Kris Tong authoredca951ddf
-
Bryan Zhao authored
Merge branch 'bohanz04_staff_page' of gitlab.cs.washington.edu:cse391/24wi/faang into bohanz04_staff_page
48aaa5cf -
Bryan Zhao authored7b22a636
-
Kris Tong authored
# Conflicts: # Products.java
cbb6deca -
Bryan Zhao authored
Bohanz04 staff page See merge request !162
4e5a41b1 -
Kris Tong authored
# Conflicts: # Staff.java
aa384dcd -
Shangzhen Yang authoredVerified43d75d5c
-
Shangzhen Yang authored
# Conflicts: # Staff.java
47f17f2a -
Shangzhen Yang authoredVerified5a9f4743
-
Shangzhen Yang authored
Readd shangy24 method in Staff See merge request !164
397aaae9 -
Arohan Agate authored7d5dfd1e
-
William Gong authored
# Conflicts: # Products.java # Staff.java
8fefff8a -
Arohan Agate authored2c679e4e
-
Arohan Agate authored
added new staff and product pages See merge request !166
2ce775d0 -
Rayana Lyons authored
# Conflicts: # Staff.java
756af457 -
Mariana Shuman authoredfd7cac5d
-
WILLIAM authorede60447db
-
Rayana Lyons authored
rlyons8 staff bio and product See merge request !154
2bddcd1f -
WILLIAM authored
resolving merge conflict
a50c228f -
William Gong authored
commit for wgong2 See merge request !163
411f6e61 -
Mariana Shuman authored
# Conflicts: # Products.java # Staff.java
3c9642b1 -
Mariana Shuman authored
Add Employee and Product Object See merge request !169
13335131
Showing
- .nfs0000000002e4ae7d00006849 0 additions, 0 deletions.nfs0000000002e4ae7d00006849
- Products.java 133 additions, 0 deletionsProducts.java
- Staff.java 128 additions, 1 deletionStaff.java
- images/products/Lake.jpg 0 additions, 0 deletionsimages/products/Lake.jpg
- images/products/Tree.webp 0 additions, 0 deletionsimages/products/Tree.webp
- images/products/acura.jpg 0 additions, 0 deletionsimages/products/acura.jpg
- images/products/chocolate_ice_cream.jpg 0 additions, 0 deletionsimages/products/chocolate_ice_cream.jpg
- images/products/dollar_bill.jpg 0 additions, 0 deletionsimages/products/dollar_bill.jpg
- images/products/folkloreac.png 0 additions, 0 deletionsimages/products/folkloreac.png
- images/products/gudetama.jpg 0 additions, 0 deletionsimages/products/gudetama.jpg
- images/products/metaquest.jpg 0 additions, 0 deletionsimages/products/metaquest.jpg
- images/products/sleepCoke.jpg 0 additions, 0 deletionsimages/products/sleepCoke.jpg
- images/products/test2.jpg 0 additions, 0 deletionsimages/products/test2.jpg
- images/products/violin-photo.jpeg 0 additions, 0 deletionsimages/products/violin-photo.jpeg
- images/products/win10.jpg 0 additions, 0 deletionsimages/products/win10.jpg
- images/staff/360_F_555938384_8LsT1k41T4hnSNeSI0ahqYt9Ug03bJkW.jpg 0 additions, 0 deletions...taff/360_F_555938384_8LsT1k41T4hnSNeSI0ahqYt9Ug03bJkW.jpg
- images/staff/MountainSunset.jpg 0 additions, 0 deletionsimages/staff/MountainSunset.jpg
- images/staff/NormanRockwell.jpg 0 additions, 0 deletionsimages/staff/NormanRockwell.jpg
- images/staff/White.jpg 0 additions, 0 deletionsimages/staff/White.jpg
- images/staff/benore.jpg 0 additions, 0 deletionsimages/staff/benore.jpg
.nfs0000000002e4ae7d00006849
0 → 100644
File added
images/products/Lake.jpg
0 → 100644
540 KiB
images/products/Tree.webp
0 → 100644
197 KiB
images/products/acura.jpg
0 → 100644
174 KiB
images/products/chocolate_ice_cream.jpg
0 → 100644
11.6 KiB
images/products/dollar_bill.jpg
0 → 100644
213 KiB
images/products/folkloreac.png
0 → 100644
79.4 KiB
images/products/gudetama.jpg
0 → 100644
67.1 KiB
images/products/metaquest.jpg
0 → 100644
31.4 KiB
images/products/sleepCoke.jpg
0 → 100644
126 KiB
images/products/test2.jpg
0 → 100644
218 KiB
images/products/violin-photo.jpeg
0 → 100644
20.8 KiB
images/products/win10.jpg
0 → 100644
221 KiB
56.6 KiB
images/staff/MountainSunset.jpg
0 → 100644
371 KiB
images/staff/NormanRockwell.jpg
0 → 100644
20.5 KiB
images/staff/White.jpg
0 → 100644
961 B
images/staff/benore.jpg
0 → 100644
175 KiB