From 57d459f78fa5eee605f572b41464754361df5cf4 Mon Sep 17 00:00:00 2001
From: Arnelle Balane <arnellebalane@gmail.com>
Date: Fri, 23 Oct 2020 02:00:58 +0800
Subject: [PATCH 1/6] Position error tooltip below form field on narrow screen
 sizes

---
 components/forms/AccountEditForm.js     | 12 ++++++++----
 components/forms/ChangePasswordForm.js  | 18 ++++++++++++------
 components/forms/DeleteForm.js          |  6 ++++--
 components/forms/LoginForm.js           | 12 ++++++++----
 components/forms/WebsiteEditForm.js     | 12 ++++++++----
 components/layout/FormLayout.module.css | 20 ++++++++++++++++++--
 6 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/components/forms/AccountEditForm.js b/components/forms/AccountEditForm.js
index 63949f00..cc000cf7 100644
--- a/components/forms/AccountEditForm.js
+++ b/components/forms/AccountEditForm.js
@@ -58,15 +58,19 @@ export default function AccountEditForm({ values, onSave, onClose }) {
               <label htmlFor="username">
                 <FormattedMessage id="label.username" defaultMessage="Username" />
               </label>
-              <Field name="username" type="text" />
-              <FormError name="username" />
+              <div>
+                <Field name="username" type="text" />
+                <FormError name="username" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="password">
                 <FormattedMessage id="label.password" defaultMessage="Password" />
               </label>
-              <Field name="password" type="password" />
-              <FormError name="password" />
+              <div>
+                <Field name="password" type="password" />
+                <FormError name="password" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button type="submit" variant="action">
diff --git a/components/forms/ChangePasswordForm.js b/components/forms/ChangePasswordForm.js
index d96a1336..9c41bd55 100644
--- a/components/forms/ChangePasswordForm.js
+++ b/components/forms/ChangePasswordForm.js
@@ -66,22 +66,28 @@ export default function ChangePasswordForm({ values, onSave, onClose }) {
               <label htmlFor="current_password">
                 <FormattedMessage id="label.current-password" defaultMessage="Current password" />
               </label>
-              <Field name="current_password" type="password" />
-              <FormError name="current_password" />
+              <div>
+                <Field name="current_password" type="password" />
+                <FormError name="current_password" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="new_password">
                 <FormattedMessage id="label.new-password" defaultMessage="New password" />
               </label>
-              <Field name="new_password" type="password" />
-              <FormError name="new_password" />
+              <div>
+                <Field name="new_password" type="password" />
+                <FormError name="new_password" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="confirm_password">
                 <FormattedMessage id="label.confirm-password" defaultMessage="Confirm password" />
               </label>
-              <Field name="confirm_password" type="password" />
-              <FormError name="confirm_password" />
+              <div>
+                <Field name="confirm_password" type="password" />
+                <FormError name="confirm_password" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button type="submit" variant="action">
diff --git a/components/forms/DeleteForm.js b/components/forms/DeleteForm.js
index e1b4d9ca..145a342a 100644
--- a/components/forms/DeleteForm.js
+++ b/components/forms/DeleteForm.js
@@ -73,8 +73,10 @@ export default function DeleteForm({ values, onSave, onClose }) {
               />
             </p>
             <FormRow>
-              <Field name="confirmation" type="text" />
-              <FormError name="confirmation" />
+              <div>
+                <Field name="confirmation" type="text" />
+                <FormError name="confirmation" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button
diff --git a/components/forms/LoginForm.js b/components/forms/LoginForm.js
index c89287a6..38b85125 100644
--- a/components/forms/LoginForm.js
+++ b/components/forms/LoginForm.js
@@ -71,15 +71,19 @@ export default function LoginForm() {
               <label htmlFor="username">
                 <FormattedMessage id="label.username" defaultMessage="Username" />
               </label>
-              <Field name="username" type="text" />
-              <FormError name="username" />
+              <div>
+                <Field name="username" type="text" />
+                <FormError name="username" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="password">
                 <FormattedMessage id="label.password" defaultMessage="Password" />
               </label>
-              <Field name="password" type="password" />
-              <FormError name="password" />
+              <div>
+                <Field name="password" type="password" />
+                <FormError name="password" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button type="submit" variant="action">
diff --git a/components/forms/WebsiteEditForm.js b/components/forms/WebsiteEditForm.js
index dc87999e..7be89f79 100644
--- a/components/forms/WebsiteEditForm.js
+++ b/components/forms/WebsiteEditForm.js
@@ -63,15 +63,19 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
               <label htmlFor="name">
                 <FormattedMessage id="label.name" defaultMessage="Name" />
               </label>
-              <Field name="name" type="text" />
-              <FormError name="name" />
+              <div>
+                <Field name="name" type="text" />
+                <FormError name="name" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="domain">
                 <FormattedMessage id="label.domain" defaultMessage="Domain" />
               </label>
-              <Field name="domain" type="text" />
-              <FormError name="domain" />
+              <div>
+                <Field name="domain" type="text" />
+                <FormError name="domain" />
+              </div>
             </FormRow>
             <FormRow>
               <label></label>
diff --git a/components/layout/FormLayout.module.css b/components/layout/FormLayout.module.css
index 90e1b8c2..1ae393bb 100644
--- a/components/layout/FormLayout.module.css
+++ b/components/layout/FormLayout.module.css
@@ -17,6 +17,10 @@
   line-height: 1.8;
 }
 
+.row > div {
+  position: relative;
+}
+
 .buttons {
   display: flex;
   justify-content: center;
@@ -33,9 +37,9 @@
   justify-content: center;
   align-items: center;
   top: 0;
-  left: 100%;
+  left: calc(100% + 16px);
   bottom: 0;
-  margin-left: 16px;
+  z-index: 1;
 }
 
 .msg {
@@ -68,3 +72,15 @@
   color: var(--gray50);
   background: var(--gray800);
 }
+
+@media only screen and (max-width: 576px) {
+  .error {
+    align-items: flex-start;
+    top: calc(100% + 7px);
+    left: 0;
+  }
+
+  .error:after {
+    left: 10px;
+  }
+}

From 55c73c57fe931f41fa4129e59c922fbe81eeabee Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Sat, 24 Oct 2020 13:14:41 +0100
Subject: [PATCH 2/6] Update pt_PT translations to match newer strings

Signed-off-by: Diogo Correia <me@diogotc.com>
---
 lang/pt-PT.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lang/pt-PT.json b/lang/pt-PT.json
index 05cf5396..3ba2cccf 100644
--- a/lang/pt-PT.json
+++ b/lang/pt-PT.json
@@ -3,8 +3,8 @@
   "label.add-account": "Adicionar conta",
   "label.add-website": "Adicionar website",
   "label.administrator": "Administrador",
-  "label.all": "All",
-  "label.all-websites": "All websites",
+  "label.all": "Todos",
+  "label.all-websites": "Todos os websites",
   "label.back": "Voltar",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar palavra-passe",
@@ -37,8 +37,8 @@
   "label.password": "Palavra-passe",
   "label.passwords-dont-match": "Palavra-passes não correspondem",
   "label.profile": "Perfil",
-  "label.realtime": "Realtime",
-  "label.realtime-logs": "Realtime logs",
+  "label.realtime": "Tempo real",
+  "label.realtime-logs": "Relatório em tempo real",
   "label.refresh": "Atualizar",
   "label.required": "Obrigatório",
   "label.reset": "Repor",
@@ -65,7 +65,7 @@
   "message.get-tracking-code": "Obter código de tracking",
   "message.go-to-settings": "Ir para as definições",
   "message.incorrect-username-password": "Nome de utilizador/palavra-passe incorretos.",
-  "message.log.visitor": "Visitor from {country} using {browser} on {os} {device}",
+  "message.log.visitor": "Visitante de {country} a usar {browser} no {device} {os}",
   "message.new-version-available": "Uma nova versão de umami {version} está disponível!",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-websites-configured": "Não tens nenhum website configurado.",

From 9a31c637529507204494df28261a34db116c935b Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Sun, 25 Oct 2020 22:58:56 +0000
Subject: [PATCH 3/6] Add Procfile to tell Heroku how to start the app

---
 Procfile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Procfile

diff --git a/Procfile b/Procfile
new file mode 100644
index 00000000..edc6c9a0
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: npm run start-env

From b432b2c22e6db6ef1494ea0ed19706042359a090 Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Mon, 26 Oct 2020 11:03:48 +0000
Subject: [PATCH 4/6] Default to '0.0.0.0' in start-env.js

---
 scripts/start-env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/start-env.js b/scripts/start-env.js
index 05823b7a..63b66369 100644
--- a/scripts/start-env.js
+++ b/scripts/start-env.js
@@ -1,3 +1,3 @@
 const cli = require('next/dist/cli/next-start');
 
-cli.nextStart(['-p', process.env.PORT || 3000, '-H', process.env.HOSTNAME || 'localhost']);
+cli.nextStart(['-p', process.env.PORT || 3000, '-H', process.env.HOSTNAME || '0.0.0.0']);

From ce6af4621917e84626f5db6eff54505febdefe54 Mon Sep 17 00:00:00 2001
From: Florens Verschelde <florens@fvsch.com>
Date: Mon, 26 Oct 2020 15:27:01 +0100
Subject: [PATCH 5/6] WebsiteHeader title: fix mispelled CSS variable

---
 components/metrics/WebsiteHeader.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/metrics/WebsiteHeader.module.css b/components/metrics/WebsiteHeader.module.css
index 67d23e61..5b5876c6 100644
--- a/components/metrics/WebsiteHeader.module.css
+++ b/components/metrics/WebsiteHeader.module.css
@@ -1,5 +1,5 @@
 .title {
-  color: var(--gray-900);
+  color: var(--gray900);
   font-size: var(--font-size-large);
   line-height: var(--font-size-large);
 }

From aaf4c605be21a5a9d3b4b2670ecce63c7abc581e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Mon, 26 Oct 2020 09:10:50 -0700
Subject: [PATCH 6/6] Bump version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 889afc1b..7426e33a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",