Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
b09f345318baa9ca734e11c87f52f8522d7cc1fb
Entry Size Revision Updated
Account.java 996 bytes d30bcc ... Wed 20 May, 2015 16:32:33 +0000
Administrator.java 1.2K ccac99 ... Wed 20 May, 2015 16:42:17 +0000
Booking.java 974 bytes d30bcc ... Wed 20 May, 2015 16:32:33 +0000
Client.java 797 bytes fca164 ... Tue 19 May, 2015 14:51:35 +0000
Districs.java 861 bytes d30bcc ... Wed 20 May, 2015 16:32:33 +0000
HouseFeatures.java 788 bytes d30bcc ... Wed 20 May, 2015 16:32:33 +0000
Offer.java 2.8K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
Owner.java 1.5K ccac99 ... Wed 20 May, 2015 16:42:17 +0000
RuralHouse.java 2.4K ccac99 ... Wed 20 May, 2015 16:42:17 +0000

Commits for RRRRHHHH_Code/ruralHouses client/src/domain

Revision Author Commited Message
ccac99 ... 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 ... pinene picture pinene Wed 20 May, 2015 16:32:33 +0000

cleaning

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

Owner deletion added

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

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

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

Account adding and deleting fixed

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

debugging

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

Merge conflicts solutioned