Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
HEAD

Commits for RRRRHHHH_CoderuralHouses/src/domain/Account.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

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

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

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

fast com

e90cb4 ... Diff Diff camjan Tue 19 May, 2015 19:39:31 +0000

Owner deletion added

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

Account adding and deleting fixed

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

Merge conflicts solutioned

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

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

admin completed

bd03dd ... Diff Diff camjan Tue 10 Mar, 2015 13:06:22 +0000

Administrator class created delete debbuging started

41f4d3 ... epinzolas001 Fri 27 Feb, 2015 12:55:15 +0000

Created Account class to separate identification from the Owner