Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
4bc36b7ddf2a9626f60c551cf999ec24052087cc
Entry Size Revision Updated
.DS_Store 6K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
AddOffersGUI.java 8.4K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
AdminMenuGUI.java 2K 4bc36b ... Tue 19 May, 2015 23:23:13 +0000
BookRuralHouseConfirmationWindow.java 3.2K fca164 ... Tue 19 May, 2015 14:51:35 +0000
DeleteOfferGUI.java 3.5K fca164 ... Tue 19 May, 2015 14:51:35 +0000
DeleteOwnerGUI.java 3.6K 4bc36b ... Tue 19 May, 2015 23:23:13 +0000
HouseFeaturesGUI.java 9.2K 4bc36b ... Tue 19 May, 2015 23:23:13 +0000
HousesRelatedOwnerGUI.java 2.7K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
listOfAdditionRequestsGUI.java 4.7K e90cb4 ... Tue 19 May, 2015 19:39:31 +0000
listOfBookingRequestsGUI.java 5.1K 4bc36b ... Tue 19 May, 2015 23:23:13 +0000
listOfHousesGUI.java 2.8K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
listOfOffers.java 3.4K e90cb4 ... Tue 19 May, 2015 19:39:31 +0000
listOfOwnerAddittionRequests.java 4.4K e90cb4 ... Tue 19 May, 2015 19:39:31 +0000
listOfRemovalRequestsGUI.java 4.4K fca164 ... Tue 19 May, 2015 14:51:35 +0000
LoginGUI.java 4.2K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
ModifyHouseGUI.java 7K 4bc36b ... Tue 19 May, 2015 23:23:13 +0000
ModifyOfferGUI.java 10.6K 4bc36b ... Tue 19 May, 2015 23:23:13 +0000
OffersRelatedOwnerGUI.java 2.7K ad3773 ... Tue 19 May, 2015 18:01:40 +0000
OwnerMenuGUI.java 2.7K 4f8bcc ... Mon 18 May, 2015 09:49:54 +0000
OwnerRegistrationGUI.java 4.6K fca164 ... Tue 19 May, 2015 14:51:35 +0000
QueryAvailabilityGUI2.java 12K ad3773 ... Tue 19 May, 2015 18:01:40 +0000
RequestDeleteHouseGUI.java 2.7K 799949 ... Mon 18 May, 2015 11:12:36 +0000
RequestNewHouseGUI.java 10.5K 799949 ... Mon 18 May, 2015 11:12:36 +0000
StartWindow.java 4.3K 25898b ... Mon 18 May, 2015 15:26:01 +0000

Commits for RRRRHHHH_Code/ruralHouses client/src/gui

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

Owner deletion added

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

data now is gotten using queries

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

578bec ... epinzolas001 Mon 18 May, 2015 11:44:38 +0000

New owners now can be created properly.

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

debugging

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

Merge conflicts solutioned