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://:/timesketch' # Configure where your Elasticsearch server is located. # 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 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 %} -
- -
-
-
- -
-
-
-
+ {% if not sketches.all() %} +
+

+

Welcome to Timesketch!

+ {{ form.name }} {{ form.description }} - + {{ form.csrf_token }} - -
- {% if upload_enabled %} - - {% endif %} -
+
-

+ {% else %} -
-
- -
-
+
- {% if upload_enabled %} - - {% endif %} +
+
+
- {% if sketches.all() %} +
+
+
+
+ {{ form.name }} + {{ form.description }} + + {{ form.csrf_token }} +
+
+ {% if upload_enabled %} + + {% endif %} +
+
+

-
- - - - - - - - - - - - - {% for sketch in sketches.all() %} - - - - - - - - - {% endfor %} - -
Created byStatusTimelinesSaved viewsLast activity
{{ sketch.name }}{{ sketch.user.name }}{{ sketch.get_status.status }}{{ sketch.timelines|count }}{{ sketch.get_named_views|count }}{{ sketch.updated_at.strftime('%Y-%m-%d %H:%M') }}
-
- {% endif %} -
-
+
+
+ +
+
-
+ {% if upload_enabled %} + + {% endif %} + + {% if sketches.all() %} + +
+ + + + + + + + + + + + + {% for sketch in sketches.all() %} + + + + + + + + + {% endfor %} + +
Created byStatusTimelinesSaved viewsLast activity
{{ sketch.name }}{{ sketch.user.name }}{{ sketch.get_status.status }}{{ sketch.timelines|count }}{{ sketch.get_named_views|count }}{{ sketch.updated_at.strftime('%Y-%m-%d %H:%M') }}
+
+ {% endif %} +
+
+ +
+ {% endif %} {% endblock %} \ No newline at end of file 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 @@