Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
ccac9974c8183f7f0d30e8cabd84ee0386e8cd97

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

dd0098 ... Diff Diff pinene picture pinene Sun 19 Apr, 2015 15:23:19 +0000

database management

e3c426 ... Diff Diff Eneko Pinzolas Murua Sat 18 Apr, 2015 14:10:51 +0000

debugging...

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

no warnings

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

Debbugin continues...

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

66f0c8 ... Eneko Pinzolas Murua Sun 12 Apr, 2015 18:11:42 +0000

Model modified so that owners now request for a new house insetion or a house removal. Furthermore, all Administrator GUI and bussines logic create. However, Login GUI and BussinesLogic are to be modified so that they integrate Admin identification.