From 5dd4fa86cc82627dedaad79a9064a909c741848d Mon Sep 17 00:00:00 2001
From: Ubuntu <pt@WebODM.wjb00fanwjyepadi2pu5jvi4ed.bx.internal.cloudapp.net>
Date: Wed, 7 Jun 2017 20:13:42 +0000
Subject: [PATCH 01/14] Demo labels

---
 app/templates/app/dashboard.html | 5 +++++
 app/views.py                     | 8 ++++++++
 webodm/settings.py               | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/templates/app/dashboard.html b/app/templates/app/dashboard.html
index 2453c08e5..02b902d86 100644
--- a/app/templates/app/dashboard.html
+++ b/app/templates/app/dashboard.html
@@ -32,6 +32,11 @@ <h3>{% trans 'Welcome! ☺' %}</h3>
 			</p>
 		{% endif %}
 
+		<h3>{% trans 'Welcome! ☺' %}</h3>
+		<p>
+			{% blocktrans %} You are currently in a demo. You cannot create new tasks, but you can look around to explore the software's features. {% endblocktrans %}
+		</p>
+
 		<div id="dashboard-app" data-dashboard></div>
 
 	{% endif %}
diff --git a/app/views.py b/app/views.py
index 7721ccb74..5cee5b68c 100644
--- a/app/views.py
+++ b/app/views.py
@@ -9,7 +9,15 @@
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 
+from django.contrib.auth import login
+from django.contrib.auth.models import User
+
 def index(request):
+    # Auto login
+    if not request.user.is_authenticated():
+        login(request, User.objects.get(username="demouser"), 'django.contrib.auth.backends.ModelBackend')
+        return redirect('dashboard')
+
     return redirect('dashboard' if request.user.is_authenticated() 
                     else 'login')
 
diff --git a/webodm/settings.py b/webodm/settings.py
index f44dfe9bb..1fb647c47 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -25,7 +25,7 @@
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'gmarsutd!fee6_58=6k)2je#o2^&&)ovu1svjg8k^(a!7qa7r&'
+SECRET_KEY = 'gmarsutd!fee6158.6k)2je#o2^&&)yuA1svjg8k^(a!7qa7r&'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 TESTING = sys.argv[1:2] == ['test']

From 184150b5484f9b76cddb7abcaae99204e5f31d7e Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 15 Jun 2017 23:01:06 +0000
Subject: [PATCH 02/14] Changed port to 80

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4708c1b17..797233178 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     volumes:
       - appmedia:/webodm/app/media
     ports:
-      - "8000:8000"
+      - "80:8000"
     depends_on:
       - db
-    restart: on-failure:10
\ No newline at end of file
+    restart: on-failure:10

From 18906142670a49a679e618d58412864e1333d1b0 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 16 Jun 2017 13:17:00 +0000
Subject: [PATCH 03/14] Removed first project creation

---
 app/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views.py b/app/views.py
index 39c35ac28..956159686 100644
--- a/app/views.py
+++ b/app/views.py
@@ -37,8 +37,8 @@ def dashboard(request):
     no_tasks = Task.objects.filter(project__owner=request.user).count() == 0
 
     # Create first project automatically
-    if Project.objects.filter(owner=request.user).count() == 0:
-        Project.objects.create(owner=request.user, name=_("First Project"))
+    #if Project.objects.filter(owner=request.user).count() == 0:
+    #    Project.objects.create(owner=request.user, name=_("First Project"))
 
     return render(request, 'app/dashboard.html', {'title': 'Dashboard',
         'no_processingnodes': no_processingnodes,

From 270e4c80084e54c3236e4edcf8dab4f949fd72f6 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 16 Jun 2017 16:26:02 +0000
Subject: [PATCH 04/14] Hard-coded no_tasks

---
 app/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views.py b/app/views.py
index 956159686..bf3e16f87 100644
--- a/app/views.py
+++ b/app/views.py
@@ -34,7 +34,7 @@ def index(request):
 @login_required
 def dashboard(request):
     no_processingnodes = ProcessingNode.objects.count() == 0
-    no_tasks = Task.objects.filter(project__owner=request.user).count() == 0
+    no_tasks = False #Task.objects.filter(project__owner=request.user).count() == 0
 
     # Create first project automatically
     #if Project.objects.filter(owner=request.user).count() == 0:

From 6a6463a96edfa6fc1b304c74db1f784e17f3ad4b Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Tue, 25 Jul 2017 21:42:01 +0000
Subject: [PATCH 05/14] Modified views.py

---
 app/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views.py b/app/views.py
index 438a1f62c..ce835223b 100644
--- a/app/views.py
+++ b/app/views.py
@@ -32,8 +32,10 @@ def index(request):
     return redirect('dashboard' if request.user.is_authenticated() 
                     else 'login')
 
-@login_required
 def dashboard(request):
+    if not request.user.is_authenticated():
+        login(request, User.objects.get(username="demouser"), 'django.contrib.auth.backends.ModelBackend')
+     
     no_processingnodes = ProcessingNode.objects.count() == 0
     no_tasks = False #Task.objects.filter(project__owner=request.user).count() == 0
 

From 713e8b0874a055bb826d8789638a2a63ce2ff76f Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Sat, 18 Nov 2017 16:58:43 +0000
Subject: [PATCH 06/14] Changed docker-compose.yml

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e2d949ca9..0ad57bed0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,14 +8,12 @@ volumes:
     driver: local
 services:
   db:
-    image: opendronemap/webodm_db
     container_name: db
     ports:
       - "5432"
     volumes:
       - dbdata:/var/lib/postgresql/data
   webapp:
-    image: opendronemap/webodm_webapp
     container_name: webapp
     entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-it.sh db:5432 -- /webodm/start.sh\""
     volumes:

From 5d8a06aa7789a7d22348291d932fa8315f8300d1 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Wed, 21 Feb 2018 15:23:58 +0000
Subject: [PATCH 07/14] Changes

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index e69de29bb..454b1e128 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "nodeodm/external/node-OpenDroneMap"]
+	path = nodeodm/external/node-OpenDroneMap
+	url = https://github.com/OpenDroneMap/node-OpenDroneMap

From 33601d8c2c9533f645d5b3bdee2985d8e7616c7c Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 4 May 2018 18:14:09 +0000
Subject: [PATCH 08/14] Ported demo changes to latest master

---
 app/templates/app/dashboard.html | 6 ++++++
 app/views/app.py                 | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/templates/app/dashboard.html b/app/templates/app/dashboard.html
index a07851dda..2a907aaa3 100644
--- a/app/templates/app/dashboard.html
+++ b/app/templates/app/dashboard.html
@@ -41,6 +41,12 @@ <h3>{% trans 'Welcome! ☺' %}</h3>
 			</p>
 		{% endif %}
 
+        <h3>{% trans 'Welcome! ☺' %}</h3>
+        <p>
+            {% blocktrans %} You are currently in a demo. You cannot create new tasks, but you can look around to explore the software's features. {% endblocktrans %}
+        </p>
+
+
 		<div id="dashboard-app" data-dashboard></div>
 
 	{% endif %}
diff --git a/app/views/app.py b/app/views/app.py
index b99ebeffd..c4881d3b8 100644
--- a/app/views/app.py
+++ b/app/views/app.py
@@ -20,6 +20,11 @@ def index(request):
     if User.objects.filter(is_superuser=True).count() == 0:
         return redirect('welcome')
 
+    # Auto login
+    if not request.user.is_authenticated():
+        login(request, User.objects.get(username="demouser"), 'django.contrib.auth.backends.ModelBackend')
+        return redirect('dashboard')
+
     return redirect('dashboard' if request.user.is_authenticated
                     else 'login')
 
@@ -140,4 +145,4 @@ def handler404(request):
     return render(request, '404.html', status=404)
 
 def handler500(request):
-    return render(request, '500.html', status=500)
\ No newline at end of file
+    return render(request, '500.html', status=500)

From 279c3549553cc057d1661e9a3130a36b23545a91 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 4 May 2018 18:48:25 +0000
Subject: [PATCH 09/14] Changes

---
 app/views/app.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/app.py b/app/views/app.py
index c4881d3b8..42f8ce31e 100644
--- a/app/views/app.py
+++ b/app/views/app.py
@@ -21,7 +21,7 @@ def index(request):
         return redirect('welcome')
 
     # Auto login
-    if not request.user.is_authenticated():
+    if not request.user.is_authenticated:
         login(request, User.objects.get(username="demouser"), 'django.contrib.auth.backends.ModelBackend')
         return redirect('dashboard')
 
@@ -31,11 +31,7 @@ def index(request):
 @login_required
 def dashboard(request):
     no_processingnodes = ProcessingNode.objects.count() == 0
-    no_tasks = Task.objects.filter(project__owner=request.user).count() == 0
-
-    # Create first project automatically
-    if Project.objects.filter(owner=request.user).count() == 0:
-        Project.objects.create(owner=request.user, name=_("First Project"))
+    no_tasks = False
 
     return render(request, 'app/dashboard.html', {'title': 'Dashboard',
         'no_processingnodes': no_processingnodes,

From de07cd6da4fa227cd7fe29b806578be4307bfc93 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 10 Oct 2019 14:14:53 +0000
Subject: [PATCH 10/14] Added disable files

---
 plugins/lightning/disabled     | 0
 plugins/openaerialmap/disabled | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 plugins/lightning/disabled
 create mode 100644 plugins/openaerialmap/disabled

diff --git a/plugins/lightning/disabled b/plugins/lightning/disabled
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/openaerialmap/disabled b/plugins/openaerialmap/disabled
new file mode 100644
index 000000000..e69de29bb

From 0190afea9847c166f5921bd54d699664b7f78acd Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 10 Oct 2019 19:52:23 +0200
Subject: [PATCH 11/14] Do not redirect to custom SSL port

---
 nginx/nginx-ssl.conf.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/nginx-ssl.conf.template b/nginx/nginx-ssl.conf.template
index c630bf011..9544b3a4e 100644
--- a/nginx/nginx-ssl.conf.template
+++ b/nginx/nginx-ssl.conf.template
@@ -31,7 +31,7 @@ http {
   server {
       server_name $WO_HOST;
       listen 8080;
-      return 301 https://$WO_HOST:$WO_PORT$request_uri;
+      return 301 https://$WO_HOST$request_uri;
   }
 
   server {

From 8324283ebd49bc7f3d489192303531827120150e Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 10 Oct 2019 20:52:23 +0200
Subject: [PATCH 12/14] Description in dashboard

---
 app/templates/app/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/app/dashboard.html b/app/templates/app/dashboard.html
index 8cf2a24eb..4795879c8 100644
--- a/app/templates/app/dashboard.html
+++ b/app/templates/app/dashboard.html
@@ -43,7 +43,7 @@ <h3>{% trans 'Welcome! ☺' %}</h3>
 
         <h3>{% trans 'Welcome! ☺' %}</h3>
         <p>
-            {% blocktrans %} You are currently in a demo. You cannot create new tasks, but you can look around to explore the software's features. {% endblocktrans %}
+            {% blocktrans %} You are currently in a demo. You cannot create new tasks and some features such as volume calculation and contours have been disabled, but you can look around to explore the software. {% endblocktrans %}
         </p>
 
 

From 4af1ee6f96d93ef7c31ad6c59663b5a5a3ef0309 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Mon, 28 Sep 2020 20:25:14 +0200
Subject: [PATCH 13/14] Add run.sh

---
 run.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100755 run.sh

diff --git a/run.sh b/run.sh
new file mode 100755
index 000000000..2c25f9896
--- /dev/null
+++ b/run.sh
@@ -0,0 +1 @@
+WO_HOST=demo.webodm.org WO_PORT=8444 WO_SSL_INSECURE_PORT_REDIRECT=8081 WO_SSL=YES WO_DEBUG=NO docker-compose -f docker-compose.yml -f docker-compose.ssl.yml -f docker-compose.build.yml up -d

From 24da599c3fb0b19123a335744f931c27c4f0f4f8 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 8 Jul 2022 22:44:31 +0200
Subject: [PATCH 14/14] Add locale

---
 locale | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 locale

diff --git a/locale b/locale
new file mode 160000
index 000000000..4e01fc1cc
--- /dev/null
+++ b/locale
@@ -0,0 +1 @@
+Subproject commit 4e01fc1ccea78e41494191e082997000ee032c06