Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
ccac9974c8183f7f0d30e8cabd84ee0386e8cd97

Commits for RRRRHHHH_CoderuralHouses/src/gui/ModifyHouseGUI.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

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

cleaning

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

Merge conflicts solutioned

d7fd17 ... Diff Diff Eneko Pinzolas Murua Mon 27 Apr, 2015 12:01:38 +0000

Started creating the booking interface for the owners.

153110 ... Diff Diff Eneko Pinzolas Murua Sun 19 Apr, 2015 21:47:53 +0000

debugging

42679b ... Diff Diff pinene picture pinene Sun 19 Apr, 2015 14:18:02 +0000

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

Conflicts:
ruralHouses/src/businessLogic/OfferManager.java
ruralHouses/src/gui/HouseFeaturesGUI.java
ruralHouses/src/gui/ModifyHouseGUI.java
ruralHouses/src/gui/StartWindow.java

520867 ... Diff Diff pinene picture pinene Sun 19 Apr, 2015 14:09:12 +0000

tmp

837fab ... Diff Diff Eneko Pinzolas Murua Sat 18 Apr, 2015 14:09:49 +0000

no warnings

d5b843 ... Diff Diff Eneko Pinzolas Murua Sat 18 Apr, 2015 14:01:54 +0000

last version with phone regex

46d6c3 ... Diff Diff camjan Wed 15 Apr, 2015 17:08:42 +0000

Debbugin continues...

ba6020 ... Diff Diff camjan Wed 15 Apr, 2015 15:47:17 +0000

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

Conflicts:
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/gui/ModifyHouseGUI.java

5761bc ... Diff Diff camjan Wed 15 Apr, 2015 15:27:07 +0000

Bugs when deleting houses and offers fixed and GUI’s adapated for empty cases

2ac167 ... Diff Diff Eneko Pinzolas Murua Wed 15 Apr, 2015 13:53:44 +0000

admin completed

e2ae30 ... Diff Diff Eneko Pinzolas Murua Tue 14 Apr, 2015 15:07:35 +0000

imports leaned

cff7b0 ... Diff Diff camjan Wed 08 Apr, 2015 11:57:07 +0000

House features gui created

5ad0cc ... Diff Diff Eneko Pinzolas Murua Wed 01 Apr, 2015 17:46:59 +0000

ModifyHouseGUI created and its link from HouseRelatedOwnerGUI reestablished

a92725 ... pinene picture pinene Fri 06 Mar, 2015 09:41:12 +0000

implemented lacking GUIs and corrected errors