1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00

Merge pull request #32 from shalomleib/my-branch

My branch
This commit is contained in:
Hillel Coren 2014-03-17 13:17:48 +02:00
commit ea82406567
7 changed files with 23 additions and 7 deletions

View File

@ -122,8 +122,8 @@ var contactForm = {
<div class="row">
<div class="col-md-7">
<h2>Have a question or just want to say hi?</h2>
<p>Fill in the form below and we'll get back to you as soon as possible (within 24 hours). Hope to hear from you.</p>
<h2>Questions, special requests, or just want to say hi?</h2>
<p>Fill in the form below and we'll get back to you as soon as possible. Hope to hear from you!</p>
{{ Former::open('contact')->addClass('feedbackForm') }}
<div class="form-group">
@ -150,7 +150,7 @@ var contactForm = {
<div class="col-md-4 col-md-offset-1 address">
<h2>Other ways to reach us</h2>
<p><span class="glyphicon glyphicon-send"></span><a href="mailto:contact@invoiceninja.com">contact@invoiceninja.com</a></p>
<p><span class="glyphicon glyphicon-earphone"></span>(800) 763-1948</p>
<p><span class="glyphicon glyphicon-earphone"></span>+1-800-763-1948</p>
<p><span class="github"></span><div style="padding-top:10px"> &nbsp;&nbsp;<a href="https://github.com/hillelcoren/invoice-ninja" target="_blank">GitHub Project</a></div></p>
</div>

View File

@ -14,5 +14,9 @@
To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.
Regards,
The InvoiceNinja Team
</body>
</html>

View File

@ -4,6 +4,6 @@ A payment of {{ $paymentAmount }} was made by client {{ $clientName }} towards i
To view your client invoice click the link below:
{{ $invoiceLink }} <p/>
{{ $invoiceLink }}
To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications
To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications

View File

@ -9,6 +9,10 @@
The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
Regards,
The InvoiceNinja Team
To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
</body>

View File

@ -9,6 +9,10 @@
The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
Regards,
The InvoiceNinja Team
To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
</body>

View File

@ -2,4 +2,8 @@ Dear {{ $userName }},
The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount }}.
Regards,
The InvoiceNinja Team
To adjust your email notification settings visit this link http://www.invoiceninja.com/company/notifications

View File

@ -124,7 +124,7 @@
<div class="col-md-8 col-md-offset-2">
<h2>Use of Emailing Services</h2>
<p>Keep it legal and clean. Any User Account emailing invoices data, hyper-links, or other material that is unlawful, libelous, defamatory, pornographic, harassing, invasive, fraudulent or otherwise objectionable will be deactivated.</p>
<p>Content that would constitute criminal offense or create legal liability, violate copyright, trademark, or intellectual property will be deleted or provided to legal authorities.</p>
<p>Content that would constitute criminal offence or create legal liability, violate copyright, trademark, or intellectual property will be deleted or provided to legal authorities.</p>
</div>
</div>
</div>
@ -149,7 +149,7 @@
<div class="col-md-8 col-md-offset-2">
<h2>Limited Liability</h2>
<p>User Accounts and Clients agree to indemnify, defend, and hold invoiceninja.com, its directors or employees harmless against any and all liability and cost as a result of using invoiceninja.com. User Accounts and Clients shall not assert any claim or allegation of any nature whatsoever against invoiceninja.com, its directors or employees. </p>
<p>Invoiceninja.com shall not be liable for damages of any kind, including but not limited to loss of site use, loss of profits or loss of data, tort or otherwise, arising out of or in any way connected with the use of or inability to use invoicenin.com.</p>
<p>Invoiceninja.com shall not be liable for damages of any kind, including but not limited to loss of site use, loss of profits or loss of data, tort or otherwise, arising out of or in any way connected with the use of or inability to use invoiceninja.com.</p>
<p>You shall defend, indemnify and hold harmless invoiceninja.com from any loss, damages, liabilities, expenses, claims and proceedings arising out of your use of invoiceninja.com.</p>
</div>
</div>