The bug found in the presentation that we forgot to review has been fixed
Merged the two branches, DB separated
Separate DB almost fixed
DB server side improved some problems when showing bookings remain
Started with the separated DB with the given code
bookings were made to be taken from server per time they are searched
Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code Conflicts: ruralHouses client/src/domain/Owner.java ruralHouses client/src/domain/RuralHouse.java ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java ruralHouses client/src/gui/ModifyOfferGUI.java ruralHouses/src/dataAccess/DB4oManager.java ruralHouses/src/domain/Booking.java
cleaning
Booking deletion definite debbuging
Booking deletion fixed some minor problems remain
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code Conflicts: ruralHouses client/src/gui/HouseFeaturesGUI.java ruralHouses client/src/gui/ModifyOfferGUI.java ruralHouses/src/domain/RuralHouse.java
Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code Conflicts: ruralHouses client/src/gui/ModifyOfferGUI.java ruralHouses/src/dataAccess/DB4oManager.java
Owner deletion added
data now is gotten using queries
Problems when accepting bookings fixed
Some improvements done, owner deletion started, some bugs remain there
Account adding and deleting fixed
debugging
Merge conflicts solutioned
Booking confirmation and e-mail service added. Some bugs to be solved.