From 21edd5866d39c1f42e745f0420e4d946a8162af1 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jberggren@gmail.com>
Date: Thu, 21 Jul 2016 17:01:22 +0200
Subject: [PATCH 1/4] Change login page color

---
 timesketch/ui/templates/user/login.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/timesketch/ui/templates/user/login.html b/timesketch/ui/templates/user/login.html
index 8af51a0612..d11a523390 100644
--- a/timesketch/ui/templates/user/login.html
+++ b/timesketch/ui/templates/user/login.html
@@ -23,7 +23,7 @@
     <link rel="stylesheet" href="/static/css/timesketch.css">
     <style>
         body {
-            background: #428bca;
+            background: #34495e;
         }
         #center-logo img {
             width:200px;
@@ -44,7 +44,7 @@
                 <div id="center-logo">
                     <img src="/static/img/logo.png" />
                 </div>
-                <p style="color:#fff;">Collaborative forensic timeline analysis</p>
+                <p style="color:#fff;">Digital forensic timeline analysis</p>
                 <br>
                 <form class="form-horizontal" method="post">
                     <div class="form-group">

From 99e2bd28e1821c77ccdecee5a4a22b0c9514ff10 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jberggren@gmail.com>
Date: Thu, 21 Jul 2016 17:10:12 +0200
Subject: [PATCH 2/4] User on-boarding

---
 timesketch/ui/templates/home/home.html | 128 ++++++++++++++-----------
 1 file changed, 71 insertions(+), 57 deletions(-)

diff --git a/timesketch/ui/templates/home/home.html b/timesketch/ui/templates/home/home.html
index 4cd806c49d..5cd3174a51 100644
--- a/timesketch/ui/templates/home/home.html
+++ b/timesketch/ui/templates/home/home.html
@@ -1,70 +1,84 @@
 {% extends "base.html" %}
 {% block main %}
 
-  <div class="container">
-
-    <div class="row">
-      <div class="col-md-1"></div>
-      <div class="col-md-10">
-
-        <div class="pull-right">
-          <div class="btn-group">
-            <div class="pull-left" style="margin-right:0px;margin-top: -6px;">
-              <form action="{{ url_for('home_views.home') }}" method="post">
+    {% if not sketches.all() %}
+        <div style="text-align: center">
+            <br><br>
+            <h3>Welcome to Timesketch!</h3>
+            <form action="{{ url_for('home_views.home') }}" method="post">
                 {{ form.name }}
                 {{ form.description }}
-                <button type="submit" class="btn btn-success"><i class="fa fa-plus"></i> Create new sketch</button>
+                <button type="submit" class="btn btn-success"><i class="fa fa-plus"></i> Create new sketch to get started</button>
                 {{ form.csrf_token }}
-              </form>
-            </div>
-            {% if upload_enabled %}
-              <ts-core-upload class="pull-left" style="margin-left:5px;margin-top: -6px;"></ts-core-upload>
-            {% endif %}
-          </div>
+            </form>
         </div>
-        <br><br>
+    {% else %}
 
-        <div class="card" style="margin-top:7px;">
-          <form class="form form-inline" method="get" action="{{ url_for('home_views.home') }}">
-            <input type="search" id="q" name="q" class="search-input" placeholder="Search sketches" value="{{ query }}" autofocus>
-          </form>
-        </div>
+        <div class="container">
 
-        {% if upload_enabled %}
-          <ts-core-upload-queue></ts-core-upload-queue>
-        {%  endif %}
+        <div class="row">
+            <div class="col-md-1"></div>
+            <div class="col-md-10">
 
-        {% if sketches.all() %}
+                <div class="pull-right">
+                    <div class="btn-group">
+                        <div class="pull-left" style="margin-right:0px;margin-top: -6px;">
+                            <form action="{{ url_for('home_views.home') }}" method="post">
+                                {{ form.name }}
+                                {{ form.description }}
+                                <button type="submit" class="btn btn-success"><i class="fa fa-plus"></i> Create new sketch</button>
+                                {{ form.csrf_token }}
+                            </form>
+                        </div>
+                        {% if upload_enabled %}
+                            <ts-core-upload class="pull-left" style="margin-left:5px;margin-top: -6px;"></ts-core-upload>
+                        {% endif %}
+                    </div>
+                </div>
+                <br><br>
 
-        <div class="card">
-          <table class="table table-hover table-striped">
-            <thead>
-            <tr>
-              <th></th>
-              <th width="110">Created by</th>
-              <th width="60">Status</th>
-              <th width="80">Timelines</th>
-              <th width="100">Saved views</th>
-              <th width="130px">Last activity</th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for sketch in sketches.all() %}
-              <tr>
-                <td><a href="{{ url_for('sketch_views.overview', sketch_id=sketch.id) }}">{{ sketch.name }}</a></td>
-                <td>{{ sketch.user.name }}</td>
-                <td>{{ sketch.get_status.status }}</td>
-                <td style="text-align: center;"><a href="{{ url_for('sketch_views.timelines', sketch_id=sketch.id) }}">{{ sketch.timelines|count }}</a></td>
-                <td style="text-align: center;"><a href="{{ url_for('sketch_views.views', sketch_id=sketch.id) }}">{{ sketch.get_named_views|count }}</a></td>
-                <td>{{ sketch.updated_at.strftime('%Y-%m-%d %H:%M') }}</td>
-              </tr>
-            {% endfor %}
-            </tbody>
-          </table>
-        </div>
-        {% endif %}
-        <div class="col-md-1"></div>
-      </div>
+                <div class="card" style="margin-top:7px;">
+                    <form class="form form-inline" method="get" action="{{ url_for('home_views.home') }}">
+                        <input type="search" id="q" name="q" class="search-input" placeholder="Search sketches" value="{{ query }}" autofocus>
+                    </form>
+                </div>
 
-    </div>
+                {% if upload_enabled %}
+                    <ts-core-upload-queue></ts-core-upload-queue>
+                {%  endif %}
+
+                {% if sketches.all() %}
+
+                    <div class="card">
+                        <table class="table table-hover table-striped">
+                            <thead>
+                            <tr>
+                                <th></th>
+                                <th width="110">Created by</th>
+                                <th width="60">Status</th>
+                                <th width="80">Timelines</th>
+                                <th width="100">Saved views</th>
+                                <th width="130px">Last activity</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for sketch in sketches.all() %}
+                                <tr>
+                                    <td><a href="{{ url_for('sketch_views.overview', sketch_id=sketch.id) }}">{{ sketch.name }}</a></td>
+                                    <td>{{ sketch.user.name }}</td>
+                                    <td>{{ sketch.get_status.status }}</td>
+                                    <td style="text-align: center;"><a href="{{ url_for('sketch_views.timelines', sketch_id=sketch.id) }}">{{ sketch.timelines|count }}</a></td>
+                                    <td style="text-align: center;"><a href="{{ url_for('sketch_views.views', sketch_id=sketch.id) }}">{{ sketch.get_named_views|count }}</a></td>
+                                    <td>{{ sketch.updated_at.strftime('%Y-%m-%d %H:%M') }}</td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                {% endif %}
+                <div class="col-md-1"></div>
+            </div>
+
+        </div>
+    {% endif %}
 {% endblock %}
\ No newline at end of file

From ce2a1f16751e4cc931bc7ea302b0ec6f5e30c182 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jberggren@gmail.com>
Date: Thu, 21 Jul 2016 17:17:08 +0200
Subject: [PATCH 3/4] 2016.7 release prep

---
 setup.py        | 4 ++--
 timesketch.conf | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index efb2831b3c..0fdaaebb31 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,8 @@
 
 setup(
     name=u'timesketch',
-    version=u'2015.12',
-    description=u'Collaborative forensic timeline analysis',
+    version=u'2016.7',
+    description=u'Digital forensic timeline analysis',
     long_description=timesketch_description,
     license=u'Apache License, Version 2.0',
     url=u'http://www.timesketch.org/',
diff --git a/timesketch.conf b/timesketch.conf
index 9049895571..17b55475a0 100644
--- a/timesketch.conf
+++ b/timesketch.conf
@@ -23,7 +23,11 @@ SECRET_KEY = u''
 # For more options, see the official documentation:
 # https://pythonhosted.org/Flask-SQLAlchemy/config.html
 # By default sqlite is used.
-SQLALCHEMY_DATABASE_URI = u'sqlite:////tmp/database.db'
+#
+# NOTE: SQLite should only be used in development. Use PostgreSQL or MySQL in
+# production instead.
+#SQLALCHEMY_DATABASE_URI = u'sqlite:////tmp/database.db'
+SQLALCHEMY_DATABASE_URI = 'postgresql://<USERNAME>:<PASSWORD>/timesketch'
 
 # Configure where your Elasticsearch server is located.
 #

From 577cffded5c59025c4128674e49ebc9819a31068 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jberggren@gmail.com>
Date: Thu, 21 Jul 2016 17:25:24 +0200
Subject: [PATCH 4/4] Add LICENSE file

---
 .../static/third_party/medium-editor/LICENSE  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 timesketch/ui/static/third_party/medium-editor/LICENSE

diff --git a/timesketch/ui/static/third_party/medium-editor/LICENSE b/timesketch/ui/static/third_party/medium-editor/LICENSE
new file mode 100644
index 0000000000..71f72bc123
--- /dev/null
+++ b/timesketch/ui/static/third_party/medium-editor/LICENSE
@@ -0,0 +1,36 @@
+Copyright Davi Ferreira, http://www.daviferreira.com/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/yabwe/medium-editor
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+All files located in the node_modules directory are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.
\ No newline at end of file