Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test #2

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOCANDA - version 0.4
LOCANDA - version 0.4 --

Thanks for trying Locanda. In this file you'll find some useful information to configure it according to the needs of your structure, and to start using it.

Expand Down Expand Up @@ -40,4 +40,4 @@ Starting from v0.3 each resource of the system can be searched by using a simple
HOUSED
Starting from v0.4, you can set for each booking, at the check-in, each person housed in that room.

Have fun with Locanda!
Have fun with Locanda!
12 changes: 12 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -461,4 +461,16 @@
<description>Locanda is an innovative booking management system designed for any touristical structure such as hotels, bed and breakfasts, guesthouses, farmhouses. Featuring a user-friendly and dynamic web interface, Locanda allows a seamless management of all the resources an owner has to control: Bookings, Rooms, Room Types, Guests, Extras, Price Lists, Seasons, Conventions. It is a system developed by the Open Source Lab c/o Sardegna Ricerche, Sardinia, Italy.</description>
<inceptionYear>Booking management system for hotels, bed&amp;breakfasts, guesthouses</inceptionYear>
<packaging>war</packaging>
<distributionManagement>
<repository>
<id>deployment</id>
<name>Internal Releases</name>
<url>http://ec2-52-202-83-90.compute-1.amazonaws.com:8081/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>deployment</id>
<name>Internal Snapshot Releases</name>
<url>http://ec2-52-202-83-90.compute-1.amazonaws.com:8081/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions webroot/WEB-INF/jsp/createAccount-input.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<s:url action="createAccount" var="url_createAccount"></s:url>
<jsp:include page="layout/header.jsp" />
<div id="home">
<h1><s:text name="title"/> - <s:text name="createAccount"/></h1>
<h1><s:text name="title"/> - <s:text name="JJB Account"/></h1>
<p><s:text name="homeWelcomeMessage"/>.</p>
<s:actionerror/><s:fielderror></s:fielderror>

Expand Down Expand Up @@ -55,4 +55,4 @@

<p id="home_images"></p>
</div>
<jsp:include page="layout/footer.jsp" />
<jsp:include page="layout/footer.jsp" />