Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
HEAD

Commits for RRRRHHHH_CoderuralHouses client/src/gui/DeleteOwnerGUI.java

Diff revisions: vs.
Revision Author Commited Message
ccac99 ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:42:17 +0000

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

32ba0e ... Diff Diff camjan Wed 20 May, 2015 12:44:59 +0000

Now AdminManager gets the owner for removing them

4bc36b ... Diff Diff camjan Tue 19 May, 2015 23:23:13 +0000

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

e90cb4 ... Diff Diff camjan Tue 19 May, 2015 19:39:31 +0000

Owner deletion added

fca164 ... camjan Tue 19 May, 2015 14:51:35 +0000

Some improvements done, owner deletion started, some bugs remain there