Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
4f8bcc7fa6ac7640915ac3aa5e115b6d37c08a86
Entry Size Revision Updated
src 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
.classpath 440 bytes 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
.DS_Store 6K 06a849 ... Sat 07 Mar, 2015 13:48:38 +0000
.gitignore 40 bytes 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
.project 370 bytes e0d74d ... Thu 26 Feb, 2015 19:24:02 +0000
config.out.xml 0 bytes 0f75b2 ... Sat 16 May, 2015 14:34:49 +0000
config.xml 598 bytes 6a5d4d ... Sun 17 May, 2015 20:35:45 +0000
java.policy 396 bytes 06a849 ... Sat 07 Mar, 2015 13:48:38 +0000

Commits for RRRRHHHH_Code/ruralHouses

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