Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
HEAD

Commits for RRRRHHHH_CoderuralHouses/src/businessLogic/BookingManager.java

Diff revisions: vs.
Revision Author Commited Message
08aaf3 ... Diff Diff camjan Wed 20 May, 2015 21:26:51 +0000

Started with the separated DB with the given code

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

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

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

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

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

Some bugs have been fixed

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

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

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

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

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

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

tmp

3e4f7e ... Diff Diff camjan Wed 08 Apr, 2015 13:18:53 +0000

New GUI for booking and querying availability

e16868 ... Diff Diff Eneko Pinzolas Murua Mon 09 Mar, 2015 13:02:33 +0000

deleted aplicationFacade and imported it’s functions to specific business logics.

e0d74d ... unknown Thu 26 Feb, 2015 19:24:02 +0000

Given code uploaded