Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
1cf3957b65da8317e0f2f8cdbec1abb029b8c07d
Entry Size Revision Updated
src 1cf395 ... Wed 20 May, 2015 16:58:12 +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 599 bytes fca164 ... Tue 19 May, 2015 14:51:35 +0000
java.policy 396 bytes 06a849 ... Sat 07 Mar, 2015 13:48:38 +0000

Commits for RRRRHHHH_Code/ruralHouses

Revision Author Commited Message
1cf395 ... pinene picture pinene Wed 20 May, 2015 16:58:12 +0000

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

3a0296 ... 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 ... camjan Wed 20 May, 2015 16:46:45 +0000

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

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

Some bugs have been fixed

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

92bcb4 ... camjan Wed 20 May, 2015 13:00:47 +0000

mail service added when an owner is deleted from the system

1be833 ... camjan Wed 20 May, 2015 12:52:36 +0000

Minor changes

32ba0e ... camjan Wed 20 May, 2015 12:44:59 +0000

Now AdminManager gets the owner for removing them

34bf26 ... camjan Wed 20 May, 2015 12:32:05 +0000

minor changes