Merge branch 'release/0.6.83'

app/views/pages/imprint.html.erb

@@ -9,6 +9,6 @@
 </p>
 
 <p>
-  Web: <a href="http://curlybrackets.it">http://curlybrackets.it</a><br/>
+  Telephone: +39 349 0531 006<br/>
   E-mail: <a href="mailto:hello@curlybrackets.it">hello@curlybrackets.it</a>
 </p>

app/views/pages/privacy.html.erb

@@ -53,6 +53,6 @@
 
 <h3>Contacting us</h3>
 
-<p>If you have any questions about this Privacy Policy, the practices of this site, or your dealings with this site, please <a href="http://twitter.com/tomatoesapp">contact us</a>.</p>
+<p>If you have any questions about this Privacy Policy, the practices of this site, or your dealings with this site, please <a href="mailto:hello@curlybrackets.it">contact us</a>.</p>
 
 <p>This document was last updated on June 12, 2014</p>

app/views/pages/terms.html.erb

@@ -12,6 +12,14 @@
 <h3>Termination</h3>
 <p>We may terminate your access to the Site, without cause or notice, which may result in the forfeiture and destruction of all information associated with you. All provisions of this Agreement that by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity, and limitations of liability.</p>
 
+<h3>Cancellation</h3>
+<p>As a subscriber, you have the ability to cancel your Tomatoes subscription at any time. Your cancellation will take effect at the end of your current billing period. You will not receive a refund for billing that has already occurred. Once your cancellation is effective, you will no longer have access to your paid services.</p>
+
+<p>To ensure that your credit card will not be charged for your next billing period, you MUST cancel your subscription no later than the day before your next scheduled billing period begins. Once cancelled, you will continue to have access to Tomatoes paid services until the end of the current paid billing period. Upon the expiration of the billing period in which cancellation is received, Tomatoes paid services access will be terminated, the subscription will expire, and no further subscription charges will appear on your credit card.</p>
+
+<h3>Refund Policy</h3>
+<p>We offer refunds to any unsatisfied customer up to 30 days after the purchase was made. If you would like your money back, simply send us an email.</p>
+
 <h3>Links To Other Sites</h3>
 <p>Our Site may contain links to third-party sites that are not owned or controlled by Tomatoes.</p>
 

chrome_app/manifest.json

@@ -1 +1 @@
-{"name":"Tomatoes","app":{"urls":["http://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.6.82","description":"Pomodoro technique\u00ae web-based time tracker"}
+{"name":"Tomatoes","app":{"urls":["http://tomato.es/"],"launch":{"web_url":"http://tomato.es/"}},"icons":{"128":"icon_128.png"},"version":"0.6.83","description":"Pomodoro technique\u00ae web-based time tracker"}

config/application.rb

@@ -16,7 +16,7 @@
 end
 
 module TomatoesApp
-  VERSION = '0.6.82'
+  VERSION = '0.6.83'
   REPO = 'https://github.com/potomak/tomatoes'
 
   class Application < Rails::Application