Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
HEAD

Commits for RRRRHHHH_CoderuralHouses/src/dataAccess/DB4oManager.java

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

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

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

Merged the two branches, DB separated

3db092 ... Diff Diff camjan Thu 21 May, 2015 10:41:31 +0000

Separate DB almost fixed

be3833 ... Diff Diff camjan Wed 20 May, 2015 22:55:11 +0000

DB server side improved some problems when showing bookings remain

08aaf3 ... Diff Diff camjan Wed 20 May, 2015 21:26:51 +0000

Started with the separated DB with the given code

3a0296 ... Diff Diff 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 ... 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

1d7e49 ... Diff Diff camjan Wed 20 May, 2015 09:15:52 +0000

Booking deletion definite debbuging

85d983 ... Diff Diff camjan Wed 20 May, 2015 09:05:53 +0000

Booking deletion fixed some minor problems remain

4bc36b ... Diff Diff 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 ... Diff Diff 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 ... Diff Diff camjan Tue 19 May, 2015 19:39:31 +0000

Owner deletion added

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

data now is gotten using queries

556478 ... Diff Diff camjan Tue 19 May, 2015 17:49:42 +0000

Problems when accepting bookings fixed

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

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

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

Account adding and deleting fixed

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

debugging

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

Merge conflicts solutioned

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

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

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

Possibility of registering new owners added

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

Username is saved hashed and password hashed and salted

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

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

debugging