Adding updates - #14

Open

gitanitraj wants to merge 149 commits into

ZCW-Spring26:masterfrom

thejoeflynn:master

Commits on Apr 20, 2026

Person Class Added
gitanitraj
committed
dfa9ffa
made address and person files
thejoeflynn
committed
3140e48
added more to Address
thejoeflynn
committed
dda22ea
Interface created
prachi0617
committed
eb0b2c2
Finished up Address and Person
thejoeflynn
committed
add4b58
Changes Removed
gitanitraj
committed
d2b6e6b
LibraryItem abstract completed
michaelgiovanisie
committed
0ab204f
Merge pull request #1 from thejoeflynn/Joe
thejoeflynn
authored
a4bc754
Merge pull request #3 from thejoeflynn/michaelgiovannisie
thejoeflynn
authored
9ffbff4
Merge branch 'master' into prachi
thejoeflynn
authored
d1f6cf7
Merge pull request #2 from thejoeflynn/prachi
thejoeflynn
authored
2e6e815
made address and person files

thejoeflynn
authored and
gitanitraj
committed
10f6939
added more to Address

thejoeflynn
authored and
gitanitraj
committed
7ab48a6
Finished up Address and Person

thejoeflynn
authored and
gitanitraj
committed
9ce4392
Added Librarian Class
gitanitraj
committed
374c96b
completed searchable interface
michaelgiovanisie
committed
8cdd748
some changes
prachi0617
committed
87fd994
initialising book.java
michaelgiovanisie
committed
1229805
some changes
prachi0617
committed
d086377
Merge pull request #5 from thejoeflynn/prachi
prachi0617
authored
2ba52ef
Added Librarian Class Merge remote-tracking branch 'origin/Joe' into Anitra
gitanitraj
committed
5b89bde
Merge branch 'master' into michaelgiovannisie
thejoeflynn
authored
668e9a4
Merge pull request #4 from thejoeflynn/michaelgiovannisie
thejoeflynn
authored
c0f56b9
Merge branch 'master' into Anitra
thejoeflynn
authored
4add427
Merge pull request #6 from thejoeflynn/Anitra
thejoeflynn
authored
1d471b0
finished book.java and made slight changes
michaelgiovanisie
committed
fa8a06e
Merge branch 'master' of https://github.com/thejoeflynn/OneLibrary into michaelgiovannisie
michaelgiovanisie
committed
b573bf5

Commits on Apr 21, 2026

Merge pull request #7 from thejoeflynn/michaelgiovannisie
thejoeflynn
authored
e72e363
Renamed CentralLibrary to OneLibrary
thejoeflynn
committed
96eba49
Merge pull request #8 from thejoeflynn/Joe
thejoeflynn
authored
677ec3b
renamed
collin-beck3
committed
e08d270
Deleted duplicate file
thejoeflynn
committed
5f5a27a
Merge pull request #9 from thejoeflynn/Joe
thejoeflynn
authored
6259469
fixed searchable
michaelgiovanisie
committed
5b87dca
Updated Member and LibraryItem Classes
gitanitraj
committed
2f910f1

Commits on Apr 22, 2026

made periodical class w/ comments
collin-beck3
committed
2dbbb85
UI mockup
thejoeflynn
committed
77a155b
Merge branch 'master' into Collin
thejoeflynn
authored
79273e5
Merge pull request #10 from thejoeflynn/Collin
thejoeflynn
authored
8fc1e8e
Merge pull request #11 from thejoeflynn/Joe
thejoeflynn
authored
6ab169b
Updated address
thejoeflynn
committed
c5ab6f8
Merge pull request #12 from thejoeflynn/Anitra2
gitanitraj
authored
8a56ef6
new UI design
thejoeflynn
committed
29863a9
Merge branch 'master' into michaelgiovannisie
thejoeflynn
authored
29251f7
Merge pull request #13 from thejoeflynn/michaelgiovannisie
thejoeflynn
authored
06b8648
Merge pull request #14 from thejoeflynn/Joe
thejoeflynn
authored
8b42c9e
finished Librarian
michaelgiovanisie
committed
3089724
Split UI Sketch and Main Application
thejoeflynn
committed
f00f751
Merge pull request #24 from thejoeflynn/Joe
thejoeflynn
authored
03cd560
finished library
michaelgiovanisie
committed
06d9d4f
Merge pull request #25 from thejoeflynn/michaelgiovannisie
thejoeflynn
authored
554fe18
Adding JSON setting
gitanitraj
committed
fad4716
Merge pull request #29 from thejoeflynn/Anitra2
gitanitraj
authored
d46f58e
Added Data from python crew (thank you python crew)
thejoeflynn
committed
2736181
Merge pull request #32 from thejoeflynn/Joe
thejoeflynn
authored
d091d07
Updated Libary maxDays
gitanitraj
committed
f02321c
added periodicaLoader
michaelgiovanisie
committed
84ba6e0
fixed searchable

michaelgiovanisie
authored and
collin-beck3
committed
0505d0d
UI mockup

thejoeflynn
authored and
collin-beck3
committed
a5606bc
Made a WIP User Interface
thejoeflynn
committed
92819fe
Merge branch 'master' into Joe
thejoeflynn
authored
d7c9dba
Updated Member and LibraryItem Classes

gitanitraj
authored and
collin-beck3
committed
8842b8f
Updated address

thejoeflynn
authored and
collin-beck3
committed
40e6993
new UI design

thejoeflynn
authored and
collin-beck3
committed
d715a85
Split UI Sketch and Main Application

thejoeflynn
authored and
collin-beck3
committed
8728d04
finished Librarian

michaelgiovanisie
authored and
collin-beck3
committed
08ff6a4
finished library

michaelgiovanisie
authored and
collin-beck3
committed
8bc039f
Adding JSON setting

gitanitraj
authored and
collin-beck3
committed
1f432f6
Added Data from python crew (thank you python crew)

thejoeflynn
authored and
collin-beck3
committed
892d25c
updated classes to "super pull" from LibraryItem, added constructor to LibraryItem, removed centralLibrary...AGAIN
collin-beck3
committed
4d9b6db
Merge branch 'master' into Collin
collin-beck3
authored
a396d02
Merge pull request #34 from thejoeflynn/Collin
collin-beck3
authored
7c8f766
Merge pull request #33 from thejoeflynn/Joe
collin-beck3
authored
6c488bb
UI works with while loop
thejoeflynn
committed
115e1bf
Merge pull request #35 from thejoeflynn/Joe
thejoeflynn
authored
8470a86
fixed searchable

michaelgiovanisie
authored and
gitanitraj
committed
cb67af7
Merge branch 'master' into michaelgiovannisie
michaelgiovannisie
authored
5bc3caa
Merge pull request #36 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
8f6dce0
UI mockup

thejoeflynn
authored and
gitanitraj
committed
0745e1c
Updated Member and LibraryItem Classes
gitanitraj
committed
8430352
Updated address

thejoeflynn
authored and
gitanitraj
committed
0507e8b
new UI design

thejoeflynn
authored and
gitanitraj
committed
0a1c87c
Split UI Sketch and Main Application

thejoeflynn
authored and
gitanitraj
committed
b272485
Added Data from python crew (thank you python crew)

thejoeflynn
authored and
gitanitraj
committed
48185eb
updated classes to "super pull" from LibraryItem, added constructor to LibraryItem, removed centralLibrary...AGAIN

collin-beck3
authored and
gitanitraj
committed
60903e7
resolved conflict
gitanitraj
committed
dcd4fd9
Made a WIP User Interface

thejoeflynn
authored and
gitanitraj
committed
9423907
UI works with while loop

thejoeflynn
authored and
gitanitraj
committed
a6784bd
resolved conflicts
gitanitraj
committed
e00ff60
Updated Libary maxDays
gitanitraj
committed
f06a303
Merge branch 'master' into Anitra2
gitanitraj
committed
0161fc9
completed music subclass
michaelgiovanisie
committed
fb05ade

Commits on Apr 23, 2026

Streamlined Main application
thejoeflynn
committed
f5c6cc5
Merge pull request #38 from thejoeflynn/michaelgiovannisie
thejoeflynn
authored
9f92b5b
Merge pull request #39 from thejoeflynn/Joe
thejoeflynn
authored
4669565
updating periodical loader, will test it soon.
michaelgiovanisie
committed
7bd3753
Merge pull request #40 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
d76fde8
made books screen
thejoeflynn
committed
e983f09
Merge pull request #41 from thejoeflynn/Joe
thejoeflynn
authored
c912a4d
resolved json conflict
gitanitraj
committed
25b2b2b
Updates to MainApplication
thejoeflynn
committed
45f0068
finished bookloader
michaelgiovanisie
committed
f917fe9
updated library
michaelgiovanisie
committed
85dc89d
Merge pull request #44 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
d56e279
updated book
michaelgiovanisie
committed
8acaf72
Merge pull request #45 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
4f4f138
updated periodical loader
michaelgiovanisie
committed
5b63907
Merge pull request #46 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
1393bec
More updates to main app.
thejoeflynn
committed
411e06d
Merge pull request #47 from thejoeflynn/Joe
thejoeflynn
authored
82a0fd4
small fixes
thejoeflynn
committed
00572a6
Merge pull request #48 from thejoeflynn/Joe
thejoeflynn
authored
be6616c
finalised periodical loader and updated periodical class
michaelgiovanisie
committed
b417fb5
Merge pull request #49 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
76e86c8
slight update periodical loader
michaelgiovanisie
committed
769604f
Merge pull request #50 from thejoeflynn/michaelgiovannisie
michaelgiovannisie
authored
62783ee

Commits on Apr 24, 2026

Added Dataloader
gitanitraj
committed
6faaabd
did a BUNCH of stuff. I'm not explaining look through it or ask questions.
thejoeflynn
committed
9b4f25f
finalised periodical loader and updated periodical class

michaelgiovanisie
authored and
thejoeflynn
committed
2484ee6
slight update periodical loader

michaelgiovanisie
authored and
thejoeflynn
committed
323ac89
Added Dataloader

gitanitraj
authored and
thejoeflynn
committed
4584d88
finalised periodical loader and updated periodical class

michaelgiovanisie
authored and
thejoeflynn
committed
b275be0
slight update periodical loader

michaelgiovanisie
authored and
thejoeflynn
committed
8af905a
Added Dataloader

gitanitraj
authored and
thejoeflynn
committed
fdf2c3c
did a BUNCH of stuff. I'm not explaining look through it or ask questions.
thejoeflynn
committed
0e38e40
finalised periodical loader and updated periodical class

michaelgiovanisie
authored and
thejoeflynn
committed
0bb1e47
slight update periodical loader

michaelgiovanisie
authored and
thejoeflynn
committed
a5745dd
Added Dataloader

gitanitraj
authored and
thejoeflynn
committed
fba0858
finalised periodical loader and updated periodical class

michaelgiovanisie
authored and
thejoeflynn
committed
afe1be8
slight update periodical loader

michaelgiovanisie
authored and
thejoeflynn
committed
85e5615
Added Dataloader

gitanitraj
authored and
thejoeflynn
committed
2daadce

Commits on Apr 25, 2026

Commits on Apr 26, 2026

Updated Main Application and DataLoader. Books, DVDs, and Periodicals now work.
thejoeflynn
committed
03c3466

Commits on Apr 27, 2026

Added InheritanceTestClass
prachi0617
committed
2bbd875
added test files from collin, updated pom.xml
thejoeflynn
committed
2944b93
Added Inheritance test class
prachi0617
committed
47e2407
temp push
thejoeflynn
committed
f2a1127
Fixed comma issue
thejoeflynn
committed
66bb299
IT WORKS! The search function works!
thejoeflynn
committed
a6bef5a
Fixed more issues. Specifically with showing more detail in view all / search.
thejoeflynn
committed
0467a8a
Merge pull request #65 from thejoeflynn/prachi
prachi0617
authored
175f755

Commits on Apr 28, 2026