Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
c92b616b1406bb5ff52624836f0608e8c5062451

Commits for RRRRHHHH_Code/

Revision Author Commited Message
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

998673 ... pinene picture pinene Tue 19 May, 2015 19:42:25 +0000

fast com

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

data now is gotten using queries

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

6a5d4d ... camjan Sun 17 May, 2015 20:35:45 +0000

Booking confirmation and e-mail service added. Some bugs to be solved.

7bf57b ... camjan Sun 17 May, 2015 11:59:22 +0000

Possibility of registering new owners added

0f75b2 ... camjan Sat 16 May, 2015 14:34:49 +0000

Username is saved hashed and password hashed and salted

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

Started creating the booking interface for the owners.

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

debugging

bdf772 ... pinene picture pinene Sun 19 Apr, 2015 19:24:55 +0000

debugging

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

database management

42679b ... 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 ... pinene picture pinene Sun 19 Apr, 2015 14:09:12 +0000

tmp

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

debugging...

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

no warnings

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

last version with phone regex

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

Debbugin continues...

ba6020 ... 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 ... camjan Wed 15 Apr, 2015 15:27:07 +0000

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

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

admin completed

e2ae30 ... 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.