Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
3db0928331c5d4caaa16db7b63df6617c7bcb480
Entry Size Revision Updated
src 3db092 ... Thu 21 May, 2015 10:41:31 +0000
.classpath 379 bytes ad3773 ... Tue 19 May, 2015 18:01:40 +0000
.DS_Store 6K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
.gitignore 28 bytes 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
.project 377 bytes 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
java.policy 396 bytes 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000

Commits for RRRRHHHH_Code/ruralHouses client

Revision Author Commited Message
3db092 ... camjan Thu 21 May, 2015 10:41:31 +0000

Separate DB almost fixed

be3833 ... camjan Wed 20 May, 2015 22:55:11 +0000

DB server side improved some problems when showing bookings remain

08aaf3 ... camjan Wed 20 May, 2015 21:26:51 +0000

Started with the separated DB with the given code

3a0296 ... pinene picture pinene Wed 20 May, 2015 16:57:47 +0000

bookings were made to be taken from server per time they are searched

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

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

Now AdminManager gets the owner for removing them

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