Merge branch 'master' into theme

CHANGELOG.md

@@ -1,3 +1,10 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
 ## TODO
 
 - Sorting of bookmarks
@@ -10,13 +17,23 @@
 - Look into compatibility with del.icio.us, so we can make use of existing browser integration
 
 
-## v1.1.0 (unreleased)
+## [Unreleased]
+### Added
+- Show 404 page if bookmark is not found when editing
+- Cache buster to force loading of the latest styling
 
-- Removed some dependencies
+### Changed
+- Make running in a virtualenv optional
+- Fix for misalignment and size of hamburger icon
+- Updated Python (pip) dependencies
+- Updated MaterializeCSS and jQuery
 
-## v1.0.0
+### Removed
+- Removed dependency on more_itertools
+- Removed dependency on utilkit
 
-2016-12-29
+
+## [1.0.0] - 2016-12-29
 
 - json view of public tag pages, returns all items
 - feed (rss/atom) view of public tag pages, returns latest 15
@@ -51,9 +68,7 @@
 - Updated MaterializeCSS and jQuery
 
 
-## v0.2.0
+## [0.2.0] - 2016-08-02
-
-2016-08-02
 
 - Favicon courtesy Freepik on flaticon.com
 - Tag tags for easy adding of tags
@@ -64,9 +79,7 @@
 - Option to strip parameters from url (like '?utm_source=social')
 
 
-## v0.1.0
+## [0.1.0] - 2016-07-26
-
-2016-07-26
 
 - Initial release
 - Flask application with functionality to add users, add and edit bookmarks,

requirements.txt

@@ -4,17 +4,21 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
-beautifulsoup4==4.5.3     # via bs4
+beautifulsoup4==4.6.0     # via bs4
 bs4==0.0.1
+certifi==2017.4.17        # via requests
+chardet==3.0.4            # via requests
 click==6.7                # via flask
 flask-peewee==0.6.7
-flask==0.12
+flask==0.12.2
+idna==2.5                 # via requests
 itsdangerous==0.24        # via flask
-Jinja2==2.9.5             # via flask, flask-peewee
+jinja2==2.9.6             # via flask, flask-peewee
-MarkupSafe==1.0           # via jinja2
+markupsafe==1.0           # via jinja2
-peewee==2.9.1
+peewee==2.10.1
 pkg-resources==0.0.0
-requests==2.13.0
+requests==2.18.1
-werkzeug==0.12.1          # via flask, flask-peewee
+urllib3==1.21.1           # via requests
+werkzeug==0.12.2          # via flask, flask-peewee
 wtf-peewee==0.2.6         # via flask-peewee
 wtforms==2.1              # via flask-peewee, wtf-peewee

templates/base.html

@@ -17,7 +17,7 @@
 
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <link href='https://fonts.googleapis.com/css?family=Roboto+Mono&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
-        <link href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.1/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/>
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.1/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/>
         <link href="{{ url_for('static', filename='css/digimarks.css') }}?20170204" type="text/css" rel="stylesheet" media="screen,projection"/>
         <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
     </head>
@@ -56,7 +56,7 @@
         </div>
 
         <!-- Scripts -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.1/js/materialize.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.1/js/materialize.min.js"></script>
         <script src="{{ url_for('static', filename='js/init.js') }}"></script>
 
     </body>