Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
master
Entry Size Revision Updated
ruralHouses 076d76 ... Fri 22 May, 2015 22:22:23 +0000
ruralHouses client 076d76 ... Fri 22 May, 2015 22:22:23 +0000
ruralHousesDB 8012b0 ... Thu 21 May, 2015 17:19:07 +0000

Commits for RRRRHHHH_Code/

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

8012b0 ... camjan Thu 21 May, 2015 17:19:07 +0000

Merged the two branches, DB separated

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

1cf395 ... pinene picture pinene Wed 20 May, 2015 16:58:12 +0000

Merge branch ‘master’ of ssh://xp-dev.com/RRRRHHHH_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

b09f34 ... camjan Wed 20 May, 2015 16:46:45 +0000

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

e3043c ... camjan Wed 20 May, 2015 16:45:21 +0000

Some bugs have been fixed

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