Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
ccac9974c8183f7f0d30e8cabd84ee0386e8cd97
Entry Size Revision Updated
ruralHouses ccac99 ... Wed 20 May, 2015 16:42:17 +0000
ruralHouses client ccac99 ... Wed 20 May, 2015 16:42:17 +0000

Commits for RRRRHHHH_Code/

Revision Author Commited Message
ccac99 ... 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

d30bcc ... pinene picture pinene Wed 20 May, 2015 16:32:33 +0000

cleaning

1be833 ... camjan Wed 20 May, 2015 12:52:36 +0000

Minor changes

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

Now AdminManager gets the owner for removing them

34bf26 ... camjan Wed 20 May, 2015 12:32:05 +0000

minor changes

1d7e49 ... camjan Wed 20 May, 2015 09:15:52 +0000

Booking deletion definite debbuging

85d983 ... camjan Wed 20 May, 2015 09:05:53 +0000

Booking deletion fixed some minor problems remain

4bc36b ... 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

c92b61 ... pinene picture pinene Tue 19 May, 2015 19:44:47 +0000

Merge branch ‘master’ of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java

998673 ... pinene picture pinene Tue 19 May, 2015 19:42:25 +0000

fast com