Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
HEAD

Commits for RRRRHHHH_Code/ruralHouses client

Revision Author Commited Message
076d76 ... camjan Fri 22 May, 2015 22:22:23 +0000

The bug found in the presentation that we forgot to review has been fixed

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

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

Owner deletion added

ad3773 ... pinene picture pinene Tue 19 May, 2015 18:01:40 +0000

data now is gotten using queries

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

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

25898b ... camjan Mon 18 May, 2015 15:26:01 +0000

Account adding and deleting fixed

578bec ... epinzolas001 Mon 18 May, 2015 11:44:38 +0000

New owners now can be created properly.

799949 ... epinzolas001 Mon 18 May, 2015 11:12:36 +0000

debugging

4f8bcc ... epinzolas001 Mon 18 May, 2015 09:49:54 +0000

Merge conflicts solutioned