0.13 release preperations

Fix creating new things with a link share auth
Add explanation to docs about cors
2020-05-12 22:11:46 +02:00 · 2020-05-12 15:51:48 +02:00 · 2020-05-12 11:10:07 +02:00 · 2020-05-11 22:02:15 +02:00 · 2020-05-11 18:39:30 +02:00 · 2020-05-11 10:10:15 +00:00
1056 changed files with 145465 additions and 123851 deletions
@@ -57,6 +57,8 @@ steps:
      - make goconst-check
      - make gocyclo-check
      - make static-check
+      - wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin v2.2.0 # Need to manually install as it does not support being installed via go modules like the rest.
+      - make gosec-check
      - make build
    when:
      event: [ push, tag, pull_request ]
@@ -7,6 +7,99 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 All releases can be found on https://code.vikunja.io/api/releases.

+## [0.13] - 2020-05-12
+
+#### Added
+
+* Add 2fa for authentification (#383)
+* Add categories to error docs
+* Add changing email for users
+* Add community link
+* Add configuration options for log level
+* Add creating a new first bucket when creating a new list
+* Add docs for changing frontend url
+* Add endpoint to disable totp auth
+* Add endpoint to get the current users totp status
+* Add explanation to docs about cors
+* Add github token for renovate (#164)
+* Add gosec static analysis
+* Add moving tasks between lists (#389)
+* Add real buckets for tasks which don't have one (#446)
+* Add traefik 2 example configuration
+* Configure Renovate (#159)
+* Kanban (#393)
+* Task filters (#243)
+* Task Position (#412)
+
+#### Fixed
+
+* Add checking and logging when trying to put a task into a nonexisting bucket
+* Fix bucket ID being reset with no need to do so
+* Fix creating new things with a link share auth
+* Fix dependencies
+* Fix gosec in drone
+* Fix link share creation & creating admin link shares without admin rights
+* Fix moving tasks back into the empty (ID: 0) bucket
+* Fix moving tasks in buckets
+* Fix not moving its bucket when moving a task between lists
+* Fix pagination count for task collection
+* Fix parsing array style comparators by query param
+* Fix reference to reverse proxies in docs
+* Fix removing the last bucket
+* Fix replace statements for tail
+* Fix team rights not updating for namespace rights
+* Fix tests after renaming json fields to snake_case
+* Fix total label count when getting all labels (#477)
+* Remove setting task bucket to 0
+* Task Filter Fixes (#495)
+
+#### Changed
+
+* Change all json fields to snake_case
+* Change totp secret datatype from varchar to text
+* Update alpine Docker tag to v3.11 (#160)
+* Update docs theme
+* Update github.com/c2h5oh/datasize commit hash to 28bbd47 (#212)
+* Update github.com/gordonklaus/ineffassign commit hash to 7953dde (#233)
+* Update github.com/jgautheron/goconst commit hash to cda7ea3 (#228)
+* Update github.com/shurcooL/httpfs commit hash to 8d4bc4b (#229)
+* Update golang.org/x/crypto commit hash to 056763e (#222)
+* Update golang.org/x/crypto commit hash to 06a226f (#504)
+* Update golang.org/x/crypto commit hash to 0848c95 (#371)
+* Update golang.org/x/crypto commit hash to 3c4aac8 (#419)
+* Update golang.org/x/crypto commit hash to 44a6062 (#429)
+* Update golang.org/x/crypto commit hash to 4b2356b (#475)
+* Update golang.org/x/crypto commit hash to 4bdfaf4 (#438)
+* Update golang.org/x/crypto commit hash to 729f1e8 (#458)
+* Update golang.org/x/crypto commit hash to a76a400 (#411)
+* Update golang.org/x/lint commit hash to 738671d (#223)
+* Update module go-redis/redis to v6.15.7 (#234)
+* Update module go-redis/redis to v6.15.7 (#290)
+* Update module go-redis/redis to v7 (#277)
+* Update module go-redis/redis to v7 (#309)
+* Update module go-testfixtures/testfixtures/v3 to v3.1.2 (#457)
+* Update module go-testfixtures/testfixtures/v3 to v3.2.0 (#505)
+* Update module imdario/mergo to v0.3.9 (#238)
+* Update module labstack/echo/v4 to v4.1.16 (#241)
+* Update module lib/pq to v1.4.0 (#428)
+* Update module lib/pq to v1.5.0 (#476)
+* Update module lib/pq to v1.5.1 (#485)
+* Update module lib/pq to v1.5.2 (#491)
+* Update module olekukonko/tablewriter to v0.0.4 (#240)
+* Update module prometheus/client_golang to v0.9.4 (#245)
+* Update module prometheus/client_golang to v1
+* Update module prometheus/client_golang to v1.6.0 (#463)
+* Update module spf13/cobra to v0.0.7 (#271)
+* Update module spf13/viper to v1.6.2 (#272)
+* Update module spf13/viper to v1.6.3 (#291)
+* Update module spf13/viper to v1.7.0 (#494)
+* Update module stretchr/testify to v1.5.1 (#274)
+* Update Renovate Configuration (#161)
+* Update src.techknowlogick.com/xgo commit hash to bb0faa3 (#279)
+* Update src.techknowlogick.com/xgo commit hash to c43d4c4 (#224)
+* Update xorm redis cacher to use the xorm logger instead of a special seperate one
+* Update xorm to v1 (#323)
+
 ## [0.12] - 2020-04-04

 #### Added 
@@ -23,7 +23,7 @@ RUN if [ -n "${VIKUNJA_VERSION}" ]; then git checkout "${VIKUNJA_VERSION}"; fi \
 # The actual image
 # Note: I wanted to use the scratch image here, but unfortunatly the go-sqlite bindings require cgo and
 # because of this, the container would not start when I compiled the image without cgo.
-FROM alpine:3.9
+FROM alpine:3.11
 LABEL maintainer="maintainers@vikunja.io"

 WORKDIR /app/vikunja/
@@ -219,7 +219,7 @@ gocyclo-check:
 	    go get -u github.com/fzipp/gocyclo; \
 		go install $(GOFLAGS) github.com/fzipp/gocyclo; \
 	fi
-	for S in $(GOFILES); do gocyclo -over 24 $$S || exit 1; done;
+	for S in $(GOFILES); do gocyclo -over 27 $$S || exit 1; done;

 .PHONY: static-check
 static-check:
@@ -231,15 +231,17 @@ static-check:

 .PHONY: gosec-check
 gosec-check:
-	@hash ./bin/gosec > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s 1.2.0; \
+	@hash gosec > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		echo "Please manually install gosec by running"; \
+		echo "curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | bash -s -- -b $GOPATH/bin v2.2.0"; \
+		exit 1; \
 	fi
-	for S in $(PACKAGES); do ./bin/gosec $$S || exit 1; done;
+	gosec ./...

 .PHONY: goconst-check
 goconst-check:
 	@hash goconst > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go get -u github.com/jgautheron/goconst/cmd/goconst; \
 		go install $(GOFLAGS) github.com/jgautheron/goconst/cmd/goconst; \
-	fi
+	fi;
 	for S in $(PACKAGES); do goconst $$S || exit 1; done;
@@ -2,7 +2,7 @@

 [![Build Status](https://drone1.kolaente.de/api/badges/vikunja/api/status.svg)](https://drone1.kolaente.de/vikunja/api)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](LICENSE)
-[![Download](https://img.shields.io/badge/download-v0.12-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.13-brightgreen.svg)](https://dl.vikunja.io)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
 [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
 [![Go Report Card](https://goreportcard.com/badge/git.kolaente.de/vikunja/api)](https://goreportcard.com/report/git.kolaente.de/vikunja/api)
@@ -74,6 +74,8 @@ redis:

 cors:
  # Whether to enable or disable cors headers.
+  # Note: If you want to put the frontend and the api on seperate domains or ports, you will need to enable this.
+  #       Otherwise the frontend won't be able to make requests to the api through the browser.
  enable: true
  # A list of origins which may access the api.
  origins:
@@ -106,12 +108,14 @@ log:
  path: <rootpath>logs
  # Whether to show any logging at all or none
  enabled: true
-  # Where the error log should go. Possible values are stdout, stderr, file or off to disable error logging.
-  errors: "stdout"
  # Where the normal log should go. Possible values are stdout, stderr, file or off to disable standard logging.
  standard: "stdout"
+  # Change the log level. Possible values (case-insensitive) are CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG.
+  level: "INFO"
  # Whether or not to log database queries. Useful for debugging. Possible values are stdout, stderr, file or off to disable database logging.
  database: "off"
+  # The log level for database log messages. Possible values (case-insensitive) are CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG.
+  databaselevel: "WARNING"
  # Whether to log http requests or not. Possible values are stdout, stderr, file or off to disable http logging.
  http: "stdout"
  # Echo has its own logging which usually is unnessecary, which is why it is disabled by default. Possible values are stdout, stderr, file or off to disable standard logging.
@@ -37,3 +37,6 @@ menu:
    - name: Code
      url: https://code.vikunja.io/
      weight: 50
+    - name: Community
+      url: https://community.vikunja.io/
+      weight: 60
@@ -117,6 +117,8 @@ redis:

 cors:
  # Whether to enable or disable cors headers.
+  # Note: If you want to put the frontend and the api on seperate domains or ports, you will need to enable this.
+  #       Otherwise the frontend won't be able to make requests to the api through the browser.
  enable: true
  # A list of origins which may access the api.
  origins:
@@ -149,12 +151,14 @@ log:
  path: <rootpath>logs
  # Whether to show any logging at all or none
  enabled: true
-  # Where the error log should go. Possible values are stdout, stderr, file or off to disable error logging.
-  errors: "stdout"
  # Where the normal log should go. Possible values are stdout, stderr, file or off to disable standard logging.
  standard: "stdout"
+  # Change the log level. Possible values (case-insensitive) are CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG.
+  level: "INFO"
  # Whether or not to log database queries. Useful for debugging. Possible values are stdout, stderr, file or off to disable database logging.
  database: "off"
+  # The log level for database log messages. Possible values (case-insensitive) are CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG.
+  databaselevel: "WARNING"
  # Whether to log http requests or not. Possible values are stdout, stderr, file or off to disable http logging.
  http: "stdout"
  # Echo has its own logging which usually is unnessecary, which is why it is disabled by default. Possible values are stdout, stderr, file or off to disable standard logging.
@@ -15,11 +15,34 @@ It uses an nginx container or traefik on the host to proxy backend and frontend

 For all available configuration options, see [configuration]({{< ref "config.md">}}).

-## Example with traefik
+### Redis

-This example assumes [traefik](https://traefik.io) in version 1 installed and configured to [use docker as a configuration provider](https://docs.traefik.io/v1.7/configuration/backends/docker/).
+To use redis, you'll need to add this to the config examples below:

-### Without redis
+{{< highlight yaml >}}
+version: '3'
+
+services:
+  api:
+    image: vikunja/api
+    environment:
+      VIKUNJA_REDIS_ENABLED: 1
+      VIKUNJA_REDIS_HOST: 'redis:6379'
+      VIKUNJA_CACHE_ENABLED: 1
+      VIKUNJA_CACHE_TYPE: redis
+  redis:
+    image: redis
+{{< /highlight >}}
+
+## Example with traefik 2
+
+This example assumes [traefik](https://traefik.io) version 2 installed and configured to [use docker as a configuration provider](https://docs.traefik.io/providers/docker/).
+
+We also make a few assumtions here which you'll most likely need to adjust for your traefik setup:
+
+* Your domain is `vikunja.example.com`
+* The entrypoint you want to make vikunja available from is called `https`
+* The tls cert resolver is called `acme`

 {{< highlight yaml >}}
 version: '3'
@@ -42,19 +65,17 @@ services:
      - db
    restart: unless-stopped
    labels:
-      - "traefik.docker.network=web"
      - "traefik.enable=true"
-      - "traefik.frontend.rule=Host:vikunja.example.com;PathPrefix:/api/v1"
-      - "traefik.port=3456"
-      - "traefik.protocol=http"
+      - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && PathPrefix(`/api/v1`)"
+      - "traefik.http.routers.vikunja-api.entrypoints=https"
+      - "traefik.http.routers.vikunja-api.tls.certResolver=acme"
  frontend:
    image: vikunja/frontend
    labels:
-      - "traefik.docker.network=web"
      - "traefik.enable=true"
-      - "traefik.frontend.rule=Host:vikunja.example.com;PathPrefix:/"
-      - "traefik.port=80"
-      - "traefik.protocol=http"
+      - "traefik.http.routers.vikunja-frontend.rule=Host(`vikunja.example.com`)"
+      - "traefik.http.routers.vikunja-frontend.entrypoints=https"
+      - "traefik.http.routers.vikunja-frontend.tls.certResolver=acme"
    networks:
      - web
      - default
@@ -76,7 +97,9 @@ networks:
    external: true
 {{< /highlight >}}

-### With redis
+## Example with traefik 1
+
+This example assumes [traefik](https://traefik.io) in version 1 installed and configured to [use docker as a configuration provider](https://docs.traefik.io/v1.7/configuration/backends/docker/).

 {{< highlight yaml >}}
 version: '3'
@@ -90,10 +113,6 @@ services:
      VIKUNJA_DATABASE_TYPE: mysql
      VIKUNJA_DATABASE_USER: vikunja
      VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_REDIS_ENABLED: 1
-      VIKUNJA_REDIS_HOST: 'redis:6379'
-      VIKUNJA_CACHE_ENABLED: 1
-      VIKUNJA_CACHE_TYPE: redis
    volumes: 
      - ./files:/app/vikunja/files
    networks:
@@ -101,7 +120,6 @@ services:
      - default
    depends_on:
      - db
-      - redis
    restart: unless-stopped
    labels:
      - "traefik.docker.network=web"
@@ -132,8 +150,6 @@ services:
      - ./db:/var/lib/mysql
    restart: unless-stopped
    command: --max-connections=1000
-  redis:
-    image: redis

 networks:
  web:
@@ -159,7 +175,7 @@ server {
 }
 {{< /highlight >}}

-### Without redis
+`docker-compose.yml` config:

 {{< highlight yaml >}}
 version: '3'
@@ -196,48 +212,3 @@ services:
      - api
      - frontend
 {{< /highlight >}}
-
-### With redis
-
-{{< highlight yaml >}}
-version: '3'
-
-services:
-  db:
-    image: mariadb:10
-    environment:
-      MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_DATABASE: vikunja
-    volumes:
-      - ./db:/var/lib/mysql
-  redis:
-    image: redis
-  api:
-    image: vikunja/api
-    environment:
-      VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: supersecret
-      VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: root
-      VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_REDIS_ENABLED: 1
-      VIKUNJA_REDIS_HOST: 'redis:6379'
-      VIKUNJA_CACHE_ENABLED: 1
-      VIKUNJA_CACHE_TYPE: redis
-    volumes: 
-      - ./files:/app/vikunja/files
-    depends_on:
-      - db
-      - redis
-  frontend:
-    image: vikunja/frontend
-  proxy:
-    image: nginx
-    ports:
-      - 80:80
-    volumes:
-      - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
-    depends_on:
-      - api
-      - frontend
-{{< /highlight >}}
@@ -17,6 +17,20 @@ Unzip them and store them somewhere your server can access them.

 You also need to configure a rewrite condition to internally redirect all requests to `index.html` which handles all urls. 

+## API URL configuration
+
+By default, the frontend assumes it can reach the api at `/api/v1` relative to the frontend url.
+This means that if you make the frontend available at, say `https://vikunja.example.com`, it tries to reach the api
+at `https://vikunja.example.com/api/v1`.
+In this scenario it is not possible for the frontend and the api to live on seperate servers or even just seperate 
+ports on the same server with [the use of a reverse proxy]({{< ref "reverse-proxies.md">}}).
+
+To make configurations like this possible, the api url can be set in the `index.html` file of the frontend releases.
+Just open the file with a text editor - there are comments which will explain how to set the url.
+
+**Note:** This needs to be done again after every update. 
+(If you have a good idea for a better solution than this, we'd love to [hear it](https://vikunja.io/contact/))
+
 ## Docker

 The docker image is based on nginx and just contains all nessecary files for the frontend.
@@ -31,6 +45,11 @@ which will run the docker image and expose port 80 on the host.

 See [full docker example]({{< ref "full-docker-example.md">}}) for more varations of this config.

+### API URL configuration in docker
+
+When running the frontend with docker, it is possible to set the environment variable `$VIKUNJA_API_URL` to the api url.
+It is therefore not needed to change the url manually inside the docker container.
+
 ## NGINX

 Below are two example configurations which you can put in your `nginx.conf`:
@@ -12,9 +12,16 @@ menu:

 This document describes the different errors Vikunja can return.

+### Generic
+
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
 | 0001 | 403 | Generic forbidden error. |
+
+### User
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 1001 | 400 | A user with this username already exists. |
 | 1002 | 400 | A user with this email address already exists. |
 | 1004 | 400 | No username and password specified. |
@@ -27,14 +34,32 @@ This document describes the different errors Vikunja can return.
 | 1012 | 412 | Email address of the user not confirmed. |
 | 1013 | 412 | New password is empty. |
 | 1014 | 412 | Old password is empty. |
+| 1015 | 412 | Totp is already enabled for this user. |
+| 1016 | 412 | Totp is not enabled for this user. |
+| 1017 | 412 | The provided Totp passcode is invalid. |
+
+### Validation
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 2001 | 400 | ID cannot be empty or 0. |
 | 2002 | 400 | Some of the request data was invalid. The response contains an aditional array with all invalid fields. |
+
+### List
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 3001 | 404 | The list does not exist. |
 | 3004 | 403 | The user needs to have read permissions on that list to perform that action. |
 | 3005 | 400 | The list title cannot be empty. |
 | 3006 | 404 | The list share does not exist. |
 | 3007 | 400 | A list with this identifier already exists. |
 | 3008 | 412 | The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list. |
+
+### Task
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 4001 | 400 | The list task text cannot be empty. |
 | 4002 | 404 | The list task does not exist. |
 | 4003 | 403 | All bulk editing tasks must belong to the same list. |
@@ -50,6 +75,14 @@ This document describes the different errors Vikunja can return.
 | 4013 | 400 | The task sort param is invalid. |
 | 4014 | 400 | The task sort order is invalid. |
 | 4015 | 404 | The task comment does not exist. |
+| 4016 | 403 | Invalid task field. |
+| 4017 | 403 | Invalid task filter comparator. |
+| 4018 | 403 | Invalid task filter concatinator. |
+
+### Namespace
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 5001 | 404 | The namspace does not exist. | 
 | 5003 | 403 | The user does not have access to the specified namespace. |
 | 5006 | 400 | The namespace name cannot be empty. |
@@ -57,15 +90,43 @@ This document describes the different errors Vikunja can return.
 | 5010 | 403 | This team does not have access to that namespace. |
 | 5011 | 409 | This user has already access to that namespace. |
 | 5012 | 412 | The namespace is archived and can therefore only be accessed read only. |
+
+### Team
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 6001 | 400 | The team name cannot be emtpy. |
 | 6002 | 404 | The team does not exist. |
 | 6004 | 409 | The team already has access to that namespace or list. |
 | 6005 | 409 | The user is already a member of that team. |
 | 6006 | 400 | Cannot delete the last team member. |
 | 6007 | 403 | The team does not have access to the list to perform that action. |
+
+### User List Access
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 7002 | 409 | The user already has access to that list. |
 | 7003 | 403 | The user does not have access to that list. |
+
+### Label
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
 | 8001 | 403 | This label already exists on that task. |
 | 8002 | 404 | The label does not exist. |
 | 8003 | 403 | The user does not have access to this label. |
-| 9001 | 403 | The right is invalid. | 
+
+### Right
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
+| 9001 | 403 | The right is invalid. | 
+
+### Kanban
+
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
+| 10001 | 404 | The bucket does not exist. | 
+| 10002 | 400 | The bucket does not belong to that list. | 
+| 10003 | 412 | You cannot remove the last bucket on a list. | 
@@ -20,71 +20,75 @@ require (
 	4d63.com/embedfiles v1.0.0 // indirect
 	4d63.com/tz v1.1.0
 	code.vikunja.io/web v0.0.0-20200208214421-c90649369427
-	gitea.com/xorm/tests v0.5.6 // indirect
-	gitea.com/xorm/xorm-redis-cache v0.0.0-20191113062523-5a6a9e2ab9f2
+	gitea.com/xorm/xorm-redis-cache v0.2.0
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
 	github.com/beevik/etree v1.1.0 // indirect
-	github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae
+	github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee
 	github.com/client9/misspell v0.3.4
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/cweill/gotests v1.5.3
 	github.com/d4l3k/messagediff v1.2.1 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835
-	github.com/garyburd/redigo v1.6.0 // indirect
 	github.com/go-openapi/jsonreference v0.19.3 // indirect
 	github.com/go-openapi/spec v0.19.4 // indirect
-	github.com/go-redis/redis v6.15.2+incompatible
+	github.com/go-redis/redis/v7 v7.2.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/go-testfixtures/testfixtures/v3 v3.1.1
-	github.com/go-xorm/core v0.6.2 // indirect
-	github.com/go-xorm/xorm v0.7.9 // indirect
-	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc
-	github.com/imdario/mergo v0.3.7
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb
-	github.com/labstack/echo/v4 v4.1.14
+	github.com/go-testfixtures/testfixtures/v3 v3.2.0
+	github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf
+	github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
+	github.com/imdario/mergo v0.3.9
+	github.com/jgautheron/goconst v0.0.0-20200227150835-cda7ea3bf591
+	github.com/kr/text v0.2.0 // indirect
+	github.com/labstack/echo/v4 v4.1.16
 	github.com/labstack/gommon v0.3.0
 	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef
-	github.com/lib/pq v1.3.0
+	github.com/lib/pq v1.5.2
 	github.com/mailru/easyjson v0.7.0 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
-	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
-	github.com/olekukonko/tablewriter v0.0.1
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/olekukonko/tablewriter v0.0.4
+	github.com/onsi/ginkgo v1.12.0 // indirect
+	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
+	github.com/pquerna/otp v1.2.0
+	github.com/prometheus/client_golang v1.6.0
 	github.com/samedi/caldav-go v3.0.0+incompatible
-	github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b
+	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/spf13/afero v1.2.2
-	github.com/spf13/cobra v0.0.3
+	github.com/spf13/cobra v0.0.7
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.3.2
-	github.com/stretchr/testify v1.4.0
+	github.com/spf13/viper v1.7.0
+	github.com/stretchr/testify v1.5.1
 	github.com/swaggo/swag v1.6.3
-	github.com/ulule/limiter/v3 v3.3.0
+	github.com/ulule/limiter/v3 v3.5.0
 	github.com/urfave/cli v1.22.2 // indirect
-	golang.org/x/crypto v0.0.0-20200208060501-ecb85df21340
-	golang.org/x/lint v0.0.0-20190409202823-959b441ac422
-	golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
-	golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect
-	golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d // indirect
+	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b
+	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
+	golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/d4l3k/messagediff.v1 v1.2.1
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
-	honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a
-	src.techknowlogick.com/xgo v0.0.0-20190507142556-a5b29ecb0ff4
-	src.techknowlogick.com/xormigrate v1.1.0
-	xorm.io/builder v0.3.6
+	honnef.co/go/tools v0.0.1-2019.2.3
+	src.techknowlogick.com/xgo v0.0.0-20200408234745-bb0faa361273
+	src.techknowlogick.com/xormigrate v1.2.0
+	xorm.io/builder v0.3.7
 	xorm.io/core v0.7.3
-	xorm.io/xorm v0.8.1
+	xorm.io/xorm v1.0.1
 )

-replace github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
+replace (
+	github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.4
+	github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0
+	github.com/hpcloud/tail => github.com/jeffbean/tail v1.0.1 // See https://github.com/hpcloud/tail/pull/159
+	github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
+	gopkg.in/fsnotify.v1 => github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048 // See https://github.com/fsnotify/fsnotify/issues/328 and https://github.com/golang/go/issues/26904
+)

 go 1.13
@@ -9,16 +9,31 @@ cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 code.vikunja.io/web v0.0.0-20200208214421-c90649369427 h1:6ps5r0OxZNRdmCavh1k/xMwftN27hHauo+EtdTGxLug=
 code.vikunja.io/web v0.0.0-20200208214421-c90649369427/go.mod h1:cuP1/ieGWAZzgQGw+QPt6Y5F0fVb/8Ol5NV4QSezGdo=
-gitea.com/xorm/tests v0.5.6 h1:bm5SwZD5B6LI4VinKf5bqOCJ8z3z5l0h43HkVuxZG3k=
-gitea.com/xorm/tests v0.5.6/go.mod h1:53b8exJwT/5JBCf5n5gMqKrIZAqIErdJCRtzS1AuiMM=
-gitea.com/xorm/xorm-redis-cache v0.0.0-20191113062523-5a6a9e2ab9f2 h1:85jEhrFlzlDrJ+CXoCQ24WtkZ7MEtt8yOYZuC9ewKyk=
-gitea.com/xorm/xorm-redis-cache v0.0.0-20191113062523-5a6a9e2ab9f2/go.mod h1:TJIwRA0Cl8Dn41dI4a3HNTq3uCBRm6ZYTxrz3Di1wuY=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
+gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
+gitea.com/xorm/tests v0.7.0 h1:pFcaxTGGAWw3rDuVfhBdyr+mX1uzdTtncyAKxkCQ/IE=
+gitea.com/xorm/tests v0.7.0/go.mod h1:ngmhQrSBgihBbOqw1hdReSQJAnTlbStYTn0vruUFwDc=
+gitea.com/xorm/xorm-redis-cache v0.2.0 h1:qglRHt6/7vJmDeld6j+n10M9PmruAh+Le2lgNraFu3g=
+gitea.com/xorm/xorm-redis-cache v0.2.0/go.mod h1:juYdjkmIKvLbPkdfBVKGVJ2daFQIJAgKsn4mL4ZK8Zk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
@@ -31,27 +46,46 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/astaxie/beego v1.10.0/go.mod h1:0R4++1tUqERR0WYFWdfkcrsyoVBCG4DgpDGokT3yb+U=
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae h1:2Zmk+8cNvAGuY8AyvZuWpUdpQUAXwfom4ReVMe/CTIo=
-github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
+github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I=
+github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cweill/gotests v1.5.3 h1:k3t4wW/x/YNixWZJhUIn+mivmK5iV1tJVOwVYkx0UcU=
 github.com/cweill/gotests v1.5.3/go.mod h1:XZYOJkGVkCRoymaIzmp9Wyi3rUgfA3oOnkuljYrjFV8=
 github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
@@ -66,11 +100,15 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e h1:LzwWXEScf
 github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835 h1:roDmqJ4Qes7hrDOsWsMCce0vQHz3xiMPjJ9m4c2eeNs=
 github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835/go.mod h1:BjL/N0+C+j9uNX+1xcNuM9vdSIcXCZrQZUYbXOFbgN8=
 github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
@@ -83,9 +121,12 @@ github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NB
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
-github.com/go-chi/chi v3.3.3+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
@@ -106,9 +147,12 @@ github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-redis/redis v6.14.0+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4=
-github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs=
+github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
@@ -116,61 +160,119 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-testfixtures/testfixtures/v3 v3.1.1 h1:SBIfzULODQQ7JV6AD931MvAz8pnkk6QCfMIcoOBDaXQ=
 github.com/go-testfixtures/testfixtures/v3 v3.1.1/go.mod h1:RZctY24ixituGC73XlAV1gkCwYMVwiSwPm26MNlQIhE=
-github.com/go-xorm/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
-github.com/go-xorm/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/go-xorm/xorm v0.7.9 h1:LZze6n1UvRmM5gpL9/U9Gucwqo6aWlFVlfcHKH10qA0=
-github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
+github.com/go-testfixtures/testfixtures/v3 v3.1.2 h1:sACIJoknTtWHbz5wahA6f50IGsz7oBXS+jgm0eKl4eI=
+github.com/go-testfixtures/testfixtures/v3 v3.1.2/go.mod h1:RZctY24ixituGC73XlAV1gkCwYMVwiSwPm26MNlQIhE=
+github.com/go-testfixtures/testfixtures/v3 v3.2.0 h1:FGAW3z5UzmrZGjR/dZp1u3Tbld0SDmirLO4RrR5++7Q=
+github.com/go-testfixtures/testfixtures/v3 v3.2.0/go.mod h1:RZctY24ixituGC73XlAV1gkCwYMVwiSwPm26MNlQIhE=
+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc h1:cJlkeAx1QYgO5N80aF5xRGstVsRQwgLR7uA2FnP1ZjY=
-github.com/gordonklaus/ineffassign v0.0.0-20180909121442-1003c8bd00dc/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf h1:vc7Dmrk4JwS0ZPS6WZvWlwDflgDTA26jItmbSj83nug=
+github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
-github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 h1:VHgatEHNcBFEB7inlalqfNqw65aNkM1lGX2yt3NmbS8=
+github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
+github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
+github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
-github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb h1:D5s1HIu80AcMGcqmk7fNIVptmAubVHHaj3v5Upex6Zs=
-github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb/go.mod h1:82TxjOpWQiPmywlbIaB2ZkqJoSYJdLGPgAJDvM3PbKc=
+github.com/jeffbean/tail v1.0.1 h1:mRuCwa9iq5kH1SBFAIWWFsg+NEi5+VVEf2E2ORVkKp8=
+github.com/jeffbean/tail v1.0.1/go.mod h1:+MhJ+VPZMpv8Ui6WRzpJFuWFKxBCZgVOo5HAmlw1sFc=
+github.com/jgautheron/goconst v0.0.0-20200227150835-cda7ea3bf591 h1:x/BpEhm6aL26o4TLtcU0loJ7B3+69jielrGc70V7Yb4=
+github.com/jgautheron/goconst v0.0.0-20200227150835-cda7ea3bf591/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/json-iterator/go v0.0.0-20180806060727-1624edc4454b/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.9.6/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible h1:PkEEpmbrFXlMul8cOplR8nkcIM/NDbx+H6fq2+vaKAA=
 github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible/go.mod h1:y1UhTNI4g0hVymJrI6yJ5/ohy09hNBeU8iJEZjgdDOw=
+github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048 h1:j/BtLkVyqtAXvlb22nic/pSlWLuGx4gddouWVt65HDI=
+github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048/go.mod h1:dv6KyzAg9UuJWiE1pwkvvB2i0TvcQM6QhdsXLZ7K5KI=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -179,34 +281,47 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
-github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.1.7-0.20190627175217-8fb7b5be270f h1:fNJtR+TNyxTdYCZU40fc8Or8RyBqMOKYNv+Zay5gjvk=
 github.com/labstack/echo/v4 v4.1.7-0.20190627175217-8fb7b5be270f/go.mod h1:kU/7PwzgNxZH4das4XNsSpBSOD09XIF5YEPzjpkGnGE=
-github.com/labstack/echo/v4 v4.1.14 h1:h8XP66UfB3tUm+L3QPw7tmwAu3pJaA/nyfHPCcz46ic=
-github.com/labstack/echo/v4 v4.1.14/go.mod h1:Q5KZ1vD3V5FEzjM79hjwVrC3ABr7F5IdM23bXQMRDGg=
+github.com/labstack/echo/v4 v4.1.16 h1:8swiwjE5Jkai3RPfZoahp8kjVCRNq+y7Q0hPji2Kz0o=
+github.com/labstack/echo/v4 v4.1.16/go.mod h1:awO+5TzAjvL8XpibdsfXxPgHr+orhtXZJZIQCVjogKI=
 github.com/labstack/gommon v0.2.9 h1:heVeuAYtevIQVYkGj6A41dtfT91LrvFG220lavpWhrU=
 github.com/labstack/gommon v0.2.9/go.mod h1:E8ZTmW9vw5az5/ZyHWCp0Lw4OH2ecsaBP1C/NKavGG4=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef h1:RZnRnSID1skF35j/15KJ6hKZkdIC/teQClJK5wP5LU4=
 github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef/go.mod h1:4LATl0uhhtytR6p9n1AlktDyIz4u2iUnWEdI3L/hXiw=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.4.0 h1:TmtCFbH+Aw0AixwyttznSMQDgbR5Yed/Gg6S8Funrhc=
+github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.5.0 h1:Hq6pEflc2Q3hP5iEH3Q6XopXrJXxjhwbvMpj9eZnpp0=
+github.com/lib/pq v1.5.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.5.1 h1:Jn6HYxiYrtQ92CopqJLvfPCJUrrruw1+1cn0jM9dKrI=
+github.com/lib/pq v1.5.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw=
+github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
@@ -214,11 +329,11 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-oci8 v0.0.0-20191108001511-cbd8d5bc1da0/go.mod h1:/M9VLO+lUPmxvoOK2PfWRZ8mTtB4q1Hy9lEGijv9Nr8=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v2.0.2+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -226,25 +341,45 @@ github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJK
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
-github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
+github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
+github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
+github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
@@ -254,40 +389,79 @@ github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/pquerna/otp v1.2.0 h1:/A3+Jn+cagqayeR3iHs/L62m5ue7710D35zl1zJ1kok=
+github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 h1:D+CiwcpGTW6pL6bv6KI3KbyEyCKyS+1JWS2h8PNDnGA=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA=
+github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A=
+github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f h1:BVwpUVJDADN2ufcGik7W992pyps0wZ888b/y9GXcLTU=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 h1:/K3IL0Z1quvmJ7X0A1AwNEK7CRkVK3YwfOU/QAL4WGg=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=
+github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b h1:4kg1wyftSKxLtnPAvcRWakIPpokB9w780/KwrNLnfPA=
-github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shopspring/decimal v0.0.0-20191009025716-f1972eb1d1f5/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
+github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0=
 github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU=
+github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
@@ -296,8 +470,11 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
+github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs=
+github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw=
+github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -307,66 +484,121 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
 github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
 github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
 github.com/swaggo/swag v1.6.3 h1:N+uVPGP4H2hXoss2pt5dctoSUPKKRInr6qcTMOm0usI=
 github.com/swaggo/swag v1.6.3/go.mod h1:wcc83tB4Mb2aNiL/HP4MFeQdpHUrca+Rp/DRNgWAUio=
-github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
+github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
-github.com/ulule/limiter/v3 v3.3.0 h1:DuMRthpkl1wW9Em6xOVw5HMHnbDumSIDydiMqP0PTXs=
-github.com/ulule/limiter/v3 v3.3.0/go.mod h1:E6sfg3hfRgW+yFvkE/rZf6YLqXYFMWTmZaZKvdEiQsA=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/ulule/limiter/v3 v3.5.0 h1:QRAebbswjlezHIfiSQgM8+jMxaz/zsrxGRuiUJ43MHo=
+github.com/ulule/limiter/v3 v3.5.0/go.mod h1:TgOUQZKZ2KHjemqrC8UHUbKPqpTmSY43/2wbQ7YN1h8=
 github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.9.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
 github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
 github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200208060501-ecb85df21340 h1:KOcEaR10tFr7gdJV2GCKw8Os5yED1u1aOqHjOAb6d2Y=
-golang.org/x/crypto v0.0.0-20200208060501-ecb85df21340/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200406173513-056763e48d71 h1:DOmugCavvUtnUD114C1Wh+UgTgQZ4pMLzXxi1pSt+/Y=
+golang.org/x/crypto v0.0.0-20200406173513-056763e48d71/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 h1:bXoxMPcSLOq08zI3/c5dEBT6lE4eh+jOh886GHrn6V8=
+golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200420192832-a76a400e3025 h1:U821GPBRQKVHpr6Os5UDBgF2FveIjlZYbz+e2n5wmmQ=
+golang.org/x/crypto v0.0.0-20200420192832-a76a400e3025/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a h1:y6sBfNd1b9Wy08a6K1Z1DZc4aXABUN5TKjkYhz7UKmo=
+golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200422194213-44a606286825 h1:dSChiwOTvzwbHFTMq2l6uRardHH7/E6SqEkqccinS/o=
+golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
+golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc h1:ZGI/fILM2+ueot/UixBSoj9188jCAxVHEZEGhqq67I4=
+golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
+golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
+golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c h1:uOCk1iQW6Vc18bnC13MfzScl+wdKBmM9Y9kU7Z83/lw=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -374,76 +606,136 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190609082536-301114b31cce/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa h1:mQTN3ECqfsViCNBgq+A40vdwhkGykrrQlYe3mPj6BoU=
+golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8=
+golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628034336-212fb13d595e h1:ZlQjfVdpDxeqxRfmO30CdqWWzTvgRCj0MxaUVfxEG1k=
 golang.org/x/tools v0.0.0-20190628034336-212fb13d595e/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d h1:/iIZNFGxc/a7C3yWjGcnboV+Tkc7mxr+p6fDztwoxuM=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef h1:RHORRhs540cYZYrzgU2CPUyykkwZM78hGdzocOo9P8A=
+golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw=
 google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
@@ -451,37 +743,47 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/d4l3k/messagediff.v1 v1.2.1 h1:70AthpjunwzUiarMHyED52mj9UwtAnE89l1Gmrt3EU0=
 gopkg.in/d4l3k/messagediff.v1 v1.2.1/go.mod h1:EUzikiKadqXWcD1AzJLagx0j/BeeWGtn++04Xniyg44=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
+gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a h1:LJwr7TCTghdatWv40WobzlKXc9c4s8oGa7QKJUtHhWA=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-src.techknowlogick.com/xgo v0.0.0-20190507142556-a5b29ecb0ff4 h1:DZKMg4qnT7UIyB5ZaC6ZqltF2K5KhA1oQ2PdxOLZ3jg=
-src.techknowlogick.com/xgo v0.0.0-20190507142556-a5b29ecb0ff4/go.mod h1:Ood88figJtEukTnU20P1IrXhyAkbOIGi4YzmeHVtGH0=
-src.techknowlogick.com/xormigrate v1.1.0 h1:Ob79c1pOO+voMB9roa2eHZByT+TODwC51+Mn9e3HoTI=
-src.techknowlogick.com/xormigrate v1.1.0/go.mod h1:IMdvIk60uPX+IUsaXbdtqFzl3n7PfRg/cSZxxsiCWf8=
-xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
-xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
-xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
-xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+src.techknowlogick.com/xgo v0.0.0-20200408234745-bb0faa361273 h1:dE6ry9rVwDn3soD4wPCXqEG60AZTuhniZzHdnj3c+74=
+src.techknowlogick.com/xgo v0.0.0-20200408234745-bb0faa361273/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
+src.techknowlogick.com/xormigrate v1.2.0 h1:bq9JaI48bxB+OddMghicjmV7sGmBUogJq4HmTN0DOcw=
+src.techknowlogick.com/xormigrate v1.2.0/go.mod h1:7so27LAfBRqAxbma5jKYeL4ykVG1Jhsv9ncSq1KBCs4=
+xorm.io/builder v0.3.7 h1:2pETdKRK+2QG4mLX4oODHEhn5Z8j1m8sXa7jfu+/SZI=
+xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/core v0.7.3 h1:W8ws1PlrnkS1CZU1YWaYLMQcQilwAmQXU0BJDJon+H0=
 xorm.io/core v0.7.3/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
-xorm.io/xorm v0.8.1 h1:4f2KXuQxVdaX3RdI3Fw81NzMiSpZeyCZt8m3sEVeIkQ=
-xorm.io/xorm v0.8.1/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
+xorm.io/xorm v1.0.1 h1:/lITxpJtkZauNpdzj+L9CN/3OQxZaABrbergMcJu+Cw=
+xorm.io/xorm v1.0.1/go.mod h1:o4vnEsQ5V2F1/WK6w4XTwmiWJeGj82tqjAnHe44wVHY=
@@ -24,7 +24,7 @@ import (
 func init() {
 	migrateCmd.AddCommand(migrateListCmd)
 	migrationRollbackCmd.Flags().StringVarP(&rollbackUntilFlag, "name", "n", "", "The id of the migration you want to roll back until.")
-	migrationRollbackCmd.MarkFlagRequired("name")
+	_ = migrationRollbackCmd.MarkFlagRequired("name")
 	migrateCmd.AddCommand(migrationRollbackCmd)
 	rootCmd.AddCommand(migrateCmd)
 }
@@ -34,6 +34,7 @@ type Key string

 // These constants hold all config value keys
 const (
+	// #nosec
 	ServiceJWTSecret             Key = `service.JWTSecret`
 	ServiceInterface             Key = `service.interface`
 	ServiceFrontendurl           Key = `service.frontendurl`
@@ -78,13 +79,14 @@ const (
 	RedisPassword Key = `redis.password`
 	RedisDB       Key = `redis.db`

-	LogEnabled  Key = `log.enabled`
-	LogErrors   Key = `log.errors`
-	LogStandard Key = `log.standard`
-	LogDatabase Key = `log.database`
-	LogHTTP     Key = `log.http`
-	LogEcho     Key = `log.echo`
-	LogPath     Key = `log.path`
+	LogEnabled       Key = `log.enabled`
+	LogStandard      Key = `log.standard`
+	LogLevel         Key = `log.level`
+	LogDatabase      Key = `log.database`
+	LogDatabaseLevel Key = `log.databaselevel`
+	LogHTTP          Key = `log.http`
+	LogEcho          Key = `log.echo`
+	LogPath          Key = `log.path`

 	RateLimitEnabled Key = `ratelimit.enabled`
 	RateLimitKind    Key = `ratelimit.kind`
@@ -211,9 +213,10 @@ func InitDefaultConfig() {
 	RedisDB.setDefault(0)
 	// Logger
 	LogEnabled.setDefault(true)
-	LogErrors.setDefault("stdout")
 	LogStandard.setDefault("stdout")
+	LogLevel.setDefault("INFO")
 	LogDatabase.setDefault("off")
+	LogDatabaseLevel.setDefault("WARNING")
 	LogHTTP.setDefault("stdout")
 	LogEcho.setDefault("off")
 	LogPath.setDefault(ServiceRootpath.GetString() + "/logs")
@@ -21,14 +21,14 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"encoding/gob"
 	"fmt"
+	xrc "gitea.com/xorm/xorm-redis-cache"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 	"xorm.io/core"
 	"xorm.io/xorm"
-
-	xrc "gitea.com/xorm/xorm-redis-cache"
+	"xorm.io/xorm/caches"

 	_ "github.com/go-sql-driver/mysql" // Because.
 	_ "github.com/lib/pq"              // Because.
@@ -70,8 +70,7 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 	}

 	engine.SetMapper(core.GonicMapper{})
-	logger := xorm.NewSimpleLogger(log.GetLogWriter("database"))
-	logger.ShowSQL(config.LogDatabase.GetString() != "off")
+	logger := log.NewXormLogger("")
 	engine.SetLogger(logger)

 	// Cache
@@ -79,7 +78,7 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 	if config.CacheEnabled.GetBool() {
 		switch config.CacheType.GetString() {
 		case "memory":
-			cacher := xorm.NewLRUCacher(xorm.NewMemoryStore(), config.CacheMaxElementSize.GetInt())
+			cacher := caches.NewLRUCacher(caches.NewMemoryStore(), config.CacheMaxElementSize.GetInt())
 			engine.SetDefaultCacher(cacher)
 		case "redis":
 			cacher := xrc.NewRedisCacher(config.RedisEnabled.GetString(), config.RedisPassword.GetString(), xrc.DEFAULT_EXPIRATION, engine.Logger())
@@ -0,0 +1,207 @@
+- id: 1
+  title: testbucket1
+  list_id: 1
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 2
+  title: testbucket2
+  list_id: 1
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 3
+  title: testbucket3
+  list_id: 1
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 4
+  title: testbucket4 - other list
+  list_id: 2
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+# The following are not or only partly owned by user 1
+- id: 5
+  title: testbucket5
+  list_id: 20
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 6
+  title: testbucket6
+  list_id: 6
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 7
+  title: testbucket7
+  list_id: 7
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 8
+  title: testbucket8
+  list_id: 8
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 9
+  title: testbucket9
+  list_id: 9
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 10
+  title: testbucket10
+  list_id: 10
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 11
+  title: testbucket11
+  list_id: 11
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 12
+  title: testbucket13
+  list_id: 12
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 13
+  title: testbucket13
+  list_id: 13
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 14
+  title: testbucket14
+  list_id: 14
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 15
+  title: testbucket15
+  list_id: 15
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 16
+  title: testbucket16
+  list_id: 16
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 17
+  title: testbucket17
+  list_id: 17
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 18
+  title: testbucket18
+  list_id: 5
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 19
+  title: testbucket19
+  list_id: 21
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 20
+  title: testbucket20
+  list_id: 22
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 21
+  title: testbucket21
+  list_id: 3
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+# Duplicate buckets to make deletion of one of them possible
+- id: 22
+  title: testbucket22
+  list_id: 6
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 23
+  title: testbucket23
+  list_id: 7
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 24
+  title: testbucket24
+  list_id: 8
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 25
+  title: testbucket25
+  list_id: 9
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 26
+  title: testbucket26
+  list_id: 10
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 27
+  title: testbucket27
+  list_id: 11
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 28
+  title: testbucket28
+  list_id: 12
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 29
+  title: testbucket29
+  list_id: 13
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 30
+  title: testbucket30
+  list_id: 14
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 31
+  title: testbucket31
+  list_id: 15
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 32
+  title: testbucket32
+  list_id: 16
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+- id: 33
+  title: testbucket33
+  list_id: 17
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
+# This bucket is the last one in its list
+- id: 34
+  title: testbucket34
+  list_id: 18
+  created_by_id: 1
+  created: 1587244432
+  updated: 1587244432
@@ -1,11 +1,13 @@
 - id: 1
  text: 'task #1'
  description: 'Lorem Ipsum'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 1
  created: 1543626724
  updated: 1543626724
+  bucket_id: 1
 - id: 2
  text: 'task #2 done'
  done: true
@@ -14,56 +16,70 @@
  index: 2
  created: 1543626724
  updated: 1543626724
+  bucket_id: 1
 - id: 3
  text: 'task #3 high prio'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 3
  created: 1543626724
  updated: 1543626724
  priority: 100
+  bucket_id: 2
 - id: 4
  text: 'task #4 low prio'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 4
  created: 1543626724
  updated: 1543626724
  priority: 1
+  bucket_id: 2
 - id: 5
  text: 'task #5 higher due date'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 5
  created: 1543626724
  updated: 1543626724
  due_date_unix: 1543636724
+  bucket_id: 2
 - id: 6
  text: 'task #6 lower due date'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 6
  created: 1543626724
  updated: 1543626724
  due_date_unix: 1543616724
+  bucket_id: 3
 - id: 7
  text: 'task #7 with start date'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 7
  created: 1543626724
  updated: 1543626724
  start_date_unix: 1544600000
+  bucket_id: 3
 - id: 8
  text: 'task #8 with end date'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 8
  created: 1543626724
  updated: 1543626724
  end_date_unix: 1544700000
+  bucket_id: 3
 - id: 9
  text: 'task #9 with start and end date'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 9
@@ -71,130 +87,167 @@
  updated: 1543626724
  start_date_unix: 1544600000
  end_date_unix: 1544700000
+  bucket_id: 1
 - id: 10
  text: 'task #10 basic'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 10
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 11
  text: 'task #11 basic'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 11
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 12
  text: 'task #12 basic'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 12
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 13
  text: 'task #13 basic other list'
+  done: false
  created_by_id: 1
  list_id: 2
  index: 1
+  bucket_id: 4
  created: 1543626724
  updated: 1543626724
 - id: 14
  text: 'task #14 basic other list'
+  done: false
  created_by_id: 5
  list_id: 5
  index: 1
+  bucket_id: 18
  created: 1543626724
  updated: 1543626724
 - id: 15
  text: 'task #15'
+  done: false
  created_by_id: 6
  list_id: 6
  index: 1
+  bucket_id: 6
  created: 1543626724
  updated: 1543626724
 - id: 16
  text: 'task #16'
+  done: false
  created_by_id: 6
  list_id: 7
  index: 1
+  bucket_id: 7
  created: 1543626724
  updated: 1543626724
 - id: 17
  text: 'task #17'
+  done: false
  created_by_id: 6
  list_id: 8
  index: 1
+  bucket_id: 8
  created: 1543626724
  updated: 1543626724
 - id: 18
  text: 'task #18'
+  done: false
  created_by_id: 6
  list_id: 9
  index: 1
+  bucket_id: 9
  created: 1543626724
  updated: 1543626724
 - id: 19
  text: 'task #19'
+  done: false
  created_by_id: 6
  list_id: 10
  index: 1
+  bucket_id: 10
  created: 1543626724
  updated: 1543626724
 - id: 20
  text: 'task #20'
+  done: false
  created_by_id: 6
  list_id: 11
  index: 1
+  bucket_id: 11
  created: 1543626724
  updated: 1543626724
 - id: 21
  text: 'task #21'
+  done: false
  created_by_id: 6
  list_id: 12
  index: 1
+  bucket_id: 12
  created: 1543626724
  updated: 1543626724
 - id: 22
  text: 'task #22'
+  done: false
  created_by_id: 6
  list_id: 13
  index: 1
+  bucket_id: 13
  created: 1543626724
  updated: 1543626724
 - id: 23
  text: 'task #23'
+  done: false
  created_by_id: 6
  list_id: 14
  index: 1
+  bucket_id: 14
  created: 1543626724
  updated: 1543626724
 - id: 24
  text: 'task #24'
+  done: false
  created_by_id: 6
  list_id: 15
  index: 1
+  bucket_id: 15
  created: 1543626724
  updated: 1543626724
 - id: 25
  text: 'task #25'
+  done: false
  created_by_id: 6
  list_id: 16
  index: 1
+  bucket_id: 16
  created: 1543626724
  updated: 1543626724
 - id: 26
  text: 'task #26'
+  done: false
  created_by_id: 6
  list_id: 17
  index: 1
+  bucket_id: 17
  created: 1543626724
  updated: 1543626724
 - id: 27
  text: 'task #27 with reminders'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 12
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 28
@@ -204,65 +257,82 @@
  repeat_after: 3600
  list_id: 1
  index: 13
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 29
  text: 'task #29 with parent task (1)'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 14
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 30
  text: 'task #30 with assignees'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 15
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 31
  text: 'task #31 with color'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 16
  hex_color: f0f0f0
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
 - id: 32
  text: 'task #32'
+  done: false
  created_by_id: 1
  list_id: 3
  index: 1
+  bucket_id: 21
  created: 1543626724
  updated: 1543626724
 - id: 33
  text: 'task #33 with percent done'
+  done: false
  created_by_id: 1
  list_id: 1
  index: 17
  percent_done: 0.5
+  bucket_id: 1
  created: 1543626724
  updated: 1543626724
  # This task is forbidden for user1
 - id: 34
  text: 'task #34'
+  done: false
  created_by_id: 13
  list_id: 20
  index: 20
+  bucket_id: 5
  created: 1543626724
  updated: 1543626724
 - id: 35
  text: 'task #35'
+  done: false
  created_by_id: 1
  list_id: 21
  index: 1
+  bucket_id: 19
  created: 1543626724
  updated: 1543626724
 - id: 36
  text: 'task #36'
+  done: false
  created_by_id: 1
  list_id: 22
  index: 1
+  bucket_id: 20
  created: 1543626724
  updated: 1543626724

@@ -46,7 +46,7 @@ func CreateTestEngine() (engine *xorm.Engine, err error) {
 	}

 	engine.SetMapper(core.GonicMapper{})
-	logger := xorm.NewSimpleLogger(log.GetLogWriter("database"))
+	logger := log.NewXormLogger("DEBUG")
 	logger.ShowSQL(os.Getenv("UNIT_TESTS_VERBOSE") == "1")
 	engine.SetLogger(logger)
 	x = engine
@@ -24,6 +24,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"path/filepath"
 	"testing"
+	"xorm.io/xorm/schemas"
 )

 var fixtures *testfixtures.Loader
@@ -73,7 +74,7 @@ func LoadFixtures() error {

 	// Copied from https://github.com/go-gitea/gitea/blob/master/models/test_fixtures.go#L39
 	// Now if we're running postgres we need to tell it to update the sequences
-	if x.Dialect().DriverName() == "postgres" {
+	if x.Dialect().URI().DBType == schemas.POSTGRES {
 		results, err := x.QueryString(`SELECT 'SELECT SETVAL(' ||
 		quote_literal(quote_ident(PGT.schemaname) || '.' || quote_ident(S.relname)) ||
 		', COALESCE(MAX(' ||quote_ident(C.attname)|| '), 1) ) FROM ' ||
@@ -0,0 +1,300 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package integrations
+
+import (
+	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/web/handler"
+	"github.com/labstack/echo/v4"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestBucket(t *testing.T) {
+	testHandler := webHandlerTest{
+		user: &testuser1,
+		strFunc: func() handler.CObject {
+			return &models.Bucket{}
+		},
+		t: t,
+	}
+	t.Run("ReadAll", func(t *testing.T) {
+		t.Run("Normal", func(t *testing.T) {
+			rec, err := testHandler.testReadAllWithUser(nil, map[string]string{"list": "1"})
+			assert.NoError(t, err)
+			assert.Contains(t, rec.Body.String(), `testbucket1`)
+			assert.Contains(t, rec.Body.String(), `testbucket2`)
+			assert.Contains(t, rec.Body.String(), `testbucket3`)
+			assert.NotContains(t, rec.Body.String(), `testbucket4`) // Different List
+		})
+	})
+	t.Run("Update", func(t *testing.T) {
+		t.Run("Normal", func(t *testing.T) {
+			// Check the list was loaded successfully afterwards, see testReadOneWithUser
+			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "1"}, `{"title":"TestLoremIpsum"}`)
+			assert.NoError(t, err)
+			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+		})
+		t.Run("Nonexisting Bucket", func(t *testing.T) {
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "9999"}, `{"title":"TestLoremIpsum"}`)
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
+		})
+		t.Run("Empty title", func(t *testing.T) {
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "1"}, `{"title":""}`)
+			assert.Error(t, err)
+			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields, "title: non zero value required")
+		})
+		t.Run("Rights check", func(t *testing.T) {
+			t.Run("Forbidden", func(t *testing.T) {
+				// Owned by user13
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "5"}, `{"title":"TestLoremIpsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via Team readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "6"}, `{"title":"TestLoremIpsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via Team write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "7"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+			t.Run("Shared Via Team admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "8"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+
+			t.Run("Shared Via User readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "9"}, `{"title":"TestLoremIpsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via User write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "10"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+			t.Run("Shared Via User admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "11"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+
+			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "12"}, `{"title":"TestLoremIpsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "13"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "14"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+
+			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "15"}, `{"title":"TestLoremIpsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "16"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "17"}, `{"title":"TestLoremIpsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
+			})
+		})
+	})
+	t.Run("Delete", func(t *testing.T) {
+		t.Run("Normal", func(t *testing.T) {
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "1", "bucket": "1"})
+			assert.NoError(t, err)
+			assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+		})
+		t.Run("Nonexisting", func(t *testing.T) {
+			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"bucket": "999"})
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
+		})
+		t.Run("Rights check", func(t *testing.T) {
+			t.Run("Forbidden", func(t *testing.T) {
+				// Owned by user13
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "20", "bucket": "5"})
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via Team readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "6", "bucket": "6"})
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via Team write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "7", "bucket": "7"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+			t.Run("Shared Via Team admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "8", "bucket": "8"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+
+			t.Run("Shared Via User readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "9", "bucket": "9"})
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via User write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "10", "bucket": "10"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+			t.Run("Shared Via User admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "11", "bucket": "11"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+
+			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "12", "bucket": "12"})
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "13", "bucket": "13"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "14", "bucket": "14"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+
+			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "15", "bucket": "15"})
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "16", "bucket": "16"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "17", "bucket": "17"})
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
+			})
+		})
+	})
+	t.Run("Create", func(t *testing.T) {
+		t.Run("Normal", func(t *testing.T) {
+			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+			assert.NoError(t, err)
+			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+		})
+		t.Run("Nonexisting", func(t *testing.T) {
+			_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"Lorem Ipsum"}`)
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+		})
+		t.Run("Rights check", func(t *testing.T) {
+			t.Run("Forbidden", func(t *testing.T) {
+				// Owned by user13
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"title":"Lorem Ipsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via Team readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "6"}, `{"title":"Lorem Ipsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via Team write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "7"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+			t.Run("Shared Via Team admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "8"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+
+			t.Run("Shared Via User readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"title":"Lorem Ipsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via User write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+			t.Run("Shared Via User admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+
+			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "12"}, `{"title":"Lorem Ipsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "13"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "14"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+
+			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "15"}, `{"title":"Lorem Ipsum"}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "16"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "17"}, `{"title":"Lorem Ipsum"}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
+			})
+		})
+	})
+}
@@ -54,6 +54,84 @@ func TestLinkSharing(t *testing.T) {
 		SharedByID:  1,
 	}

+	t.Run("New Link Share", func(t *testing.T) {
+		testHandler := webHandlerTest{
+			user: &testuser1,
+			strFunc: func() handler.CObject {
+				return &models.LinkSharing{}
+			},
+			t: t,
+		}
+		t.Run("Forbidden", func(t *testing.T) {
+			t.Run("read only", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":0}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("write", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":1}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("admin", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":2}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+		})
+		t.Run("Read only access", func(t *testing.T) {
+			t.Run("read only", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":0}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("write", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":1}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+			t.Run("admin", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":2}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+		})
+		t.Run("Write access", func(t *testing.T) {
+			t.Run("read only", func(t *testing.T) {
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":0}`)
+				assert.NoError(t, err)
+				assert.Contains(t, req.Body.String(), `"hash":`)
+			})
+			t.Run("write", func(t *testing.T) {
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":1}`)
+				assert.NoError(t, err)
+				assert.Contains(t, req.Body.String(), `"hash":`)
+			})
+			t.Run("admin", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":2}`)
+				assert.Error(t, err)
+				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
+			})
+		})
+		t.Run("Admin access", func(t *testing.T) {
+			t.Run("read only", func(t *testing.T) {
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":0}`)
+				assert.NoError(t, err)
+				assert.Contains(t, req.Body.String(), `"hash":`)
+			})
+			t.Run("write", func(t *testing.T) {
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":1}`)
+				assert.NoError(t, err)
+				assert.Contains(t, req.Body.String(), `"hash":`)
+			})
+			t.Run("admin", func(t *testing.T) {
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":2}`)
+				assert.NoError(t, err)
+				assert.Contains(t, req.Body.String(), `"hash":`)
+			})
+		})
+	})
+
 	t.Run("Lists", func(t *testing.T) {
 		testHandlerListReadOnly := webHandlerTest{
 			linkShare: linkshareRead,
@@ -262,34 +340,34 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"userID":"user1"}`)
+						_, err := testHandlerListUserReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"userID":"user1"}`)
+						_, err := testHandlerListUserWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"userID":"user1"}`)
+						_, err := testHandlerListUserAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"userID":"user1"}`)
+						_, err := testHandlerListUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"userID":"user1"}`)
+						_, err := testHandlerListUserWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"userID":"user1"}`)
+						_, err := testHandlerListUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -354,34 +432,34 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"teamID":1}`)
+						_, err := testHandlerListTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"teamID":1}`)
+						_, err := testHandlerListTeamWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"teamID":1}`)
+						_, err := testHandlerListTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"teamID":1}`)
+						_, err := testHandlerListTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"teamID":1}`)
+						_, err := testHandlerListTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"teamID":1}`)
+						_, err := testHandlerListTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -862,34 +940,34 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserReadOnly.testCreateWithLinkShare(nil, nil, `{"userID":"user1"}`)
+						_, err := testHandlerNamespaceUserReadOnly.testCreateWithLinkShare(nil, nil, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserWrite.testCreateWithLinkShare(nil, nil, `{"userID":"user1"}`)
+						_, err := testHandlerNamespaceUserWrite.testCreateWithLinkShare(nil, nil, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserAdmin.testCreateWithLinkShare(nil, nil, `{"userID":"user1"}`)
+						_, err := testHandlerNamespaceUserAdmin.testCreateWithLinkShare(nil, nil, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"userID":"user1"}`)
+						_, err := testHandlerNamespaceUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"userID":"user1"}`)
+						_, err := testHandlerNamespaceUserWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"userID":"user1"}`)
+						_, err := testHandlerNamespaceUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -954,34 +1032,34 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"teamID":1}`)
+						_, err := testHandlerNamespaceTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"teamID":1}`)
+						_, err := testHandlerNamespaceTeamWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"teamID":1}`)
+						_, err := testHandlerNamespaceTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"teamID":1}`)
+						_, err := testHandlerNamespaceTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"teamID":1}`)
+						_, err := testHandlerNamespaceTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"teamID":1}`)
+						_, err := testHandlerNamespaceTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -95,38 +95,38 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("by priority", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":1,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":100,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":1,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":100,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			t.Run("by priority desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":100,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":1`)
+				assert.Contains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":100,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":1`)
 			})
 			t.Run("by priority asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":1,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":100,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":1,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":100,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			// should equal duedate asc
-			t.Run("by duedate", func(t *testing.T) {
+			t.Run("by due_date", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date_unix"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"doneAt":null,"dueDate":"2018-11-30T22:25:24Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"doneAt":null,"dueDate":"2018-12-01T03:58:44Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"done_at":null,"due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"done_at":null,"due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			t.Run("by duedate desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date_unix"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"doneAt":null,"dueDate":"2018-12-01T03:58:44Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":6,"text":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"done_at":null,"due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":6,"text":"task #6 lower due date`)
 			})
 			t.Run("by duedate asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date_unix"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"doneAt":null,"dueDate":"2018-11-30T22:25:24Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"doneAt":null,"dueDate":"2018-12-01T03:58:44Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"done_at":null,"due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"done_at":null,"due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			t.Run("invalid sort parameter", func(t *testing.T) {
 				_, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"loremipsum"}}, urlParams)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeInvalidSortParam)
+				assertHandlerErrorCode(t, err, models.ErrCodeInvalidTaskField)
 			})
 			t.Run("invalid sort order", func(t *testing.T) {
 				_, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"id"}, "order_by": []string{"loremipsum"}}, urlParams)
@@ -137,15 +137,22 @@ func TestTaskCollection(t *testing.T) {
 				// Invalid parameter should not sort at all
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort": []string{"loremipsum"}}, urlParams)
 				assert.NoError(t, err)
-				assert.NotContains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":100,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":4,"text":"task #4 low prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":1`)
-				assert.NotContains(t, rec.Body.String(), `{"id":4,"text":"task #4 low prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":1,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":3,"text":"task #3 high prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":100,"startDate":0,"endDate":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
-				assert.NotContains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"dueDate":1543636724,"reminderDates":null,"repeatAfter":0,"priority":0,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":6,"text":"task #6 lower due date"`)
-				assert.NotContains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"dueDate":1543616724,"reminderDates":null,"repeatAfter":0,"priority":0,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"dueDate":1543636724,"reminderDates":null,"repeatAfter":0,"priority":0,"startDate":0,"endDate":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":4,"text":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":1`)
+				assert.NotContains(t, rec.Body.String(), `{"id":4,"text":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":3,"text":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":6,"text":"task #6 lower due date"`)
+				assert.NotContains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"repeat_after":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
 			})
 		})
 		t.Run("Date range", func(t *testing.T) {
 			t.Run("start and end date", func(t *testing.T) {
-				rec, err := testHandler.testReadAllWithUser(url.Values{"startdate": []string{"1540000000"}, "enddate": []string{"1544700001"}}, urlParams)
+				rec, err := testHandler.testReadAllWithUser(
+					url.Values{
+						"filter_by":         []string{"start_date", "end_date", "due_date"},
+						"filter_value":      []string{"1544500000", "1544700001", "1543500000"},
+						"filter_comparator": []string{"greater", "less", "greater"},
+					},
+					urlParams,
+				)
 				assert.NoError(t, err)
 				assert.NotContains(t, rec.Body.String(), `task #1`)
 				assert.NotContains(t, rec.Body.String(), `task #2`)
@@ -163,16 +170,23 @@ func TestTaskCollection(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `task #14`)
 			})
 			t.Run("start date only", func(t *testing.T) {
-				rec, err := testHandler.testReadAllWithUser(url.Values{"startdate": []string{"1540000000"}}, urlParams)
+				rec, err := testHandler.testReadAllWithUser(
+					url.Values{
+						"filter_by":         []string{"start_date"},
+						"filter_value":      []string{"1540000000"},
+						"filter_comparator": []string{"greater"},
+					},
+					urlParams,
+				)
 				assert.NoError(t, err)
 				assert.NotContains(t, rec.Body.String(), `task #1`)
 				assert.NotContains(t, rec.Body.String(), `task #2`)
 				assert.NotContains(t, rec.Body.String(), `task #3`)
 				assert.NotContains(t, rec.Body.String(), `task #4`)
-				assert.Contains(t, rec.Body.String(), `task #5`)
-				assert.Contains(t, rec.Body.String(), `task #6`)
+				assert.NotContains(t, rec.Body.String(), `task #5`)
+				assert.NotContains(t, rec.Body.String(), `task #6`)
 				assert.Contains(t, rec.Body.String(), `task #7`)
-				assert.Contains(t, rec.Body.String(), `task #8`)
+				assert.NotContains(t, rec.Body.String(), `task #8`)
 				assert.Contains(t, rec.Body.String(), `task #9`)
 				assert.NotContains(t, rec.Body.String(), `task #10`)
 				assert.NotContains(t, rec.Body.String(), `task #11`)
@@ -181,12 +195,19 @@ func TestTaskCollection(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `task #14`)
 			})
 			t.Run("end date only", func(t *testing.T) {
-				rec, err := testHandler.testReadAllWithUser(url.Values{"enddate": []string{"1544700001"}}, urlParams)
+				rec, err := testHandler.testReadAllWithUser(
+					url.Values{
+						"filter_by":         []string{"end_date"},
+						"filter_value":      []string{"1544700001"},
+						"filter_comparator": []string{"greater"},
+					},
+					urlParams,
+				)
 				assert.NoError(t, err)
 				// If no start date but an end date is specified, this should be null
 				// since we don't have any tasks in the fixtures with an end date >
 				// the current date.
-				assert.Equal(t, "null\n", rec.Body.String())
+				assert.Equal(t, "[]\n", rec.Body.String())
 			})
 		})
 	})
@@ -249,47 +270,54 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("by priority", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":1,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":100,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":1,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":100,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			t.Run("by priority desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"desc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":100,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":1`)
+				assert.Contains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":100,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":1`)
 			})
 			t.Run("by priority asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"asc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":1,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"doneAt":null,"dueDate":null,"reminderDates":null,"listID":1,"repeatAfter":0,"priority":100,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"text":"task #33 with percent done","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":4,"text":"task #4 low prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":1,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-4","index":4,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":3,"text":"task #3 high prio","description":"","done":false,"done_at":null,"due_date":null,"reminder_dates":null,"list_id":1,"repeat_after":0,"priority":100,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			// should equal duedate asc
-			t.Run("by duedate", func(t *testing.T) {
+			t.Run("by due_date", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date_unix"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"doneAt":null,"dueDate":"2018-11-30T22:25:24Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"doneAt":null,"dueDate":"2018-12-01T03:58:44Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"done_at":null,"due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"done_at":null,"due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			t.Run("by duedate desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date_unix"}, "order_by": []string{"desc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"doneAt":null,"dueDate":"2018-12-01T03:58:44Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":6,"text":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"done_at":null,"due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":6,"text":"task #6 lower due date`)
 			})
 			t.Run("by duedate asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date_unix"}, "order_by": []string{"asc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"doneAt":null,"dueDate":"2018-11-30T22:25:24Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"doneAt":null,"dueDate":"2018-12-01T03:58:44Z","reminderDates":null,"listID":1,"repeatAfter":0,"priority":0,"startDate":null,"endDate":null,"assignees":null,"labels":null,"hexColor":"","percentDone":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","createdBy":{"id":1,"username":"user1","created":null,"updated":null}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"done_at":null,"due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"done_at":null,"due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"priority":0,"start_date":null,"end_date":null,"assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"created_by":{"id":1,"username":"user1","created":null,"updated":null}}]`)
 			})
 			t.Run("invalid parameter", func(t *testing.T) {
 				// Invalid parameter should not sort at all
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort": []string{"loremipsum"}}, nil)
 				assert.NoError(t, err)
-				assert.NotContains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":100,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":4,"text":"task #4 low prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":1`)
-				assert.NotContains(t, rec.Body.String(), `{"id":4,"text":"task #4 low prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":1,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":3,"text":"task #3 high prio","description":"","done":false,"dueDate":0,"reminderDates":null,"repeatAfter":0,"priority":100,"startDate":0,"endDate":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
-				assert.NotContains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"dueDate":1543636724,"reminderDates":null,"repeatAfter":0,"priority":0,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":6,"text":"task #6 lower due date"`)
-				assert.NotContains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"dueDate":1543616724,"reminderDates":null,"repeatAfter":0,"priority":0,"startDate":0,"endDate":0,"assignees":null,"labels":null,"hexColor":"","created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"dueDate":1543636724,"reminderDates":null,"repeatAfter":0,"priority":0,"startDate":0,"endDate":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"createdBy":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":3,"text":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":4,"text":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":1`)
+				assert.NotContains(t, rec.Body.String(), `{"id":4,"text":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":3,"text":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":5,"text":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":6,"text":"task #6 lower due date"`)
+				assert.NotContains(t, rec.Body.String(), `{"id":6,"text":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"repeat_after":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}},{"id":5,"text":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"username":"","email":"","created":0,"updated":0}}]`)
 			})
 		})
 		t.Run("Date range", func(t *testing.T) {
 			t.Run("start and end date", func(t *testing.T) {
-				rec, err := testHandler.testReadAllWithUser(url.Values{"startdate": []string{"1540000000"}, "enddate": []string{"1544700001"}}, nil)
+				rec, err := testHandler.testReadAllWithUser(
+					url.Values{
+						"filter_by":         []string{"start_date", "end_date", "due_date"},
+						"filter_value":      []string{"1544500000", "1544700001", "1543500000"},
+						"filter_comparator": []string{"greater", "less", "greater"},
+					},
+					nil,
+				)
 				assert.NoError(t, err)
 				assert.NotContains(t, rec.Body.String(), `task #1`)
 				assert.NotContains(t, rec.Body.String(), `task #2`)
@@ -307,16 +335,23 @@ func TestTaskCollection(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `task #14`)
 			})
 			t.Run("start date only", func(t *testing.T) {
-				rec, err := testHandler.testReadAllWithUser(url.Values{"startdate": []string{"1540000000"}}, nil)
+				rec, err := testHandler.testReadAllWithUser(
+					url.Values{
+						"filter_by":         []string{"start_date"},
+						"filter_value":      []string{"1540000000"},
+						"filter_comparator": []string{"greater"},
+					},
+					nil,
+				)
 				assert.NoError(t, err)
 				assert.NotContains(t, rec.Body.String(), `task #1`)
 				assert.NotContains(t, rec.Body.String(), `task #2`)
 				assert.NotContains(t, rec.Body.String(), `task #3`)
 				assert.NotContains(t, rec.Body.String(), `task #4`)
-				assert.Contains(t, rec.Body.String(), `task #5`)
-				assert.Contains(t, rec.Body.String(), `task #6`)
+				assert.NotContains(t, rec.Body.String(), `task #5`)
+				assert.NotContains(t, rec.Body.String(), `task #6`)
 				assert.Contains(t, rec.Body.String(), `task #7`)
-				assert.Contains(t, rec.Body.String(), `task #8`)
+				assert.NotContains(t, rec.Body.String(), `task #8`)
 				assert.Contains(t, rec.Body.String(), `task #9`)
 				assert.NotContains(t, rec.Body.String(), `task #10`)
 				assert.NotContains(t, rec.Body.String(), `task #11`)
@@ -325,12 +360,19 @@ func TestTaskCollection(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `task #14`)
 			})
 			t.Run("end date only", func(t *testing.T) {
-				rec, err := testHandler.testReadAllWithUser(url.Values{"enddate": []string{"1544700001"}}, nil)
+				rec, err := testHandler.testReadAllWithUser(
+					url.Values{
+						"filter_by":         []string{"end_date"},
+						"filter_value":      []string{"1544700001"},
+						"filter_comparator": []string{"greater"},
+					},
+					nil,
+				)
 				assert.NoError(t, err)
 				// If no start date but an end date is specified, this should be null
 				// since we don't have any tasks in the fixtures with an end date >
 				// the current date.
-				assert.Equal(t, "null\n", rec.Body.String())
+				assert.Equal(t, "[]\n", rec.Body.String())
 			})
 		})
 	})
@@ -67,46 +67,46 @@ func TestTask(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `"done":true`)
 			})
 			t.Run("Due date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"dueDate": "2020-02-10T10:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"due_date": "2020-02-10T10:00:00Z"}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"dueDate":"2020-02-10T10:00:00Z"`)
-				assert.NotContains(t, rec.Body.String(), `"dueDate":0`)
+				assert.Contains(t, rec.Body.String(), `"due_date":"2020-02-10T10:00:00Z"`)
+				assert.NotContains(t, rec.Body.String(), `"due_date":0`)
 			})
 			t.Run("Due date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "5"}, `{"dueDate": null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "5"}, `{"due_date": null}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"dueDate":null`)
-				assert.NotContains(t, rec.Body.String(), `"dueDate":"2020-02-10T10:00:00Z"`)
+				assert.Contains(t, rec.Body.String(), `"due_date":null`)
+				assert.NotContains(t, rec.Body.String(), `"due_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Reminders", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"reminderDates": ["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"reminder_dates": ["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"reminderDates":["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]`)
-				assert.NotContains(t, rec.Body.String(), `"reminderDates": null`)
+				assert.Contains(t, rec.Body.String(), `"reminder_dates":["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]`)
+				assert.NotContains(t, rec.Body.String(), `"reminder_dates": null`)
 			})
 			t.Run("Reminders unset to empty array", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminderDates": []}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminder_dates": []}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"reminderDates":null`)
-				assert.NotContains(t, rec.Body.String(), `"reminderDates":[1543626724,1543626824]`)
+				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
+				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
 			})
 			t.Run("Reminders unset to null", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminderDates": null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminder_dates": null}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"reminderDates":null`)
-				assert.NotContains(t, rec.Body.String(), `"reminderDates":[1543626724,1543626824]`)
+				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
+				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
 			})
 			t.Run("Repeat after", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"repeatAfter":3600}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"repeat_after":3600}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"repeatAfter":3600`)
-				assert.NotContains(t, rec.Body.String(), `"repeatAfter":0`)
+				assert.Contains(t, rec.Body.String(), `"repeat_after":3600`)
+				assert.NotContains(t, rec.Body.String(), `"repeat_after":0`)
 			})
 			t.Run("Repeat after unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"repeatAfter":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"repeat_after":0}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"repeatAfter":0`)
-				assert.NotContains(t, rec.Body.String(), `"repeatAfter":3600`)
+				assert.Contains(t, rec.Body.String(), `"repeat_after":0`)
+				assert.NotContains(t, rec.Body.String(), `"repeat_after":3600`)
 			})
 			t.Run("Repeat after update done", func(t *testing.T) {
 				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"done":true}`)
@@ -145,52 +145,52 @@ func TestTask(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `"priority":100`)
 			})
 			t.Run("Start date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"startDate":"2020-02-10T10:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"start_date":"2020-02-10T10:00:00Z"}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"startDate":"2020-02-10T10:00:00Z"`)
-				assert.NotContains(t, rec.Body.String(), `"startDate":0`)
+				assert.Contains(t, rec.Body.String(), `"start_date":"2020-02-10T10:00:00Z"`)
+				assert.NotContains(t, rec.Body.String(), `"start_date":0`)
 			})
 			t.Run("Start date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "7"}, `{"startDate":null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "7"}, `{"start_date":null}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"startDate":null`)
-				assert.NotContains(t, rec.Body.String(), `"startDate":"2020-02-10T10:00:00Z"`)
+				assert.Contains(t, rec.Body.String(), `"start_date":null`)
+				assert.NotContains(t, rec.Body.String(), `"start_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("End date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"endDate":"2020-02-10T12:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"end_date":"2020-02-10T12:00:00Z"}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"endDate":"2020-02-10T12:00:00Z"`)
-				assert.NotContains(t, rec.Body.String(), `"endDate":""`)
+				assert.Contains(t, rec.Body.String(), `"end_date":"2020-02-10T12:00:00Z"`)
+				assert.NotContains(t, rec.Body.String(), `"end_date":""`)
 			})
 			t.Run("End date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "8"}, `{"endDate":null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "8"}, `{"end_date":null}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"endDate":null`)
-				assert.NotContains(t, rec.Body.String(), `"endDate":"2020-02-10T10:00:00Z"`)
+				assert.Contains(t, rec.Body.String(), `"end_date":null`)
+				assert.NotContains(t, rec.Body.String(), `"end_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Color", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"hexColor":"f0f0f0"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"hex_color":"f0f0f0"}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"hexColor":"f0f0f0"`)
-				assert.NotContains(t, rec.Body.String(), `"hexColor":""`)
+				assert.Contains(t, rec.Body.String(), `"hex_color":"f0f0f0"`)
+				assert.NotContains(t, rec.Body.String(), `"hex_color":""`)
 			})
 			t.Run("Color unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "31"}, `{"hexColor":""}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "31"}, `{"hex_color":""}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"hexColor":""`)
-				assert.NotContains(t, rec.Body.String(), `"hexColor":"f0f0f0"`)
+				assert.Contains(t, rec.Body.String(), `"hex_color":""`)
+				assert.NotContains(t, rec.Body.String(), `"hex_color":"f0f0f0"`)
 			})
 			t.Run("Percent Done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"percentDone":0.1}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"percent_done":0.1}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"percentDone":0.1`)
-				assert.NotContains(t, rec.Body.String(), `"percentDone":0,`)
+				assert.Contains(t, rec.Body.String(), `"percent_done":0.1`)
+				assert.NotContains(t, rec.Body.String(), `"percent_done":0,`)
 			})
 			t.Run("Percent Done unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "33"}, `{"percentDone":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "33"}, `{"percent_done":0}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"percentDone":0,`)
-				assert.NotContains(t, rec.Body.String(), `"percentDone":0.1`)
+				assert.Contains(t, rec.Body.String(), `"percent_done":0,`)
+				assert.NotContains(t, rec.Body.String(), `"percent_done":0.1`)
 			})
 		})

@@ -269,6 +269,42 @@ func TestTask(t *testing.T) {
 				assert.Contains(t, rec.Body.String(), `"text":"Lorem Ipsum"`)
 			})
 		})
+		t.Run("Move to other list", func(t *testing.T) {
+			t.Run("normal", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":7}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"list_id":7`)
+				assert.NotContains(t, rec.Body.String(), `"list_id":1`)
+			})
+			t.Run("Forbidden", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":20}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
+			})
+			t.Run("Read Only", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":6}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
+			})
+		})
+		t.Run("Bucket", func(t *testing.T) {
+			t.Run("Normal", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":2}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"bucket_id":2`)
+				assert.NotContains(t, rec.Body.String(), `"bucket_id":1`)
+			})
+			t.Run("Different List", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":4}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToList)
+			})
+			t.Run("Nonexisting Bucket", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":9999}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
+			})
+		})
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
@@ -434,5 +470,23 @@ func TestTask(t *testing.T) {
 				assert.Contains(t, rec.Body.String(), `"text":"Lorem Ipsum"`)
 			})
 		})
+		t.Run("Bucket", func(t *testing.T) {
+			t.Run("Normal", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"text":"Lorem Ipsum","bucket_id":2}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"bucket_id":2`)
+				assert.NotContains(t, rec.Body.String(), `"bucket_id":1`)
+			})
+			t.Run("Different List", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"text":"Lorem Ipsum","bucket_id":4}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToList)
+			})
+			t.Run("Nonexisting Bucket", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"text":"Lorem Ipsum","bucket_id":9999}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
+			})
+		})
 	})
 }
@@ -21,8 +21,8 @@ import (
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 	"io"
-	"log"
 	"os"
+	"strings"
 	"time"
 )

@@ -35,14 +35,15 @@ const WebFmt = `${time_rfc3339_nano}: WEB ` + "\t" + `▶ ${remote_ip} ${id} ${m
 // Fmt is the general log format
 const Fmt = `%{color}%{time:` + time.RFC3339Nano + `}: %{level}` + "\t" + `▶ %{shortpkg}/%{shortfunc} %{id:03x}%{color:reset} %{message}`

+const logModule = `vikunja`
+
 // loginstance is the instance of the logger which is used under the hood to log
-var logInstance = logging.MustGetLogger("vikunja")
+var logInstance = logging.MustGetLogger(logModule)

 // InitLogger initializes the global log handler
 func InitLogger() {
 	if !config.LogEnabled.GetBool() {
 		// Disable all logging when loggin in general is disabled, overwriting everything a user might have set.
-		config.LogErrors.Set("off")
 		config.LogStandard.Set("off")
 		config.LogDatabase.Set("off")
 		config.LogHTTP.Set("off")
@@ -53,36 +54,30 @@ func InitLogger() {
 	// This show correct caller functions
 	logInstance.ExtraCalldepth = 1

-	if config.LogErrors.GetString() == "file" || config.LogStandard.GetString() == "file" {
+	if config.LogStandard.GetString() == "file" {
 		err := os.Mkdir(config.LogPath.GetString(), 0744)
 		if err != nil && !os.IsExist(err) {
-			log.Fatal("Could not create log folder: ", err.Error())
+			Fatalf("Could not create log folder: %s", err.Error())
 		}
 	}

-	var logBackends []logging.Backend
-
 	// We define our two backends
 	if config.LogStandard.GetString() != "off" {
 		stdWriter := GetLogWriter("standard")
-		stdBackend := logging.NewLogBackend(stdWriter, "", 0)

-		// Set the standard backend
-		logBackends = append(logBackends, logging.NewBackendFormatter(stdBackend, logging.MustStringFormatter(Fmt+"\n")))
+		level, err := logging.LogLevel(strings.ToUpper(config.LogLevel.GetString()))
+		if err != nil {
+			Fatalf("Error setting database log level: %s", err.Error())
+		}
+
+		logBackend := logging.NewLogBackend(stdWriter, "", 0)
+		backend := logging.NewBackendFormatter(logBackend, logging.MustStringFormatter(Fmt+"\n"))
+
+		backendLeveled := logging.AddModuleLevel(backend)
+		backendLeveled.SetLevel(level, logModule)
+
+		logInstance.SetBackend(backendLeveled)
 	}
-
-	if config.LogErrors.GetString() != "off" {
-		errWriter := GetLogWriter("error")
-		errBackend := logging.NewLogBackend(errWriter, "", 0)
-
-		// Only warnings and more severe messages should go to the error backend
-		errBackendLeveled := logging.AddModuleLevel(errBackend)
-		errBackendLeveled.SetLevel(logging.WARNING, "")
-		logBackends = append(logBackends, errBackendLeveled)
-	}
-
-	// Set our backends
-	logging.SetBackend(logBackends...)
 }

 // GetLogWriter returns the writer to where the normal log goes, depending on the config
@@ -90,9 +85,10 @@ func GetLogWriter(logfile string) (writer io.Writer) {
 	writer = os.Stdout // Set the default case to prevent nil pointer panics
 	switch viper.GetString("log." + logfile) {
 	case "file":
-		f, err := os.OpenFile(config.LogPath.GetString()+"/"+logfile+".log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		fullLogFilePath := config.LogPath.GetString() + "/" + logfile + ".log"
+		f, err := os.OpenFile(fullLogFilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
 		if err != nil {
-			log.Fatal(err)
+			Fatalf("Could not create logfile %s: %s", fullLogFilePath, err.Error())
 		}
 		writer = f
 	case "stderr":
@@ -114,7 +110,7 @@ func GetLogger() *logging.Logger {

 // Debug is for debug messages
 func Debug(args ...interface{}) {
-	logInstance.Debug(args)
+	logInstance.Debug(args...)
 }

 // Debugf is for debug messages
@@ -124,7 +120,7 @@ func Debugf(format string, args ...interface{}) {

 // Info is for info messages
 func Info(args ...interface{}) {
-	logInstance.Info(args)
+	logInstance.Info(args...)
 }

 // Infof is for info messages
@@ -134,7 +130,7 @@ func Infof(format string, args ...interface{}) {

 // Error is for error messages
 func Error(args ...interface{}) {
-	logInstance.Error(args)
+	logInstance.Error(args...)
 }

 // Errorf is for error messages
@@ -144,7 +140,7 @@ func Errorf(format string, args ...interface{}) {

 // Warning is for warning messages
 func Warning(args ...interface{}) {
-	logInstance.Warning(args)
+	logInstance.Warning(args...)
 }

 // Warningf is for warning messages
@@ -154,7 +150,7 @@ func Warningf(format string, args ...interface{}) {

 // Critical is for critical messages
 func Critical(args ...interface{}) {
-	logInstance.Critical(args)
+	logInstance.Critical(args...)
 }

 // Criticalf is for critical messages
@@ -164,7 +160,7 @@ func Criticalf(format string, args ...interface{}) {

 // Fatal is for fatal messages
 func Fatal(args ...interface{}) {
-	logInstance.Fatal(args)
+	logInstance.Fatal(args...)
 }

 // Fatalf is for fatal messages
@@ -0,0 +1,141 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package log
+
+import (
+	"code.vikunja.io/api/pkg/config"
+	"github.com/op/go-logging"
+	"strings"
+	"time"
+	"xorm.io/xorm/log"
+)
+
+// XormFmt defines the format for xorm logging strings
+const XormFmt = `%{color}%{time:` + time.RFC3339Nano + `}: %{level}` + "\t" + `▶ [DATABASE] %{id:03x}%{color:reset} %{message}`
+
+const xormLogModule = `vikunja_database`
+
+// XormLogger holds an implementation of the xorm logger interface.
+type XormLogger struct {
+	logger  *logging.Logger
+	level   log.LogLevel
+	showSQL bool
+}
+
+// NewXormLogger creates and initializes a new xorm logger
+func NewXormLogger(lvl string) *XormLogger {
+	if lvl == "" {
+		lvl = strings.ToUpper(config.LogDatabaseLevel.GetString())
+	}
+	level, err := logging.LogLevel(lvl)
+	if err != nil {
+		Critical("Error setting database log level: %s", err.Error())
+	}
+
+	xormLogger := &XormLogger{
+		logger: logging.MustGetLogger(xormLogModule),
+	}
+
+	logBackend := logging.NewLogBackend(GetLogWriter("database"), "", 0)
+	backend := logging.NewBackendFormatter(logBackend, logging.MustStringFormatter(XormFmt+"\n"))
+
+	backendLeveled := logging.AddModuleLevel(backend)
+	backendLeveled.SetLevel(level, xormLogModule)
+
+	xormLogger.logger.SetBackend(backendLeveled)
+
+	switch level {
+	case logging.CRITICAL:
+	case logging.ERROR:
+		xormLogger.level = log.LOG_ERR
+	case logging.WARNING:
+	case logging.NOTICE:
+		xormLogger.level = log.LOG_WARNING
+	case logging.INFO:
+		xormLogger.level = log.LOG_INFO
+	case logging.DEBUG:
+		xormLogger.level = log.LOG_DEBUG
+	default:
+		xormLogger.level = log.LOG_OFF
+	}
+
+	xormLogger.showSQL = true
+
+	return xormLogger
+}
+
+// Debug logs a debug string
+func (x *XormLogger) Debug(v ...interface{}) {
+	x.logger.Debug(v...)
+}
+
+// Debugf logs a debug string
+func (x *XormLogger) Debugf(format string, v ...interface{}) {
+	x.logger.Debugf(format, v...)
+}
+
+// Error logs a debug string
+func (x *XormLogger) Error(v ...interface{}) {
+	x.logger.Error(v...)
+}
+
+// Errorf logs a debug string
+func (x *XormLogger) Errorf(format string, v ...interface{}) {
+	x.logger.Errorf(format, v...)
+}
+
+// Info logs an info string
+func (x *XormLogger) Info(v ...interface{}) {
+	x.logger.Info(v...)
+}
+
+// Infof logs an info string
+func (x *XormLogger) Infof(format string, v ...interface{}) {
+	x.logger.Infof(format, v...)
+}
+
+// Warn logs a warning string
+func (x *XormLogger) Warn(v ...interface{}) {
+	x.logger.Warning(v...)
+}
+
+// Warnf logs a warning string
+func (x *XormLogger) Warnf(format string, v ...interface{}) {
+	x.logger.Warningf(format, v...)
+}
+
+// Level returns the current set log level
+func (x *XormLogger) Level() log.LogLevel {
+	return x.level
+}
+
+// SetLevel sets the log level
+func (x *XormLogger) SetLevel(l log.LogLevel) {
+	x.level = l
+}
+
+// ShowSQL sets whether to show the log level or not
+func (x *XormLogger) ShowSQL(show ...bool) {
+	if len(show) > 0 {
+		x.showSQL = show[0]
+	}
+}
+
+// IsShowSQL returns if sql queries should be shown
+func (x *XormLogger) IsShowSQL() bool {
+	return x.showSQL
+}
@@ -42,6 +42,7 @@ func StartMailDaemon() {

 	go func() {
 		d := gomail.NewDialer(config.MailerHost.GetString(), config.MailerPort.GetInt(), config.MailerUsername.GetString(), config.MailerPassword.GetString())
+		// #nosec
 		d.TLSConfig = &tls.Config{InsecureSkipVerify: config.MailerSkipTLSVerify.GetBool()}

 		var s gomail.SendCloser
@@ -20,7 +20,7 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/red"
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v7"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )
@@ -22,7 +22,7 @@ import (
 )

 type listTask20190430111111 struct {
-	HexColor string `xorm:"varchar(6) null" json:"hexColor" valid:"runelength(0|6)" maxLength:"6"`
+	HexColor string `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
 }

 func (listTask20190430111111) TableName() string {
@@ -27,21 +27,21 @@ type listTask20190511202210 struct {
 	Text              string  `xorm:"varchar(250) not null" json:"text" valid:"runelength(3|250)" minLength:"3" maxLength:"250"`
 	Description       string  `xorm:"varchar(250)" json:"description" valid:"runelength(0|250)" maxLength:"250"`
 	Done              bool    `xorm:"INDEX null" json:"done"`
-	DoneAtUnix        int64   `xorm:"INDEX null" json:"doneAt"`
-	DueDateUnix       int64   `xorm:"int(11) INDEX null" json:"dueDate"`
-	RemindersUnix     []int64 `xorm:"JSON TEXT null" json:"reminderDates"`
+	DoneAtUnix        int64   `xorm:"INDEX null" json:"done_at"`
+	DueDateUnix       int64   `xorm:"int(11) INDEX null" json:"due_date"`
+	RemindersUnix     []int64 `xorm:"JSON TEXT null" json:"reminder_dates"`
 	CreatedByID       int64   `xorm:"int(11) not null" json:"-"` // ID of the user who put that task on the list
-	ListID            int64   `xorm:"int(11) INDEX not null" json:"listID" param:"list"`
-	RepeatAfter       int64   `xorm:"int(11) INDEX null" json:"repeatAfter"`
+	ListID            int64   `xorm:"int(11) INDEX not null" json:"list_id" param:"list"`
+	RepeatAfter       int64   `xorm:"int(11) INDEX null" json:"repeat_after"`
 	ParentTaskID      int64   `xorm:"int(11) INDEX null" json:"parentTaskID"`
 	Priority          int64   `xorm:"int(11) null" json:"priority"`
-	StartDateUnix     int64   `xorm:"int(11) INDEX null" json:"startDate" query:"-"`
-	EndDateUnix       int64   `xorm:"int(11) INDEX null" json:"endDate" query:"-"`
-	HexColor          string  `xorm:"varchar(6) null" json:"hexColor" valid:"runelength(0|6)" maxLength:"6"`
+	StartDateUnix     int64   `xorm:"int(11) INDEX null" json:"start_date" query:"-"`
+	EndDateUnix       int64   `xorm:"int(11) INDEX null" json:"end_date" query:"-"`
+	HexColor          string  `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
 	UID               string  `xorm:"varchar(250) null" json:"-"`
 	Sorting           string  `xorm:"-" json:"-" query:"sort"` // Parameter to sort by
-	StartDateSortUnix int64   `xorm:"-" json:"-" query:"startdate"`
-	EndDateSortUnix   int64   `xorm:"-" json:"-" query:"enddate"`
+	StartDateSortUnix int64   `xorm:"-" json:"-" query:"start_date"`
+	EndDateSortUnix   int64   `xorm:"-" json:"-" query:"end_date"`
 	Created           int64   `xorm:"created not null" json:"created"`
 	Updated           int64   `xorm:"updated not null" json:"updated"`
 }
@@ -22,7 +22,7 @@ import (
 )

 type listTask20190514192749 struct {
-	DoneAtUnix int64 `xorm:"INDEX null" json:"doneAt"`
+	DoneAtUnix int64 `xorm:"INDEX null" json:"done_at"`
 }

 func (listTask20190514192749) TableName() string {
@@ -23,7 +23,7 @@ import (
 )

 type task20190920185205 struct {
-	PercentDone float64 `xorm:"DOUBLE null" json:"percentDone"`
+	PercentDone float64 `xorm:"DOUBLE null" json:"percent_done"`
 }

 func (task20190920185205) TableName() string {
@@ -60,7 +60,7 @@ func init() {

 			// Get all current subtasks and put them in a new table
 			tasks := []*task20190922205826{}
-			err = tx.Where("parent_task_id != null OR parent_task_id != 0").Find(&tasks)
+			err = tx.Where("parent_task_id is not null OR parent_task_id != 0").Find(&tasks)
 			if err != nil {
 				return err
 			}
@@ -25,7 +25,7 @@ import (
 type task20191207220736 struct {
 	ID     int64 `xorm:"int(11) autoincr not null unique pk" json:"id" param:"listtask"`
 	Index  int64 `xorm:"int(11) not null default 0" json:"index"`
-	ListID int64 `xorm:"int(11) INDEX not null" json:"listID" param:"list"`
+	ListID int64 `xorm:"int(11) INDEX not null" json:"list_id" param:"list"`
 }

 func (task20191207220736) TableName() string {
@@ -41,5 +41,4 @@ func init() {
 			return tx.DropTables(list20200322214624{})
 		},
 	})
-
 }
@@ -0,0 +1,47 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type totp20200417175201 struct {
+	ID      int64  `xorm:"int(11) autoincr not null unique pk" json:"-"`
+	UserID  int64  `xorm:"int(11) not null" json:"-"`
+	Secret  string `xorm:"varchar(20) not null" json:"secret"`
+	Enabled bool   `xorm:"null" json:"enabled"`
+	URL     string `xorm:"text null" json:"url"`
+}
+
+func (t totp20200417175201) TableName() string {
+	return "totp"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20200417175201",
+		Description: "Add totp table",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync2(totp20200417175201{})
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(totp20200417175201{})
+		},
+	})
+}
@@ -0,0 +1,43 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type task20200418230432 struct {
+	BucketID int64 `xorm:"int(11) null"`
+}
+
+func (s task20200418230432) TableName() string {
+	return "tasks"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20200418230432",
+		Description: "Add bucket id property to task",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync2(task20200418230432{})
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(task20200418230432{})
+		},
+	})
+}
@@ -0,0 +1,49 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"code.vikunja.io/api/pkg/timeutil"
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type bucket20200418230605 struct {
+	ID          int64              `xorm:"int(11) autoincr not null unique pk"`
+	Title       string             `xorm:"text not null"`
+	ListID      int64              `xorm:"int(11) not null"`
+	Created     timeutil.TimeStamp `xorm:"created not null"`
+	Updated     timeutil.TimeStamp `xorm:"updated not null"`
+	CreatedByID int64              `xorm:"int(11) not null"`
+}
+
+func (b *bucket20200418230605) TableName() string {
+	return "buckets"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20200418230605",
+		Description: "Add bucket table",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync2(bucket20200418230605{})
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(bucket20200418230605{})
+		},
+	})
+}
@@ -0,0 +1,65 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"code.vikunja.io/api/pkg/models"
+	"math"
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type task20200420215928 struct {
+	Position float64 `xorm:"double null" json:"position"`
+}
+
+func (s task20200420215928) TableName() string {
+	return "tasks"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20200420215928",
+		Description: "Add position property to task",
+		Migrate: func(tx *xorm.Engine) error {
+			err := tx.Sync2(task20200420215928{})
+			if err != nil {
+				return err
+			}
+
+			// Create a position according to their id -> gives a starting position
+			tasks := []*models.Task{}
+			err = tx.Find(&tasks)
+			if err != nil {
+				return err
+			}
+
+			for _, task := range tasks {
+				task.Position = float64(task.ID) * math.Pow(2, 16)
+				_, err = tx.Where("id = ?", task.ID).Update(task)
+				if err != nil {
+					return err
+				}
+			}
+
+			return nil
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(task20200420215928{})
+		},
+	})
+}
@@ -0,0 +1,75 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"code.vikunja.io/api/pkg/models"
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20200425182634",
+		Description: "Create one bucket for each list",
+		Migrate: func(tx *xorm.Engine) (err error) {
+			lists := []*models.List{}
+			err = tx.Find(&lists)
+			if err != nil {
+				return
+			}
+
+			tasks := []*models.Task{}
+			err = tx.Find(&tasks)
+			if err != nil {
+				return
+			}
+
+			// This map contains all buckets with their list ids as key
+			buckets := make(map[int64]*models.Bucket, len(lists))
+			for _, l := range lists {
+				buckets[l.ID] = &models.Bucket{
+					ListID: l.ID,
+					Title:  "New Bucket",
+					// The bucket creator is just the same as the list's one
+					CreatedByID: l.OwnerID,
+				}
+				_, err = tx.Insert(buckets[l.ID])
+				if err != nil {
+					return
+				}
+
+				for _, t := range tasks {
+					if t.ListID != l.ID {
+						continue
+					}
+
+					t.BucketID = buckets[l.ID].ID
+					_, err = tx.Where("id = ?", t.ID).Update(t)
+					if err != nil {
+						return
+					}
+				}
+			}
+
+			return
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}
@@ -0,0 +1,43 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type totp20200509103709 struct {
+	Secret string `xorm:"text not null" json:"secret"`
+}
+
+func (t totp20200509103709) TableName() string {
+	return "totp"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20200509103709",
+		Description: "Fix totp secret data type",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync2(totp20200509103709{})
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return tx.DropTables(totp20200509103709{})
+		},
+	})
+}
@@ -573,7 +573,7 @@ func (err ErrTaskAttachmentIsTooLarge) HTTPError() web.HTTPError {

 // ErrInvalidSortParam represents an error where the provided sort param is invalid
 type ErrInvalidSortParam struct {
-	SortBy sortProperty
+	SortBy string
 }

 // IsErrInvalidSortParam checks if an error is ErrInvalidSortParam.
@@ -653,6 +653,87 @@ func (err ErrTaskCommentDoesNotExist) HTTPError() web.HTTPError {
 	}
 }

+// ErrInvalidTaskField represents an error where the provided task field is invalid
+type ErrInvalidTaskField struct {
+	TaskField string
+}
+
+// IsErrInvalidTaskField checks if an error is ErrInvalidTaskField.
+func IsErrInvalidTaskField(err error) bool {
+	_, ok := err.(ErrInvalidTaskField)
+	return ok
+}
+
+func (err ErrInvalidTaskField) Error() string {
+	return fmt.Sprintf("Task Field is invalid [TaskField: %s]", err.TaskField)
+}
+
+// ErrCodeInvalidTaskField holds the unique world-error code of this error
+const ErrCodeInvalidTaskField = 4016
+
+// HTTPError holds the http error description
+func (err ErrInvalidTaskField) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusBadRequest,
+		Code:     ErrCodeInvalidTaskField,
+		Message:  fmt.Sprintf("The task field '%s' is invalid.", err.TaskField),
+	}
+}
+
+// ErrInvalidTaskFilterComparator represents an error where the provided task field is invalid
+type ErrInvalidTaskFilterComparator struct {
+	Comparator taskFilterComparator
+}
+
+// IsErrInvalidTaskFilterComparator checks if an error is ErrInvalidTaskFilterComparator.
+func IsErrInvalidTaskFilterComparator(err error) bool {
+	_, ok := err.(ErrInvalidTaskFilterComparator)
+	return ok
+}
+
+func (err ErrInvalidTaskFilterComparator) Error() string {
+	return fmt.Sprintf("Task filter comparator is invalid [Comparator: %s]", err.Comparator)
+}
+
+// ErrCodeInvalidTaskFilterComparator holds the unique world-error code of this error
+const ErrCodeInvalidTaskFilterComparator = 4017
+
+// HTTPError holds the http error description
+func (err ErrInvalidTaskFilterComparator) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusBadRequest,
+		Code:     ErrCodeInvalidTaskFilterComparator,
+		Message:  fmt.Sprintf("The task filter comparator '%s' is invalid.", err.Comparator),
+	}
+}
+
+// ErrInvalidTaskFilterConcatinator represents an error where the provided task field is invalid
+type ErrInvalidTaskFilterConcatinator struct {
+	Concatinator taskFilterConcatinator
+}
+
+// IsErrInvalidTaskFilterConcatinator checks if an error is ErrInvalidTaskFilterConcatinator.
+func IsErrInvalidTaskFilterConcatinator(err error) bool {
+	_, ok := err.(ErrInvalidTaskFilterConcatinator)
+	return ok
+}
+
+func (err ErrInvalidTaskFilterConcatinator) Error() string {
+	return fmt.Sprintf("Task filter concatinator is invalid [Concatinator: %s]", err.Concatinator)
+}
+
+// ErrCodeInvalidTaskFilterConcatinator holds the unique world-error code of this error
+const ErrCodeInvalidTaskFilterConcatinator = 4018
+
+// HTTPError holds the http error description
+func (err ErrInvalidTaskFilterConcatinator) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusBadRequest,
+		Code:     ErrCodeInvalidTaskFilterConcatinator,
+		Message:  fmt.Sprintf("The task filter concatinator '%s' is invalid.", err.Concatinator),
+	}
+}
+
 // =================
 // Namespace errors
 // =================
@@ -1124,7 +1205,7 @@ func IsErrInvalidRight(err error) bool {
 }

 func (err ErrInvalidRight) Error() string {
-	return fmt.Sprintf(" right invalid [Right: %d]", err.Right)
+	return fmt.Sprintf("Right invalid [Right: %d]", err.Right)
 }

 // ErrCodeInvalidRight holds the unique world-error code of this error
@@ -1138,3 +1219,90 @@ func (err ErrInvalidRight) HTTPError() web.HTTPError {
 		Message:  "The right is invalid.",
 	}
 }
+
+// ========
+// Kanban
+// ========
+
+// ErrBucketDoesNotExist represents an error where a kanban bucket does not exist
+type ErrBucketDoesNotExist struct {
+	BucketID int64
+}
+
+// IsErrBucketDoesNotExist checks if an error is ErrBucketDoesNotExist.
+func IsErrBucketDoesNotExist(err error) bool {
+	_, ok := err.(ErrBucketDoesNotExist)
+	return ok
+}
+
+func (err ErrBucketDoesNotExist) Error() string {
+	return fmt.Sprintf("Bucket does not exist [BucketID: %d]", err.BucketID)
+}
+
+// ErrCodeBucketDoesNotExist holds the unique world-error code of this error
+const ErrCodeBucketDoesNotExist = 10001
+
+// HTTPError holds the http error description
+func (err ErrBucketDoesNotExist) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusNotFound,
+		Code:     ErrCodeBucketDoesNotExist,
+		Message:  "This bucket does not exist.",
+	}
+}
+
+// ErrBucketDoesNotBelongToList represents an error where a kanban bucket does not belong to a list
+type ErrBucketDoesNotBelongToList struct {
+	BucketID int64
+	ListID   int64
+}
+
+// IsErrBucketDoesNotBelongToList checks if an error is ErrBucketDoesNotBelongToList.
+func IsErrBucketDoesNotBelongToList(err error) bool {
+	_, ok := err.(ErrBucketDoesNotBelongToList)
+	return ok
+}
+
+func (err ErrBucketDoesNotBelongToList) Error() string {
+	return fmt.Sprintf("Bucket does not not belong to list [BucketID: %d, ListID: %d]", err.BucketID, err.ListID)
+}
+
+// ErrCodeBucketDoesNotBelongToList holds the unique world-error code of this error
+const ErrCodeBucketDoesNotBelongToList = 10002
+
+// HTTPError holds the http error description
+func (err ErrBucketDoesNotBelongToList) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusBadRequest,
+		Code:     ErrCodeBucketDoesNotBelongToList,
+		Message:  "This bucket does not belong to that list.",
+	}
+}
+
+// ErrCannotRemoveLastBucket represents an error where a kanban bucket is the last on a list and thus cannot be removed.
+type ErrCannotRemoveLastBucket struct {
+	BucketID int64
+	ListID   int64
+}
+
+// IsErrCannotRemoveLastBucket checks if an error is ErrCannotRemoveLastBucket.
+func IsErrCannotRemoveLastBucket(err error) bool {
+	_, ok := err.(ErrCannotRemoveLastBucket)
+	return ok
+}
+
+func (err ErrCannotRemoveLastBucket) Error() string {
+	return fmt.Sprintf("Cannot remove last bucket of list [BucketID: %d, ListID: %d]", err.BucketID, err.ListID)
+}
+
+// ErrCodeCannotRemoveLastBucket holds the unique world-error code of this error
+const ErrCodeCannotRemoveLastBucket = 10003
+
+// HTTPError holds the http error description
+func (err ErrCannotRemoveLastBucket) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusPreconditionFailed,
+		Code:     ErrCodeCannotRemoveLastBucket,
+		Message:  "You cannot remove the last bucket on this list.",
+	}
+}
@@ -0,0 +1,232 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package models
+
+import (
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/timeutil"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web"
+)
+
+// Bucket represents a kanban bucket
+type Bucket struct {
+	// The unique, numeric id of this bucket.
+	ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id" param:"bucket"`
+	// The title of this bucket.
+	Title string `xorm:"text not null" valid:"required" minLength:"1" json:"title"`
+	// The list this bucket belongs to.
+	ListID int64 `xorm:"int(11) not null" json:"list_id" param:"list"`
+	// All tasks which belong to this bucket.
+	Tasks []*Task `xorm:"-" json:"tasks"`
+
+	// A timestamp when this bucket was created. You cannot change this value.
+	Created timeutil.TimeStamp `xorm:"created not null" json:"created"`
+	// A timestamp when this bucket was last updated. You cannot change this value.
+	Updated timeutil.TimeStamp `xorm:"updated not null" json:"updated"`
+
+	// The user who initially created the bucket.
+	CreatedBy   *user.User `xorm:"-" json:"created_by" valid:"-"`
+	CreatedByID int64      `xorm:"int(11) not null" json:"-"`
+
+	web.Rights   `xorm:"-" json:"-"`
+	web.CRUDable `xorm:"-" json:"-"`
+}
+
+// TableName returns the table name for this bucket.
+func (b *Bucket) TableName() string {
+	return "buckets"
+}
+
+func getBucketByID(id int64) (b *Bucket, err error) {
+	b = &Bucket{}
+	exists, err := x.Where("id = ?", id).Get(b)
+	if err != nil {
+		return
+	}
+	if !exists {
+		return b, ErrBucketDoesNotExist{BucketID: id}
+	}
+	return
+}
+
+func getDefaultBucket(listID int64) (bucket *Bucket, err error) {
+	bucket = &Bucket{}
+	_, err = x.
+		Where("list_id = ?", listID).
+		OrderBy("id asc").
+		Get(bucket)
+	return
+}
+
+// ReadAll returns all buckets with their tasks for a certain list
+// @Summary Get all kanban buckets of a list
+// @Description Returns all kanban buckets with belong to a list including their tasks.
+// @tags task
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Param id path int true "List Id"
+// @Success 200 {array} models.Bucket "The buckets with their tasks"
+// @Failure 500 {object} models.Message "Internal server error"
+// @Router /lists/{id}/buckets [get]
+func (b *Bucket) ReadAll(auth web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
+
+	// Note: I'm ignoring pagination for now since I've yet to figure out a way on how to make it work
+	// I'll probably just don't do it and instead make individual tasks archivable.
+
+	// Get all buckets for this list
+	buckets := []*Bucket{}
+	err = x.Where("list_id = ?", b.ListID).Find(&buckets)
+	if err != nil {
+		return
+	}
+
+	// Make a map from the bucket slice with their id as key so that we can use it to put the tasks in their buckets
+	bucketMap := make(map[int64]*Bucket, len(buckets))
+	userIDs := make([]int64, 0, len(buckets))
+	for _, bb := range buckets {
+		bucketMap[bb.ID] = bb
+		userIDs = append(userIDs, bb.CreatedByID)
+	}
+
+	// Get all users
+	users := make(map[int64]*user.User)
+	err = x.In("id", userIDs).Find(&users)
+	if err != nil {
+		return
+	}
+
+	for _, bb := range buckets {
+		bb.CreatedBy = users[bb.CreatedByID]
+	}
+
+	// Get all tasks for this list
+	opts := &taskOptions{
+		sortby: []*sortParam{
+			{
+				sortBy:  taskPropertyPosition,
+				orderBy: orderAscending,
+			},
+		},
+	}
+	tasks, _, _, err := getTasksForLists([]*List{{ID: b.ListID}}, opts)
+	if err != nil {
+		return
+	}
+
+	// Put all tasks in their buckets
+	// All tasks which are not associated to any bucket will have bucket id 0 which is the nil value for int64
+	// Since we created a bucked with that id at the beginning, all tasks should be in there.
+	for _, task := range tasks {
+		// Check if the bucket exists in the map to prevent nil pointer panics
+		if _, exists := bucketMap[task.BucketID]; !exists {
+			log.Debugf("Tried to put task %d into bucket %d which does not exist in list %d", task.ID, task.BucketID, b.ListID)
+			continue
+		}
+		bucketMap[task.BucketID].Tasks = append(bucketMap[task.BucketID].Tasks, task)
+	}
+
+	return buckets, len(buckets), int64(len(buckets)), nil
+}
+
+// Create creates a new bucket
+// @Summary Create a new bucket
+// @Description Creates a new kanban bucket on a list.
+// @tags task
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Param id path int true "List Id"
+// @Param bucket body models.Bucket true "The bucket object"
+// @Success 200 {object} models.Bucket "The created bucket object."
+// @Failure 400 {object} code.vikunja.io/web.HTTPError "Invalid bucket object provided."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "The list does not exist."
+// @Failure 500 {object} models.Message "Internal error"
+// @Router /lists/{id}/buckets [put]
+func (b *Bucket) Create(a web.Auth) (err error) {
+	b.CreatedByID = a.GetID()
+
+	_, err = x.Insert(b)
+	return
+}
+
+// Update Updates an existing bucket
+// @Summary Update an existing bucket
+// @Description Updates an existing kanban bucket.
+// @tags task
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Param listID path int true "List Id"
+// @Param bucketID path int true "Bucket Id"
+// @Param bucket body models.Bucket true "The bucket object"
+// @Success 200 {object} models.Bucket "The created bucket object."
+// @Failure 400 {object} code.vikunja.io/web.HTTPError "Invalid bucket object provided."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "The bucket does not exist."
+// @Failure 500 {object} models.Message "Internal error"
+// @Router /lists/{listID}/buckets/{bucketID} [post]
+func (b *Bucket) Update() (err error) {
+	_, err = x.Where("id = ?", b.ID).Update(b)
+	return
+}
+
+// Delete removes a bucket, but no tasks
+// @Summary Deletes an existing bucket
+// @Description Deletes an existing kanban bucket and dissociates all of its task. It does not delete any tasks. You cannot delete the last bucket on a list.
+// @tags task
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Param listID path int true "List Id"
+// @Param bucketID path int true "Bucket Id"
+// @Success 200 {object} models.Message "Successfully deleted."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "The bucket does not exist."
+// @Failure 500 {object} models.Message "Internal error"
+// @Router /lists/{listID}/buckets/{bucketID} [delete]
+func (b *Bucket) Delete() (err error) {
+	// Prevent removing the last bucket
+	total, err := x.Where("list_id = ?", b.ListID).Count(&Bucket{})
+	if err != nil {
+		return
+	}
+	if total <= 1 {
+		return ErrCannotRemoveLastBucket{
+			BucketID: b.ID,
+			ListID:   b.ListID,
+		}
+	}
+
+	// Remove the bucket itself
+	_, err = x.Where("id = ?", b.ID).Delete(&Bucket{})
+	if err != nil {
+		return
+	}
+
+	// Get the default bucket
+	defaultBucket, err := getDefaultBucket(b.ListID)
+	if err != nil {
+		return
+	}
+
+	// Remove all associations of tasks to that bucket
+	_, err = x.Where("bucket_id = ?", b.ID).Cols("bucket_id").Update(&Task{BucketID: defaultBucket.ID})
+	if err != nil {
+		return
+	}
+	return
+}
@@ -0,0 +1,45 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package models
+
+import "code.vikunja.io/web"
+
+// CanCreate checks if a user can create a new bucket
+func (b *Bucket) CanCreate(a web.Auth) (bool, error) {
+	l := &List{ID: b.ListID}
+	return l.CanWrite(a)
+}
+
+// CanUpdate checks if a user can update an existing bucket
+func (b *Bucket) CanUpdate(a web.Auth) (bool, error) {
+	return b.canDoBucket(a)
+}
+
+// CanDelete checks if a user can delete an existing bucket
+func (b *Bucket) CanDelete(a web.Auth) (bool, error) {
+	return b.canDoBucket(a)
+}
+
+// canDoBucket checks if the bucket exists and if the user has the right to act on it
+func (b *Bucket) canDoBucket(a web.Auth) (bool, error) {
+	bb, err := getBucketByID(b.ID)
+	if err != nil {
+		return false, err
+	}
+	l := &List{ID: bb.ListID}
+	return l.CanWrite(a)
+}
@@ -0,0 +1,92 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package models
+
+import (
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestBucket_ReadAll(t *testing.T) {
+	db.LoadAndAssertFixtures(t)
+
+	testuser := &user.User{ID: 1}
+	b := &Bucket{ListID: 1}
+	bucketsInterface, _, _, err := b.ReadAll(testuser, "", 0, 0)
+	assert.NoError(t, err)
+
+	buckets, is := bucketsInterface.([]*Bucket)
+	assert.True(t, is)
+
+	// Assert that we have a user for each bucket
+	assert.Equal(t, testuser.ID, buckets[0].CreatedBy.ID)
+	assert.Equal(t, testuser.ID, buckets[1].CreatedBy.ID)
+	assert.Equal(t, testuser.ID, buckets[2].CreatedBy.ID)
+
+	// Assert our three test buckets
+	assert.Len(t, buckets, 3)
+
+	// Assert all tasks are in the right bucket
+	assert.Len(t, buckets[0].Tasks, 12)
+	assert.Len(t, buckets[1].Tasks, 3)
+	assert.Len(t, buckets[2].Tasks, 3)
+
+	// Assert we have bucket 0, 1, 2, 3 but not 4 (that belongs to a different list)
+	assert.Equal(t, int64(1), buckets[0].ID)
+	assert.Equal(t, int64(2), buckets[1].ID)
+	assert.Equal(t, int64(3), buckets[2].ID)
+
+	// Kinda assert all tasks are in the right buckets
+	assert.Equal(t, int64(1), buckets[0].Tasks[0].BucketID)
+	assert.Equal(t, int64(1), buckets[0].Tasks[1].BucketID)
+	assert.Equal(t, int64(2), buckets[1].Tasks[0].BucketID)
+	assert.Equal(t, int64(2), buckets[1].Tasks[1].BucketID)
+	assert.Equal(t, int64(2), buckets[1].Tasks[2].BucketID)
+	assert.Equal(t, int64(3), buckets[2].Tasks[0].BucketID)
+	assert.Equal(t, int64(3), buckets[2].Tasks[1].BucketID)
+	assert.Equal(t, int64(3), buckets[2].Tasks[2].BucketID)
+}
+
+func TestBucket_Delete(t *testing.T) {
+	t.Run("normal", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		b := &Bucket{
+			ID:     2, // The second bucket only has 3 tasks
+			ListID: 1,
+		}
+		err := b.Delete()
+		assert.NoError(t, err)
+
+		// Assert all tasks have been moved to bucket 1 as that one is the first
+		tasks := []*Task{}
+		err = x.Where("bucket_id = ?", 1).Find(&tasks)
+		assert.NoError(t, err)
+		assert.Len(t, tasks, 15)
+	})
+	t.Run("last bucket in list", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		b := &Bucket{
+			ID:     34,
+			ListID: 18,
+		}
+		err := b.Delete()
+		assert.Error(t, err)
+		assert.True(t, IsErrCannotRemoveLastBucket(err))
+	})
+}
@@ -20,7 +20,6 @@ import (
 	"code.vikunja.io/api/pkg/timeutil"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )

 // Label represents a label
@@ -212,10 +211,8 @@ func getUserTaskIDs(u *user.User) (taskIDs []int64, err error) {
 	}

 	tasks, _, _, err := getRawTasksForLists(lists, &taskOptions{
-		startDate: time.Unix(0, 0),
-		endDate:   time.Unix(0, 0),
-		page:      -1,
-		perPage:   0,
+		page:    -1,
+		perPage: 0,
 	})
 	if err != nil {
 		return nil, err
@@ -76,7 +76,7 @@ func (l *Label) hasAccessToLabel(a web.Auth) (bool, error) {
 	has, err := x.Table("labels").
 		Select("labels.*").
 		Join("LEFT", "label_task", "label_task.label_id = labels.id").
-		Where("label_task.label_id != null OR labels.created_by_id = ?", a.GetID()).
+		Where("label_task.label_id is not null OR labels.created_by_id = ?", a.GetID()).
 		Or(builder.In("label_task.task_id", taskIDs)).
 		And("labels.id = ?", l.ID).
 		Exist(&labels)
@@ -162,20 +162,27 @@ func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, res

 	// Get all labels associated with these tasks
 	var labels []*labelWithTaskID
-	cond := builder.And(builder.In("label_task.task_id", opts.TaskIDs), builder.NotNull{"label_task.label_id"})
+	cond := builder.And(builder.NotNull{"label_task.label_id"})
+	if len(opts.TaskIDs) > 0 {
+		cond = builder.And(builder.In("label_task.task_id", opts.TaskIDs), cond)
+	}
 	if opts.GetUnusedLabels {
 		cond = builder.Or(cond, builder.Eq{"labels.created_by_id": opts.User.ID})
 	}

-	err = x.Table("labels").
+	limit, start := getLimitFromPageIndex(opts.Page, opts.PerPage)
+
+	query := x.Table("labels").
 		Select(selectStmt).
 		Join("LEFT", "label_task", "label_task.label_id = labels.id").
 		Where(cond).
 		And("labels.title LIKE ?", "%"+opts.Search+"%").
 		GroupBy(groupBy).
-		OrderBy("labels.id ASC").
-		Limit(getLimitFromPageIndex(opts.Page, opts.PerPage)).
-		Find(&labels)
+		OrderBy("labels.id ASC")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&labels)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -202,15 +209,11 @@ func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, res
 	}

 	// Get the total number of entries
-	condCount := builder.And(builder.In("label_task.task_id", opts.TaskIDs), builder.NotNull{"label_task.label_id"})
-	if opts.GetUnusedLabels {
-		condCount = builder.Or(cond, builder.Eq{"labels.created_by_id": opts.User.ID})
-	}
 	totalEntries, err = x.Table("labels").
+		Select("count(DISTINCT labels.id)").
 		Join("LEFT", "label_task", "label_task.label_id = labels.id").
-		Where(condCount).
+		Where(cond).
 		And("labels.title LIKE ?", "%"+opts.Search+"%").
-		GroupBy(groupBy).
 		Count(&Label{})
 	if err != nil {
 		return nil, 0, 0, err
@@ -77,7 +77,7 @@ func GetLinkShareFromClaims(claims jwt.MapClaims) (share *LinkSharing, err error
 	share = &LinkSharing{}
 	share.ID = int64(claims["id"].(float64))
 	share.Hash = claims["hash"].(string)
-	share.ListID = int64(claims["listID"].(float64))
+	share.ListID = int64(claims["list_id"].(float64))
 	share.Right = Right(claims["right"].(float64))
 	share.SharedByID = int64(claims["sharedByID"].(float64))
 	return
@@ -99,10 +99,16 @@ func GetLinkShareFromClaims(claims jwt.MapClaims) (share *LinkSharing, err error
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /lists/{list}/shares [put]
 func (share *LinkSharing) Create(a web.Auth) (err error) {
+
+	err = share.Right.isValid()
+	if err != nil {
+		return
+	}
+
 	share.SharedByID = a.GetID()
 	share.Hash = utils.MakeRandomString(40)
 	_, err = x.Insert(share)
-	share.SharedBy, _ = a.(*user.User)
+	share.SharedBy, _ = user.GetFromAuth(a)
 	return
 }

@@ -155,11 +161,15 @@ func (share *LinkSharing) ReadAll(a web.Auth, search string, page int, perPage i
 		return nil, 0, 0, ErrGenericForbidden{}
 	}

+	limit, start := getLimitFromPageIndex(page, perPage)
+
 	var shares []*LinkSharing
-	err = x.
-		Where("list_id = ? AND hash LIKE ?", share.ListID, "%"+search+"%").
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Find(&shares)
+	query := x.
+		Where("list_id = ? AND hash LIKE ?", share.ListID, "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&shares)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -53,9 +53,16 @@ func (share *LinkSharing) canDoLinkShare(a web.Auth) (bool, error) {
 		return false, nil
 	}

-	l, err := GetListSimplByTaskID(share.ListID)
+	l := &List{ID: share.ListID}
+	err := l.GetSimpleByID()
 	if err != nil {
 		return false, err
 	}
+
+	// Check if the user is admin when the link right is admin
+	if share.Right == RightAdmin {
+		return l.IsAdmin(a)
+	}
+
 	return l.CanWrite(a)
 }
@@ -235,9 +235,11 @@ func getRawListsForUser(opts *listOptions) (lists []*List, resultCount int, tota
 		)
 	}

+	limit, start := getLimitFromPageIndex(opts.page, opts.perPage)
+
 	// Gets all Lists where the user is either owner or in a team which has access to the list
 	// Or in a team which has namespace read access
-	err = x.Select("l.*").
+	query := x.Select("l.*").
 		Table("list").
 		Alias("l").
 		Join("INNER", []string{"namespaces", "n"}, "l.namespace_id = n.id").
@@ -247,16 +249,20 @@ func getRawListsForUser(opts *listOptions) (lists []*List, resultCount int, tota
 		Join("LEFT", []string{"team_members", "tm2"}, "tm2.team_id = tl.team_id").
 		Join("LEFT", []string{"users_list", "ul"}, "ul.list_id = l.id").
 		Join("LEFT", []string{"users_namespace", "un"}, "un.namespace_id = l.namespace_id").
-		Where("tm.user_id = ?", fullUser.ID).
-		Or("tm2.user_id = ?", fullUser.ID).
-		Or("l.owner_id = ?", fullUser.ID).
-		Or("ul.user_id = ?", fullUser.ID).
-		Or("un.user_id = ?", fullUser.ID).
+		Where(builder.Or(
+			builder.Eq{"tm.user_id": fullUser.ID},
+			builder.Eq{"tm2.user_id": fullUser.ID},
+			builder.Eq{"ul.user_id": fullUser.ID},
+			builder.Eq{"un.user_id": fullUser.ID},
+			builder.Eq{"l.owner_id": fullUser.ID},
+		)).
 		GroupBy("l.id").
-		Limit(getLimitFromPageIndex(opts.page, opts.perPage)).
 		Where("l.title LIKE ?", "%"+opts.search+"%").
-		Where(isArchivedCond).
-		Find(&lists)
+		Where(isArchivedCond)
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&lists)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -271,13 +277,14 @@ func getRawListsForUser(opts *listOptions) (lists []*List, resultCount int, tota
 		Join("LEFT", []string{"team_members", "tm2"}, "tm2.team_id = tl.team_id").
 		Join("LEFT", []string{"users_list", "ul"}, "ul.list_id = l.id").
 		Join("LEFT", []string{"users_namespace", "un"}, "un.namespace_id = l.namespace_id").
-		Where("tm.user_id = ?", fullUser.ID).
-		Or("tm2.user_id = ?", fullUser.ID).
-		Or("l.owner_id = ?", fullUser.ID).
-		Or("ul.user_id = ?", fullUser.ID).
-		Or("un.user_id = ?", fullUser.ID).
+		Where(builder.Or(
+			builder.Eq{"tm.user_id": fullUser.ID},
+			builder.Eq{"tm2.user_id": fullUser.ID},
+			builder.Eq{"ul.user_id": fullUser.ID},
+			builder.Eq{"un.user_id": fullUser.ID},
+			builder.Eq{"l.owner_id": fullUser.ID},
+		)).
 		GroupBy("l.id").
-		Limit(getLimitFromPageIndex(opts.page, opts.perPage)).
 		Where("l.title LIKE ?", "%"+opts.search+"%").
 		Where(isArchivedCond).
 		Count(&List{})
@@ -470,7 +477,17 @@ func (l *List) Create(a web.Auth) (err error) {
 	l.Owner = doer
 	l.ID = 0 // Otherwise only the first time a new list would be created

-	return CreateOrUpdateList(l)
+	err = CreateOrUpdateList(l)
+	if err != nil {
+		return
+	}
+
+	// Create a new first bucket for this list
+	b := &Bucket{
+		ListID: l.ID,
+		Title:  "New Bucket",
+	}
+	return b.Create(a)
 }

 // Delete implements the delete method of CRUDable
@@ -26,7 +26,7 @@ type TeamList struct {
 	// The unique, numeric id of this list <-> team relation.
 	ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id"`
 	// The team id.
-	TeamID int64 `xorm:"int(11) not null INDEX" json:"teamID" param:"team"`
+	TeamID int64 `xorm:"int(11) not null INDEX" json:"team_id" param:"team"`
 	// The list id.
 	ListID int64 `xorm:"int(11) not null INDEX" json:"-" param:"list"`
 	// The right this team has. 0 = Read only, 1 = Read & Write, 2 = Admin. See the docs for more details.
@@ -176,15 +176,19 @@ func (tl *TeamList) ReadAll(a web.Auth, search string, page int, perPage int) (r
 		return nil, 0, 0, ErrNeedToHaveListReadAccess{ListID: tl.ListID, UserID: a.GetID()}
 	}

+	limit, start := getLimitFromPageIndex(page, perPage)
+
 	// Get the teams
 	all := []*TeamWithRight{}
-	err = x.
+	query := x.
 		Table("teams").
 		Join("INNER", "team_list", "team_id = teams.id").
 		Where("team_list.list_id = ?", tl.ListID).
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Where("teams.name LIKE ?", "%"+search+"%").
-		Find(&all)
+		Where("teams.name LIKE ?", "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&all)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -27,7 +27,7 @@ type ListUser struct {
 	// The unique, numeric id of this list <-> user relation.
 	ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id" param:"namespace"`
 	// The username.
-	Username string `xorm:"-" json:"userID" param:"user"`
+	Username string `xorm:"-" json:"user_id" param:"user"`
 	// Used internally to reference the user
 	UserID int64 `xorm:"int(11) not null INDEX" json:"-"`
 	// The list id.
@@ -182,14 +182,18 @@ func (lu *ListUser) ReadAll(a web.Auth, search string, page int, perPage int) (r
 		return nil, 0, 0, ErrNeedToHaveListReadAccess{UserID: a.GetID(), ListID: lu.ListID}
 	}

+	limit, start := getLimitFromPageIndex(page, perPage)
+
 	// Get all users
 	all := []*UserWithRight{}
-	err = x.
+	query := x.
 		Join("INNER", "users_list", "user_id = users.id").
 		Where("users_list.list_id = ?", lu.ListID).
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Where("users.username LIKE ?", "%"+search+"%").
-		Find(&all)
+		Where("users.username LIKE ?", "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&all)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -231,11 +235,11 @@ func (lu *ListUser) Update() (err error) {
 	}

 	// Check if the user exists
-	user, err := user.GetUserByUsername(lu.Username)
+	u, err := user.GetUserByUsername(lu.Username)
 	if err != nil {
 		return err
 	}
-	lu.UserID = user.ID
+	lu.UserID = u.ID

 	_, err = x.
 		Where("list_id = ? AND user_id = ?", lu.ListID, lu.UserID).
@@ -51,6 +51,7 @@ func GetTables() []interface{} {
 		&TaskRelation{},
 		&TaskAttachment{},
 		&TaskComment{},
+		&Bucket{},
 	}
 }

@@ -72,8 +73,8 @@ func SetEngine() (err error) {

 func getLimitFromPageIndex(page int, perPage int) (limit, start int) {

-	// Get everything when page index is -1
-	if page < 0 {
+	// Get everything when page index is -1 or 0 (= not set)
+	if page < 1 {
 		return 0, 0
 	}

@@ -190,7 +190,9 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
 		[]*List{},
 	})

-	err = x.Select("namespaces.*").
+	limit, start := getLimitFromPageIndex(page, perPage)
+
+	query := x.Select("namespaces.*").
 		Table("namespaces").
 		Join("LEFT", "team_namespaces", "namespaces.id = team_namespaces.namespace_id").
 		Join("LEFT", "team_members", "team_members.team_id = team_namespaces.team_id").
@@ -199,10 +201,12 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
 		Or("namespaces.owner_id = ?", doer.ID).
 		Or("users_namespace.user_id = ?", doer.ID).
 		GroupBy("namespaces.id").
-		Limit(getLimitFromPageIndex(page, perPage)).
 		Where("namespaces.name LIKE ?", "%"+search+"%").
-		Where(isArchivedCond).
-		Find(&all)
+		Where(isArchivedCond)
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&all)
 	if err != nil {
 		return all, 0, 0, err
 	}
@@ -26,7 +26,7 @@ type TeamNamespace struct {
 	// The unique, numeric id of this namespace <-> team relation.
 	ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id"`
 	// The team id.
-	TeamID int64 `xorm:"int(11) not null INDEX" json:"teamID" param:"team"`
+	TeamID int64 `xorm:"int(11) not null INDEX" json:"team_id" param:"team"`
 	// The namespace id.
 	NamespaceID int64 `xorm:"int(11) not null INDEX" json:"-" param:"namespace"`
 	// The right this team has. 0 = Read only, 1 = Read & Write, 2 = Admin. See the docs for more details.
@@ -164,12 +164,16 @@ func (tn *TeamNamespace) ReadAll(a web.Auth, search string, page int, perPage in
 	// Get the teams
 	all := []*TeamWithRight{}

-	err = x.Table("teams").
+	limit, start := getLimitFromPageIndex(page, perPage)
+
+	query := x.Table("teams").
 		Join("INNER", "team_namespaces", "team_id = teams.id").
 		Where("team_namespaces.namespace_id = ?", tn.NamespaceID).
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Where("teams.name LIKE ?", "%"+search+"%").
-		Find(&all)
+		Where("teams.name LIKE ?", "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&all)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -216,7 +220,7 @@ func (tn *TeamNamespace) Update() (err error) {
 	}

 	_, err = x.
-		Where("namespace_id = ? AND team_id = ?", tn.TeamID, tn.TeamID).
+		Where("namespace_id = ? AND team_id = ?", tn.NamespaceID, tn.TeamID).
 		Cols("right").
 		Update(tn)
 	return
@@ -27,7 +27,7 @@ type NamespaceUser struct {
 	// The unique, numeric id of this namespace <-> user relation.
 	ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id" param:"namespace"`
 	// The username.
-	Username string `xorm:"-" json:"userID" param:"user"`
+	Username string `xorm:"-" json:"user_id" param:"user"`
 	UserID   int64  `xorm:"int(11) not null INDEX" json:"-"`
 	// The namespace id
 	NamespaceID int64 `xorm:"int(11) not null INDEX" json:"-" param:"namespace"`
@@ -170,12 +170,17 @@ func (nu *NamespaceUser) ReadAll(a web.Auth, search string, page int, perPage in

 	// Get all users
 	all := []*UserWithRight{}
-	err = x.
+
+	limit, start := getLimitFromPageIndex(page, perPage)
+
+	query := x.
 		Join("INNER", "users_namespace", "user_id = users.id").
 		Where("users_namespace.namespace_id = ?", nu.NamespaceID).
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Where("users.username LIKE ?", "%"+search+"%").
-		Find(&all)
+		Where("users.username LIKE ?", "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&all)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -253,14 +253,17 @@ func (la *TaskAssginee) ReadAll(a web.Auth, search string, page int, perPage int
 	if !can {
 		return nil, 0, 0, ErrGenericForbidden{}
 	}
+	limit, start := getLimitFromPageIndex(page, perPage)

 	var taskAssignees []*user.User
-	err = x.Table("task_assignees").
+	query := x.Table("task_assignees").
 		Select("users.*").
 		Join("INNER", "users", "task_assignees.user_id = users.id").
-		Where("task_id = ? AND users.username LIKE ?", la.TaskID, "%"+search+"%").
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Find(&taskAssignees)
+		Where("task_id = ? AND users.username LIKE ?", la.TaskID, "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&taskAssignees)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -112,10 +112,14 @@ func (ta *TaskAttachment) ReadOne() (err error) {
 func (ta *TaskAttachment) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
 	attachments := []*TaskAttachment{}

-	err = x.
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Where("task_id = ?", ta.TaskID).
-		Find(&attachments)
+	limit, start := getLimitFromPageIndex(page, perPage)
+
+	query := x.
+		Where("task_id = ?", ta.TaskID)
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&attachments)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -20,15 +20,12 @@ package models
 import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )

 // TaskCollection is a struct used to hold filter details and not clutter the Task struct with information not related to actual tasks.
 type TaskCollection struct {
-	ListID            int64 `param:"list"`
-	StartDateSortUnix int64 `query:"startdate"`
-	EndDateSortUnix   int64 `query:"enddate"`
-	Lists             []*List
+	ListID int64 `param:"list"`
+	Lists  []*List

 	// The query parameter to sort by. This is for ex. done, priority, etc.
 	SortBy    []string `query:"sort_by"`
@@ -37,10 +34,49 @@ type TaskCollection struct {
 	OrderBy    []string `query:"order_by"`
 	OrderByArr []string `query:"order_by[]"`

+	// The field name of the field to filter by
+	FilterBy    []string `query:"filter_by"`
+	FilterByArr []string `query:"filter_by[]"`
+	// The value of the field name to filter by
+	FilterValue    []string `query:"filter_value"`
+	FilterValueArr []string `query:"filter_value[]"`
+	// The comparator for field and value
+	FilterComparator    []string `query:"filter_comparator"`
+	FilterComparatorArr []string `query:"filter_comparator[]"`
+	// The way all filter conditions are concatenated together, can be either "and" or "or".,
+	FilterConcat string `query:"filter_concat"`
+
 	web.CRUDable `xorm:"-" json:"-"`
 	web.Rights   `xorm:"-" json:"-"`
 }

+func validateTaskField(fieldName string) error {
+	switch fieldName {
+	case
+		taskPropertyID,
+		taskPropertyText,
+		taskPropertyDescription,
+		taskPropertyDone,
+		taskPropertyDoneAtUnix,
+		taskPropertyDueDateUnix,
+		taskPropertyCreatedByID,
+		taskPropertyListID,
+		taskPropertyRepeatAfter,
+		taskPropertyPriority,
+		taskPropertyStartDateUnix,
+		taskPropertyEndDateUnix,
+		taskPropertyHexColor,
+		taskPropertyPercentDone,
+		taskPropertyUID,
+		taskPropertyCreated,
+		taskPropertyUpdated,
+		taskPropertyPosition:
+		return nil
+	}
+	return ErrInvalidTaskField{TaskField: fieldName}
+
+}
+
 // ReadAll gets all tasks for a collection
 // @Summary Get tasks in a list
 // @Description Returns all tasks for the current list.
@@ -53,8 +89,10 @@ type TaskCollection struct {
 // @Param s query string false "Search tasks by task text."
 // @Param sort_by query string false "The sorting parameter. You can pass this multiple times to get the tasks ordered by multiple different parametes, along with `order_by`. Possible values to sort by are `id`, `text`, `description`, `done`, `done_at_unix`, `due_date_unix`, `created_by_id`, `list_id`, `repeat_after`, `priority`, `start_date_unix`, `end_date_unix`, `hex_color`, `percent_done`, `uid`, `created`, `updated`. Default is `id`."
 // @Param order_by query string false "The ordering parameter. Possible values to order by are `asc` or `desc`. Default is `asc`."
-// @Param startdate query int false "The start date parameter to filter by. Expects a timestamp. If no end date, but a start date is specified, the end date is set to the current time."
-// @Param enddate query int false "The end date parameter to filter by. Expects a timestamp. If no start date, but an end date is specified, the start date is set to the current time."
+// @Param filter_by query string false "The name of the field to filter by. Accepts an array for multiple filters which will be chanied together, all supplied filter must match."
+// @Param filter_value query string false "The value to filter for."
+// @Param filter_comparator query string false "The comparator to use for a filter. Available values are `equals`, `greater`, `greater_equals`, `less` and `less_equals`. Defaults to `equals`"
+// @Param filter_concat query string false "The concatinator to use for filters. Available values are `and` or `or`. Defaults to `or`."
 // @Security JWTKeyAuth
 // @Success 200 {array} models.Task "The tasks"
 // @Failure 500 {object} models.Message "Internal error"
@@ -72,7 +110,7 @@ func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage i
 	var sort = make([]*sortParam, 0, len(tf.SortBy))
 	for i, s := range tf.SortBy {
 		param := &sortParam{
-			sortBy:  sortProperty(s),
+			sortBy:  s,
 			orderBy: orderAscending,
 		}
 		// This checks if tf.OrderBy has an entry with the same index as the current entry from tf.SortBy
@@ -88,12 +126,16 @@ func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage i
 	}

 	taskopts := &taskOptions{
-		search:    search,
-		startDate: time.Unix(tf.StartDateSortUnix, 0),
-		endDate:   time.Unix(tf.EndDateSortUnix, 0),
-		page:      page,
-		perPage:   perPage,
-		sortby:    sort,
+		search:       search,
+		page:         page,
+		perPage:      perPage,
+		sortby:       sort,
+		filterConcat: taskFilterConcatinator(tf.FilterConcat),
+	}
+
+	taskopts.filters, err = getTaskFiltersByCollections(tf)
+	if err != nil {
+		return
 	}

 	shareAuth, is := a.(*LinkSharing)
@@ -0,0 +1,160 @@
+// Copyright 2020 Vikunja and contriubtors. All rights reserved.
+//
+// This file is part of Vikunja.
+//
+// Vikunja is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Vikunja is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Vikunja.  If not, see <https://www.gnu.org/licenses/>.
+
+package models
+
+import (
+	"github.com/iancoleman/strcase"
+	"reflect"
+	"strconv"
+)
+
+type taskFilterComparator string
+
+const (
+	taskFilterComparatorInvalid taskFilterComparator = "invalid"
+
+	taskFilterComparatorEquals       taskFilterComparator = "="
+	taskFilterComparatorGreater      taskFilterComparator = ">"
+	taskFilterComparatorGreateEquals taskFilterComparator = ">="
+	taskFilterComparatorLess         taskFilterComparator = "<"
+	taskFilterComparatorLessEquals   taskFilterComparator = "<="
+	taskFilterComparatorNotEquals    taskFilterComparator = "!="
+)
+
+type taskFilter struct {
+	field      string
+	value      interface{} // Needs to be an interface to be able to hold the field's native value
+	comparator taskFilterComparator
+}
+
+func getTaskFiltersByCollections(c *TaskCollection) (filters []*taskFilter, err error) {
+
+	if len(c.FilterByArr) > 0 {
+		c.FilterBy = append(c.FilterBy, c.FilterByArr...)
+	}
+
+	if len(c.FilterValueArr) > 0 {
+		c.FilterValue = append(c.FilterValue, c.FilterValueArr...)
+	}
+
+	if len(c.FilterComparatorArr) > 0 {
+		c.FilterComparator = append(c.FilterComparator, c.FilterComparatorArr...)
+	}
+
+	if c.FilterConcat != "" && c.FilterConcat != filterConcatAnd && c.FilterConcat != filterConcatOr {
+		return nil, ErrInvalidTaskFilterConcatinator{
+			Concatinator: taskFilterConcatinator(c.FilterConcat),
+		}
+	}
+
+	filters = make([]*taskFilter, 0, len(c.FilterBy))
+	for i, f := range c.FilterBy {
+		filter := &taskFilter{
+			field:      f,
+			comparator: taskFilterComparatorEquals,
+		}
+
+		if len(c.FilterComparator) > i {
+			filter.comparator, err = getFilterComparatorFromString(c.FilterComparator[i])
+			if err != nil {
+				return
+			}
+		}
+
+		err = validateTaskFieldComparator(filter.comparator)
+		if err != nil {
+			return
+		}
+
+		// Cast the field value to its native type
+		if len(c.FilterValue) > i {
+			filter.value, err = getNativeValueForTaskField(filter.field, c.FilterValue[i])
+			if err != nil {
+				return
+			}
+		}
+
+		// Special case for pseudo date fields
+		// FIXME: This is really dirty, to fix this the db fields should be renamed
+		if filter.field+"_unix" == taskPropertyDoneAtUnix ||
+			filter.field+"_unix" == taskPropertyDueDateUnix ||
+			filter.field+"_unix" == taskPropertyStartDateUnix ||
+			filter.field+"_unix" == taskPropertyEndDateUnix {
+			filter.field += "_unix"
+		}
+
+		filters = append(filters, filter)
+	}
+
+	return
+}
+
+func validateTaskFieldComparator(comparator taskFilterComparator) error {
+	switch comparator {
+	case
+		taskFilterComparatorEquals,
+		taskFilterComparatorGreater,
+		taskFilterComparatorGreateEquals,
+		taskFilterComparatorLess,
+		taskFilterComparatorLessEquals,
+		taskFilterComparatorNotEquals:
+		return nil
+	default:
+		return ErrInvalidTaskFilterComparator{Comparator: comparator}
+	}
+}
+
+func getFilterComparatorFromString(comparator string) (taskFilterComparator, error) {
+	switch comparator {
+	case "equals":
+		return taskFilterComparatorEquals, nil
+	case "greater":
+		return taskFilterComparatorGreater, nil
+	case "greater_equals":
+		return taskFilterComparatorGreateEquals, nil
+	case "less":
+		return taskFilterComparatorLess, nil
+	case "less_equals":
+		return taskFilterComparatorLessEquals, nil
+	case "not_equals":
+		return taskFilterComparatorNotEquals, nil
+	default:
+		return taskFilterComparatorInvalid, ErrInvalidTaskFilterComparator{Comparator: taskFilterComparator(comparator)}
+	}
+}
+
+func getNativeValueForTaskField(fieldName, value string) (nativeValue interface{}, err error) {
+	field, ok := reflect.TypeOf(&Task{}).Elem().FieldByName(strcase.ToCamel(fieldName))
+	if !ok {
+		return nil, ErrInvalidTaskField{TaskField: fieldName}
+	}
+
+	switch field.Type.Kind() {
+	case reflect.Int64:
+		nativeValue, err = strconv.ParseInt(value, 10, 64)
+	case reflect.Float64:
+		nativeValue, err = strconv.ParseFloat(value, 64)
+	case reflect.String:
+		nativeValue = value
+	case reflect.Bool:
+		nativeValue, err = strconv.ParseBool(value)
+	default:
+	}
+
+	return
+}
@@ -16,48 +16,36 @@

 package models

-import (
-	"code.vikunja.io/api/pkg/timeutil"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
 type (
 	sortParam struct {
-		sortBy  sortProperty
+		sortBy  string
 		orderBy sortOrder // asc or desc
 	}

-	sortProperty string
-
 	sortOrder string
 )

 const (
-	taskPropertyID            sortProperty = "id"
-	taskPropertyText          sortProperty = "text"
-	taskPropertyDescription   sortProperty = "description"
-	taskPropertyDone          sortProperty = "done"
-	taskPropertyDoneAtUnix    sortProperty = "done_at_unix"
-	taskPropertyDueDateUnix   sortProperty = "due_date_unix"
-	taskPropertyCreatedByID   sortProperty = "created_by_id"
-	taskPropertyListID        sortProperty = "list_id"
-	taskPropertyRepeatAfter   sortProperty = "repeat_after"
-	taskPropertyPriority      sortProperty = "priority"
-	taskPropertyStartDateUnix sortProperty = "start_date_unix"
-	taskPropertyEndDateUnix   sortProperty = "end_date_unix"
-	taskPropertyHexColor      sortProperty = "hex_color"
-	taskPropertyPercentDone   sortProperty = "percent_done"
-	taskPropertyUID           sortProperty = "uid"
-	taskPropertyCreated       sortProperty = "created"
-	taskPropertyUpdated       sortProperty = "updated"
+	taskPropertyID            string = "id"
+	taskPropertyText          string = "text"
+	taskPropertyDescription   string = "description"
+	taskPropertyDone          string = "done"
+	taskPropertyDoneAtUnix    string = "done_at_unix"
+	taskPropertyDueDateUnix   string = "due_date_unix"
+	taskPropertyCreatedByID   string = "created_by_id"
+	taskPropertyListID        string = "list_id"
+	taskPropertyRepeatAfter   string = "repeat_after"
+	taskPropertyPriority      string = "priority"
+	taskPropertyStartDateUnix string = "start_date_unix"
+	taskPropertyEndDateUnix   string = "end_date_unix"
+	taskPropertyHexColor      string = "hex_color"
+	taskPropertyPercentDone   string = "percent_done"
+	taskPropertyUID           string = "uid"
+	taskPropertyCreated       string = "created"
+	taskPropertyUpdated       string = "updated"
+	taskPropertyPosition      string = "position"
 )

-func (p sortProperty) String() string {
-	return string(p)
-}
-
 const (
 	orderInvalid    sortOrder = "invalid"
 	orderAscending  sortOrder = "asc"
@@ -82,160 +70,5 @@ func (sp *sortParam) validate() error {
 	if sp.orderBy != orderDescending && sp.orderBy != orderAscending {
 		return ErrInvalidSortOrder{OrderBy: sp.orderBy}
 	}
-	switch sp.sortBy {
-	case
-		taskPropertyID,
-		taskPropertyText,
-		taskPropertyDescription,
-		taskPropertyDone,
-		taskPropertyDoneAtUnix,
-		taskPropertyDueDateUnix,
-		taskPropertyCreatedByID,
-		taskPropertyListID,
-		taskPropertyRepeatAfter,
-		taskPropertyPriority,
-		taskPropertyStartDateUnix,
-		taskPropertyEndDateUnix,
-		taskPropertyHexColor,
-		taskPropertyPercentDone,
-		taskPropertyUID,
-		taskPropertyCreated,
-		taskPropertyUpdated:
-		return nil
-	}
-	return ErrInvalidSortParam{SortBy: sp.sortBy}
-}
-
-type taskComparator func(lhs, rhs *Task) int64
-
-func mustMakeComparator(fieldName string) taskComparator {
-	field, ok := reflect.TypeOf(&Task{}).Elem().FieldByName(fieldName)
-	if !ok {
-		panic(fmt.Sprintf("Field '%s' has not been found on Task", fieldName))
-	}
-
-	extractProp := func(task *Task) interface{} {
-		return reflect.ValueOf(task).Elem().FieldByIndex(field.Index).Interface()
-	}
-
-	// Special case for handling TimeStamp types
-	if field.Type.Name() == "TimeStamp" {
-		return func(lhs, rhs *Task) int64 {
-			return int64(extractProp(lhs).(timeutil.TimeStamp)) - int64(extractProp(rhs).(timeutil.TimeStamp))
-		}
-	}
-
-	switch field.Type.Kind() {
-	case reflect.Int64:
-		return func(lhs, rhs *Task) int64 {
-			return extractProp(lhs).(int64) - extractProp(rhs).(int64)
-		}
-	case reflect.Float64:
-		return func(lhs, rhs *Task) int64 {
-			floatLHS, floatRHS := extractProp(lhs).(float64), extractProp(rhs).(float64)
-			if floatLHS > floatRHS {
-				return 1
-			} else if floatLHS < floatRHS {
-				return -1
-			}
-			return 0
-		}
-	case reflect.String:
-		return func(lhs, rhs *Task) int64 {
-			strLHS, strRHS := extractProp(lhs).(string), extractProp(rhs).(string)
-			if strLHS > strRHS {
-				return 1
-			} else if strLHS < strRHS {
-				return -1
-			}
-			return 0
-		}
-	case reflect.Bool:
-		return func(lhs, rhs *Task) int64 {
-			boolLHS, boolRHS := extractProp(lhs).(bool), extractProp(rhs).(bool)
-			if !boolLHS && boolRHS {
-				return -1
-			} else if boolLHS && !boolRHS {
-				return 1
-			}
-			return 0
-		}
-	default:
-		panic(fmt.Sprintf("Unsupported type for sorting: %s", field.Type.Name()))
-	}
-}
-
-// This is a map of properties that can be sorted by
-// and their appropriate comparator function.
-// The comparator function sorts in ascending mode.
-var propertyComparators = map[sortProperty]taskComparator{
-	taskPropertyID:            mustMakeComparator("ID"),
-	taskPropertyText:          mustMakeComparator("Text"),
-	taskPropertyDescription:   mustMakeComparator("Description"),
-	taskPropertyDone:          mustMakeComparator("Done"),
-	taskPropertyDoneAtUnix:    mustMakeComparator("DoneAt"),
-	taskPropertyDueDateUnix:   mustMakeComparator("DueDate"),
-	taskPropertyCreatedByID:   mustMakeComparator("CreatedByID"),
-	taskPropertyListID:        mustMakeComparator("ListID"),
-	taskPropertyRepeatAfter:   mustMakeComparator("RepeatAfter"),
-	taskPropertyPriority:      mustMakeComparator("Priority"),
-	taskPropertyStartDateUnix: mustMakeComparator("StartDate"),
-	taskPropertyEndDateUnix:   mustMakeComparator("EndDate"),
-	taskPropertyHexColor:      mustMakeComparator("HexColor"),
-	taskPropertyPercentDone:   mustMakeComparator("PercentDone"),
-	taskPropertyUID:           mustMakeComparator("UID"),
-	taskPropertyCreated:       mustMakeComparator("Created"),
-	taskPropertyUpdated:       mustMakeComparator("Updated"),
-}
-
-// Creates a taskComparator that sorts by the first comparator and falls back to
-// the second one (and so on...) if the properties were equal.
-func combineComparators(comparators ...taskComparator) taskComparator {
-	return func(lhs, rhs *Task) int64 {
-		for _, compare := range comparators {
-			res := compare(lhs, rhs)
-			if res != 0 {
-				return res
-			}
-		}
-		return 0
-	}
-}
-
-func sortTasks(tasks []*Task, by []*sortParam) {
-
-	// Always sort at least by id asc so we have a consistent order of items every time
-	// If we would not do this, we would get a different order for items with the same content every time
-	// the slice is sorted. To circumvent this, we always order at least by ID.
-	if len(by) == 0 ||
-		(len(by) > 0 && by[len(by)-1].sortBy != taskPropertyID) { // Don't sort by ID last if the id parameter is already passed as the last parameter.
-		by = append(by, &sortParam{sortBy: taskPropertyID, orderBy: orderAscending})
-	}
-
-	comparators := make([]taskComparator, 0, len(by))
-	for _, param := range by {
-		comparator, ok := propertyComparators[param.sortBy]
-		if !ok {
-			panic("No suitable comparator for sortBy found! Param was " + param.sortBy)
-		}
-
-		// This is a descending sort, so we need to negate the comparator (i.e. switch the inputs).
-		if param.orderBy == orderDescending {
-			oldComparator := comparator
-			comparator = func(lhs, rhs *Task) int64 {
-				return oldComparator(lhs, rhs) * -1
-			}
-		}
-
-		comparators = append(comparators, comparator)
-	}
-
-	combinedComparator := combineComparators(comparators...)
-
-	sort.Slice(tasks, func(i, j int) bool {
-		lhs, rhs := tasks[i], tasks[j]
-
-		res := combinedComparator(lhs, rhs)
-		return res <= 0
-	})
+	return validateTaskField(sp.sortBy)
 }
@@ -17,10 +17,7 @@
 package models

 import (
-	"github.com/mohae/deepcopy"
 	"github.com/stretchr/testify/assert"
-	"math/rand"
-	"reflect"
 	"testing"
 )

@@ -44,7 +41,7 @@ func TestSortParamValidation(t *testing.T) {
 		})
 	})
 	t.Run("Test valid sort by", func(t *testing.T) {
-		for _, test := range []sortProperty{
+		for _, test := range []string{
 			taskPropertyID,
 			taskPropertyText,
 			taskPropertyDescription,
@@ -62,8 +59,9 @@ func TestSortParamValidation(t *testing.T) {
 			taskPropertyUID,
 			taskPropertyCreated,
 			taskPropertyUpdated,
+			taskPropertyPosition,
 		} {
-			t.Run(test.String(), func(t *testing.T) {
+			t.Run(test, func(t *testing.T) {
 				s := &sortParam{
 					orderBy: orderAscending,
 					sortBy:  test,
@@ -89,777 +87,6 @@ func TestSortParamValidation(t *testing.T) {
 		}
 		err := s.validate()
 		assert.Error(t, err)
-		assert.True(t, IsErrInvalidSortParam(err))
-	})
-}
-
-var (
-	task1 = &Task{
-		ID:          1,
-		Text:        "aaa",
-		Description: "Lorem Ipsum",
-		Done:        true,
-		DoneAt:      1543626000,
-		ListID:      1,
-		UID:         "JywtBPCESImlyKugvaZWrxmXAFAWXFISMeXYImEh",
-		Created:     1543626724,
-		Updated:     1543626724,
-	}
-	task2 = &Task{
-		ID:          2,
-		Text:        "bbb",
-		Description: "Arem Ipsum",
-		Done:        true,
-		DoneAt:      1543626724,
-		CreatedByID: 1,
-		ListID:      2,
-		PercentDone: 0.3,
-		StartDate:   1543626724,
-		Created:     1553626724,
-		Updated:     1553626724,
-	}
-	task3 = &Task{
-		ID:          3,
-		Text:        "ccc",
-		DueDate:     1583626724,
-		Priority:    100,
-		ListID:      3,
-		HexColor:    "000000",
-		PercentDone: 0.1,
-		Updated:     1555555555,
-	}
-	task4 = &Task{
-		ID:        4,
-		Text:      "ddd",
-		Priority:  1,
-		StartDate: 1643626724,
-		ListID:    1,
-	}
-	task5 = &Task{
-		ID:       5,
-		Text:     "eef",
-		Priority: 50,
-		UID:      "shggzCHQWLhGNMNsOGOCOjcVkInOYjTAnORqTkdL",
-		DueDate:  1543636724,
-		Updated:  1565555555,
-	}
-	task6 = &Task{
-		ID:          6,
-		Text:        "eef",
-		DueDate:     1543616724,
-		RepeatAfter: 6400,
-		CreatedByID: 2,
-		HexColor:    "ffffff",
-	}
-	task7 = &Task{
-		ID:          7,
-		Text:        "mmmn",
-		Description: "Zoremis",
-		StartDate:   1544600000,
-		EndDate:     1584600000,
-		UID:         "tyzCZuLMSKhwclJOsDyDcUdyVAPBDOPHNTBOLTcW",
-	}
-	task8 = &Task{
-		ID:      8,
-		Text:    "b123",
-		EndDate: 1544700000,
-	}
-	task9 = &Task{
-		ID:          9,
-		Done:        true,
-		DoneAt:      1573626724,
-		Text:        "a123",
-		RepeatAfter: 86000,
-		StartDate:   1544600000,
-		EndDate:     1544700000,
-	}
-	task10 = &Task{
-		ID:          10,
-		Text:        "zzz",
-		Priority:    10,
-		PercentDone: 1,
-	}
-)
-
-type taskSortTestCase struct {
-	name         string
-	wantAsc      []*Task
-	wantDesc     []*Task
-	sortProperty sortProperty
-}
-
-var taskSortTestCases = []taskSortTestCase{
-	{
-		name:         "id",
-		sortProperty: taskPropertyID,
-		wantAsc: []*Task{
-			task1,
-			task2,
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-		wantDesc: []*Task{
-			task10,
-			task9,
-			task8,
-			task7,
-			task6,
-			task5,
-			task4,
-			task3,
-			task2,
-			task1,
-		},
-	},
-	{
-		name:         "text",
-		sortProperty: taskPropertyText,
-		wantAsc: []*Task{
-			task9,
-			task1,
-			task8,
-			task2,
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task10,
-		},
-		wantDesc: []*Task{
-			task10,
-			task7,
-			task5,
-			task6,
-			task4,
-			task3,
-			task2,
-			task8,
-			task1,
-			task9,
-		},
-	},
-	{
-		name:         "description",
-		sortProperty: taskPropertyDescription,
-		wantAsc: []*Task{
-			task3,
-			task4,
-			task5,
-			task6,
-			task8,
-			task9,
-			task10,
-			task2,
-			task1,
-			task7,
-		},
-		wantDesc: []*Task{
-			task7,
-			task1,
-			task2,
-			task3,
-			task4,
-			task5,
-			task6,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "done",
-		sortProperty: taskPropertyDone,
-		wantAsc: []*Task{
-			// These are not
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task10,
-			// These are done
-			task1,
-			task2,
-			task9,
-		},
-		wantDesc: []*Task{
-			// These are done
-			task1,
-			task2,
-			task9,
-			// These are not
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task10,
-		},
-	},
-	{
-		name:         "done at",
-		sortProperty: taskPropertyDoneAtUnix,
-		wantAsc: []*Task{
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task10,
-			task1,
-			task2,
-			task9,
-		},
-		wantDesc: []*Task{
-			task9,
-			task2,
-			task1,
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task10,
-		},
-	},
-	{
-		name:         "due date",
-		sortProperty: taskPropertyDueDateUnix,
-		wantAsc: []*Task{
-			task1,
-			task2,
-			task4,
-			task7,
-			task8,
-			task9,
-			task10,
-			task6,
-			task5,
-			task3,
-		},
-		wantDesc: []*Task{
-			task3,
-			task5,
-			task6,
-			task1,
-			task2,
-			task4,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "created by id",
-		sortProperty: taskPropertyCreatedByID,
-		wantAsc: []*Task{
-			task1,
-			task3,
-			task4,
-			task5,
-			task7,
-			task8,
-			task9,
-			task10,
-			task2,
-			task6,
-		},
-		wantDesc: []*Task{
-			task6,
-			task2,
-			task1,
-			task3,
-			task4,
-			task5,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "list id",
-		sortProperty: taskPropertyListID,
-		wantAsc: []*Task{
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-			task1,
-			task4,
-			task2,
-			task3,
-		},
-		wantDesc: []*Task{
-			task3,
-			task2,
-			task1,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "repeat after",
-		sortProperty: taskPropertyRepeatAfter,
-		wantAsc: []*Task{
-			task1,
-			task2,
-			task3,
-			task4,
-			task5,
-			task7,
-			task8,
-			task10,
-			task6,
-			task9,
-		},
-		wantDesc: []*Task{
-			task9,
-			task6,
-			task1,
-			task2,
-			task3,
-			task4,
-			task5,
-			task7,
-			task8,
-			task10,
-		},
-	},
-	{
-		name:         "priority",
-		sortProperty: taskPropertyPriority,
-		wantAsc: []*Task{
-			task1,
-			task2,
-			task6,
-			task7,
-			task8,
-			task9,
-			task4,
-			task10,
-			task5,
-			task3,
-		},
-		wantDesc: []*Task{
-			task3,
-			task5,
-			task10,
-			task4,
-			task1,
-			task2,
-			task6,
-			task7,
-			task8,
-			task9,
-		},
-	},
-	{
-		name:         "start date",
-		sortProperty: taskPropertyStartDateUnix,
-		wantAsc: []*Task{
-			task1,
-			task3,
-			task5,
-			task6,
-			task8,
-			task10,
-			task2,
-			task7,
-			task9,
-			task4,
-		},
-		wantDesc: []*Task{
-			task4,
-			task7,
-			task9,
-			task2,
-			task1,
-			task3,
-			task5,
-			task6,
-			task8,
-			task10,
-		},
-	},
-	{
-		name:         "end date",
-		sortProperty: taskPropertyEndDateUnix,
-		wantAsc: []*Task{
-			task1,
-			task2,
-			task3,
-			task4,
-			task5,
-			task6,
-			task10,
-			task8,
-			task9,
-			task7,
-		},
-		wantDesc: []*Task{
-			task7,
-			task8,
-			task9,
-			task1,
-			task2,
-			task3,
-			task4,
-			task5,
-			task6,
-			task10,
-		},
-	},
-	{
-		name:         "hex color",
-		sortProperty: taskPropertyHexColor,
-		wantAsc: []*Task{
-			task1,
-			task2,
-			task4,
-			task5,
-			task7,
-			task8,
-			task9,
-			task10,
-			task3,
-			task6,
-		},
-		wantDesc: []*Task{
-			task6,
-			task3,
-			task1,
-			task2,
-			task4,
-			task5,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "percent done",
-		sortProperty: taskPropertyPercentDone,
-		wantAsc: []*Task{
-			task1,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-			task3,
-			task2,
-			task10,
-		},
-		wantDesc: []*Task{
-			task10,
-			task2,
-			task3,
-			task1,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-		},
-	},
-	{
-		name:         "uid",
-		sortProperty: taskPropertyUID,
-		wantAsc: []*Task{
-			task2,
-			task3,
-			task4,
-			task6,
-			task8,
-			task9,
-			task10,
-			task1,
-			task5,
-			task7,
-		},
-		wantDesc: []*Task{
-			task7,
-			task5,
-			task1,
-			task2,
-			task3,
-			task4,
-			task6,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "created",
-		sortProperty: taskPropertyCreated,
-		wantAsc: []*Task{
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-			task1,
-			task2,
-		},
-		wantDesc: []*Task{
-			task2,
-			task1,
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-	},
-	{
-		name:         "updated",
-		sortProperty: taskPropertyUpdated,
-		wantAsc: []*Task{
-			task4,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-			task1,
-			task2,
-			task3,
-			task5,
-		},
-		wantDesc: []*Task{
-			task5,
-			task3,
-			task2,
-			task1,
-			task4,
-			task6,
-			task7,
-			task8,
-			task9,
-			task10,
-		},
-	},
-}
-
-func TestTaskSort(t *testing.T) {
-
-	assertTestSliceMatch := func(t *testing.T, got, want []*Task) {
-		if !reflect.DeepEqual(got, want) {
-			t.Error("Slices do not match in order")
-			t.Error("Got\t| Want")
-			for in, task := range got {
-				fail := ""
-				if task.ID != want[in].ID {
-					fail = "wrong"
-				}
-				t.Errorf("\t%d\t| %d \t%s", task.ID, want[in].ID, fail)
-			}
-		}
-	}
-
-	for _, testCase := range taskSortTestCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Run("asc default", func(t *testing.T) {
-				by := []*sortParam{
-					{
-						sortBy: testCase.sortProperty,
-					},
-				}
-
-				got := deepcopy.Copy(testCase.wantAsc).([]*Task)
-
-				// Destroy wanted order to obtain some slice we can sort
-				rand.Shuffle(len(got), func(i, j int) {
-					got[i], got[j] = got[j], got[i]
-				})
-
-				sortTasks(got, by)
-
-				assertTestSliceMatch(t, got, testCase.wantAsc)
-			})
-			t.Run("asc", func(t *testing.T) {
-				by := []*sortParam{
-					{
-						sortBy:  testCase.sortProperty,
-						orderBy: orderAscending,
-					},
-				}
-
-				got := deepcopy.Copy(testCase.wantAsc).([]*Task)
-
-				// Destroy wanted order to obtain some slice we can sort
-				rand.Shuffle(len(got), func(i, j int) {
-					got[i], got[j] = got[j], got[i]
-				})
-
-				sortTasks(got, by)
-
-				assertTestSliceMatch(t, got, testCase.wantAsc)
-			})
-			t.Run("desc", func(t *testing.T) {
-				by := []*sortParam{
-					{
-						sortBy:  testCase.sortProperty,
-						orderBy: orderDescending,
-					},
-				}
-
-				got := deepcopy.Copy(testCase.wantDesc).([]*Task)
-
-				// Destroy wanted order to obtain some slice we can sort
-				rand.Shuffle(len(got), func(i, j int) {
-					got[i], got[j] = got[j], got[i]
-				})
-
-				sortTasks(got, by)
-
-				assertTestSliceMatch(t, got, testCase.wantDesc)
-			})
-		})
-	}
-
-	// Other cases
-	t.Run("Order by Done Ascending and ID Descending", func(t *testing.T) {
-		want := []*Task{
-			// Not done
-			task10,
-			task8,
-			task7,
-			task6,
-			task5,
-			task4,
-			task3,
-
-			// Done
-			task9,
-			task2,
-			task1,
-		}
-		sortParams := []*sortParam{
-			{
-				sortBy:  taskPropertyDone,
-				orderBy: orderAscending,
-			},
-			{
-				sortBy:  taskPropertyID,
-				orderBy: orderDescending,
-			},
-		}
-
-		got := deepcopy.Copy(want).([]*Task)
-
-		// Destroy wanted order to obtain some slice we can sort
-		rand.Shuffle(len(got), func(i, j int) {
-			got[i], got[j] = got[j], got[i]
-		})
-
-		sortTasks(got, sortParams)
-
-		assertTestSliceMatch(t, got, want)
-	})
-	t.Run("Order by Done Ascending and Text Descending", func(t *testing.T) {
-		want := []*Task{
-			// Not done
-			task10,
-			task7,
-			task5,
-			task6,
-			task4,
-			task3,
-			task8,
-			// Done
-			task2,
-			task1,
-			task9,
-		}
-		sortParams := []*sortParam{
-			{
-				sortBy:  taskPropertyDone,
-				orderBy: orderAscending,
-			},
-			{
-				sortBy:  taskPropertyText,
-				orderBy: orderDescending,
-			},
-		}
-
-		got := deepcopy.Copy(want).([]*Task)
-
-		// Destroy wanted order to obtain some slice we can sort
-		rand.Shuffle(len(got), func(i, j int) {
-			got[i], got[j] = got[j], got[i]
-		})
-
-		sortTasks(got, sortParams)
-
-		assertTestSliceMatch(t, got, want)
-	})
-	t.Run("Order by Done Descending and Text Ascending", func(t *testing.T) {
-		want := []*Task{
-			// Done
-			task9,
-			task1,
-			task2,
-			// Not done
-			task8,
-			task3,
-			task4,
-			task5,
-			task6,
-			task7,
-			task10,
-		}
-		sortParams := []*sortParam{
-			{
-				sortBy:  taskPropertyDone,
-				orderBy: orderDescending,
-			},
-			{
-				sortBy:  taskPropertyText,
-				orderBy: orderAscending,
-			},
-		}
-
-		got := deepcopy.Copy(want).([]*Task)
-
-		// Destroy wanted order to obtain some slice we can sort
-		rand.Shuffle(len(got), func(i, j int) {
-			got[i], got[j] = got[j], got[i]
-		})
-
-		sortTasks(got, sortParams)
-
-		assertTestSliceMatch(t, got, want)
-
+		assert.True(t, IsErrInvalidTaskField(err))
 	})
 }
@@ -56,6 +56,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedByID: 1,
 		CreatedBy:   user1,
 		ListID:      1,
+		BucketID:    1,
 		Labels: []*Label{
 			{
 				ID:          4,
@@ -74,6 +75,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 					Index:       14,
 					CreatedByID: 1,
 					ListID:      1,
+					BucketID:    1,
 					Created:     1543626724,
 					Updated:     1543626724,
 				},
@@ -114,6 +116,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedByID: 1,
 		CreatedBy:   user1,
 		ListID:      1,
+		BucketID:    1,
 		Labels: []*Label{
 			{
 				ID:          4,
@@ -140,6 +143,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		Created:      1543626724,
 		Updated:      1543626724,
 		Priority:     100,
+		BucketID:     2,
 	}
 	task4 := &Task{
 		ID:           4,
@@ -153,6 +157,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		Created:      1543626724,
 		Updated:      1543626724,
 		Priority:     1,
+		BucketID:     2,
 	}
 	task5 := &Task{
 		ID:           5,
@@ -166,6 +171,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		Created:      1543626724,
 		Updated:      1543626724,
 		DueDate:      1543636724,
+		BucketID:     2,
 	}
 	task6 := &Task{
 		ID:           6,
@@ -179,6 +185,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		Created:      1543626724,
 		Updated:      1543626724,
 		DueDate:      1543616724,
+		BucketID:     3,
 	}
 	task7 := &Task{
 		ID:           7,
@@ -192,6 +199,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		Created:      1543626724,
 		Updated:      1543626724,
 		StartDate:    1544600000,
+		BucketID:     3,
 	}
 	task8 := &Task{
 		ID:           8,
@@ -205,6 +213,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		Created:      1543626724,
 		Updated:      1543626724,
 		EndDate:      1544700000,
+		BucketID:     3,
 	}
 	task9 := &Task{
 		ID:           9,
@@ -215,6 +224,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		ListID:       1,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 		StartDate:    1544600000,
@@ -229,6 +239,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		ListID:       1,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -241,6 +252,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		ListID:       1,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -253,6 +265,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		ListID:       1,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -265,6 +278,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       6,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     6,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -277,6 +291,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       7,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     7,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -289,6 +304,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       8,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     8,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -301,6 +317,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       9,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     9,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -313,6 +330,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       10,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     10,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -325,6 +343,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       11,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     11,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -337,6 +356,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       12,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     12,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -349,6 +369,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       13,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     13,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -361,6 +382,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       14,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     14,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -373,6 +395,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       15,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     15,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -385,6 +408,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       16,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     16,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -397,6 +421,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user6,
 		ListID:       17,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     17,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -409,6 +434,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		Reminders:    []timeutil.TimeStamp{1543626724, 1543626824},
 		ListID:       1,
+		BucketID:     1,
 		RelatedTasks: map[RelationKind][]*Task{},
 		Created:      1543626724,
 		Updated:      1543626724,
@@ -423,6 +449,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		ListID:       1,
 		RelatedTasks: map[RelationKind][]*Task{},
 		RepeatAfter:  3600,
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -445,11 +472,13 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 					ListID:      1,
 					Created:     1543626724,
 					Updated:     1543626724,
+					BucketID:    1,
 				},
 			},
 		},
-		Created: 1543626724,
-		Updated: 1543626724,
+		BucketID: 1,
+		Created:  1543626724,
+		Updated:  1543626724,
 	}
 	task30 := &Task{
 		ID:          30,
@@ -464,6 +493,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			user2,
 		},
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -477,6 +507,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		ListID:       1,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -489,6 +520,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		CreatedBy:    user1,
 		ListID:       3,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     21,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}
@@ -502,19 +534,23 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		ListID:       1,
 		PercentDone:  0.5,
 		RelatedTasks: map[RelationKind][]*Task{},
+		BucketID:     1,
 		Created:      1543626724,
 		Updated:      1543626724,
 	}

 	type fields struct {
-		ListID            int64
-		StartDateSortUnix int64
-		EndDateSortUnix   int64
-		Lists             []*List
-		SortBy            []string // Is a string, since this is the place where a query string comes from the user
-		OrderBy           []string
-		CRUDable          web.CRUDable
-		Rights            web.Rights
+		ListID  int64
+		Lists   []*List
+		SortBy  []string // Is a string, since this is the place where a query string comes from the user
+		OrderBy []string
+
+		FilterBy         []string
+		FilterValue      []string
+		FilterComparator []string
+
+		CRUDable web.CRUDable
+		Rights   web.Rights
 	}
 	type args struct {
 		search string
@@ -528,15 +564,18 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		want    interface{}
 		wantErr bool
 	}
+
+	defaultArgs := args{
+		search: "",
+		a:      &user.User{ID: 1},
+		page:   0,
+	}
+
 	tests := []testcase{
 		{
 			name:   "ReadAll Tasks normally",
 			fields: fields{},
-			args: args{
-				search: "",
-				a:      &user.User{ID: 1},
-				page:   0,
-			},
+			args:   defaultArgs,
 			want: []*Task{
 				task1,
 				task2,
@@ -579,11 +618,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 				SortBy:  []string{"done", "id"},
 				OrderBy: []string{"asc", "desc"},
 			},
-			args: args{
-				search: "",
-				a:      &user.User{ID: 1},
-				page:   0,
-			},
+			args: defaultArgs,
 			want: []*Task{
 				task33,
 				task32,
@@ -622,14 +657,51 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 		{
 			name: "ReadAll Tasks with range",
 			fields: fields{
-				StartDateSortUnix: 1544500000,
-				EndDateSortUnix:   1544600000,
+				FilterBy:         []string{"start_date", "end_date"},
+				FilterValue:      []string{"1544500000", "1544700001"},
+				FilterComparator: []string{"greater", "less"},
 			},
-			args: args{
-				search: "",
-				a:      &user.User{ID: 1},
-				page:   0,
+			args: defaultArgs,
+			want: []*Task{
+				task7,
+				task8,
+				task9,
 			},
+			wantErr: false,
+		},
+		{
+			name: "ReadAll Tasks with different range",
+			fields: fields{
+				FilterBy:         []string{"start_date", "end_date"},
+				FilterValue:      []string{"1544700000", "1545000000"},
+				FilterComparator: []string{"greater", "less"},
+			},
+			args: defaultArgs,
+			want: []*Task{
+				task8,
+				task9,
+			},
+			wantErr: false,
+		},
+		{
+			name: "ReadAll Tasks with range with start date only",
+			fields: fields{
+				FilterBy:         []string{"start_date"},
+				FilterValue:      []string{"1544600000"},
+				FilterComparator: []string{"greater"},
+			},
+			args:    defaultArgs,
+			want:    []*Task{},
+			wantErr: false,
+		},
+		{
+			name: "ReadAll Tasks with range with start date only and greater equals",
+			fields: fields{
+				FilterBy:         []string{"start_date"},
+				FilterValue:      []string{"1544600000"},
+				FilterComparator: []string{"greater_equals"},
+			},
+			args: defaultArgs,
 			want: []*Task{
 				task7,
 				task9,
@@ -637,35 +709,71 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "ReadAll Tasks with range",
+			name: "undone tasks only",
 			fields: fields{
-				StartDateSortUnix: 1544700000,
-				EndDateSortUnix:   1545000000,
-			},
-			args: args{
-				search: "",
-				a:      &user.User{ID: 1},
-				page:   0,
+				FilterBy:         []string{"done"},
+				FilterValue:      []string{"false"},
+				FilterComparator: []string{"equals"},
 			},
+			args: defaultArgs,
 			want: []*Task{
+				task1,
+				// Task 2 is done
+				task3,
+				task4,
+				task5,
+				task6,
+				task7,
 				task8,
 				task9,
+				task10,
+				task11,
+				task12,
+				task15,
+				task16,
+				task17,
+				task18,
+				task19,
+				task20,
+				task21,
+				task22,
+				task23,
+				task24,
+				task25,
+				task26,
+				task27,
+				task28,
+				task29,
+				task30,
+				task31,
+				task32,
+				task33,
 			},
 			wantErr: false,
 		},
 		{
-			name: "ReadAll Tasks with range without end date",
+			name: "done tasks only",
 			fields: fields{
-				StartDateSortUnix: 1544700000,
-			},
-			args: args{
-				search: "",
-				a:      &user.User{ID: 1},
-				page:   0,
+				FilterBy:         []string{"done"},
+				FilterValue:      []string{"true"},
+				FilterComparator: []string{"equals"},
 			},
+			args: defaultArgs,
 			want: []*Task{
-				task8,
-				task9,
+				task2,
+			},
+			wantErr: false,
+		},
+		{
+			name: "done tasks only - not equals done",
+			fields: fields{
+				FilterBy:         []string{"done"},
+				FilterValue:      []string{"false"},
+				FilterComparator: []string{"not_equals"},
+			},
+			args: defaultArgs,
+			want: []*Task{
+				task2,
 			},
 			wantErr: false,
 		},
@@ -676,13 +784,16 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			db.LoadAndAssertFixtures(t)

 			lt := &TaskCollection{
-				ListID:            tt.fields.ListID,
-				StartDateSortUnix: tt.fields.StartDateSortUnix,
-				EndDateSortUnix:   tt.fields.EndDateSortUnix,
-				SortBy:            tt.fields.SortBy,
-				OrderBy:           tt.fields.OrderBy,
-				CRUDable:          tt.fields.CRUDable,
-				Rights:            tt.fields.Rights,
+				ListID:  tt.fields.ListID,
+				SortBy:  tt.fields.SortBy,
+				OrderBy: tt.fields.OrderBy,
+
+				FilterBy:         tt.fields.FilterBy,
+				FilterValue:      tt.fields.FilterValue,
+				FilterComparator: tt.fields.FilterComparator,
+
+				CRUDable: tt.fields.CRUDable,
+				Rights:   tt.fields.Rights,
 			}
 			got, _, _, err := lt.ReadAll(tt.args.a, tt.args.search, tt.args.page, 50)
 			if (err != nil) != tt.wantErr {
@@ -690,7 +801,11 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 				return
 			}
 			if diff, equal := messagediff.PrettyDiff(got, tt.want); !equal {
-				t.Errorf("Test %s, LabelTask.ReadAll() = %v, want %v, \ndiff: %v", tt.name, got, tt.want, diff)
+				if len(got.([]*Task)) == 0 && len(tt.want.([]*Task)) == 0 {
+					return
+				}
+
+				t.Errorf("Test %s, Task.ReadAll() = %v, want %v, \ndiff: %v", tt.name, got, tt.want, diff)
 			}
 		})
 	}
@@ -180,12 +180,16 @@ func (tc *TaskComment) ReadAll(auth web.Auth, search string, page int, perPage i
 		AuthorFromDB *user.User `xorm:"extends" json:"-"`
 	}

+	limit, start := getLimitFromPageIndex(page, perPage)
+
 	comments := []*TaskComment{}
-	err = x.
+	query := x.
 		Where("task_id = ? AND comment like ?", tc.TaskID, "%"+search+"%").
-		Join("LEFT", "users", "users.id = task_comments.author_id").
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Find(&comments)
+		Join("LEFT", "users", "users.id = task_comments.author_id")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&comments)
 	if err != nil {
 		return
 	}
@@ -24,9 +24,11 @@ import (
 	"code.vikunja.io/api/pkg/utils"
 	"code.vikunja.io/web"
 	"github.com/imdario/mergo"
-	"sort"
+	"math"
 	"strconv"
 	"time"
+	"xorm.io/builder"
+	"xorm.io/xorm/schemas"
 )

 // Task represents an task in a todolist
@@ -40,30 +42,30 @@ type Task struct {
 	// Whether a task is done or not.
 	Done bool `xorm:"INDEX null" json:"done"`
 	// The time when a task was marked as done.
-	DoneAt timeutil.TimeStamp `xorm:"INDEX null 'done_at_unix'" json:"doneAt"`
+	DoneAt timeutil.TimeStamp `xorm:"INDEX null 'done_at_unix'" json:"done_at"`
 	// The time when the task is due.
-	DueDate timeutil.TimeStamp `xorm:"int(11) INDEX null 'due_date_unix'" json:"dueDate"`
+	DueDate timeutil.TimeStamp `xorm:"int(11) INDEX null 'due_date_unix'" json:"due_date"`
 	// An array of datetimes when the user wants to be reminded of the task.
-	Reminders   []timeutil.TimeStamp `xorm:"-" json:"reminderDates"`
+	Reminders   []timeutil.TimeStamp `xorm:"-" json:"reminder_dates"`
 	CreatedByID int64                `xorm:"int(11) not null" json:"-"` // ID of the user who put that task on the list
 	// The list this task belongs to.
-	ListID int64 `xorm:"int(11) INDEX not null" json:"listID" param:"list"`
+	ListID int64 `xorm:"int(11) INDEX not null" json:"list_id" param:"list"`
 	// An amount in seconds this task repeats itself. If this is set, when marking the task as done, it will mark itself as "undone" and then increase all remindes and the due date by its amount.
-	RepeatAfter int64 `xorm:"int(11) INDEX null" json:"repeatAfter"`
+	RepeatAfter int64 `xorm:"int(11) INDEX null" json:"repeat_after"`
 	// The task priority. Can be anything you want, it is possible to sort by this later.
 	Priority int64 `xorm:"int(11) null" json:"priority"`
 	// When this task starts.
-	StartDate timeutil.TimeStamp `xorm:"int(11) INDEX null 'start_date_unix'" json:"startDate" query:"-"`
+	StartDate timeutil.TimeStamp `xorm:"int(11) INDEX null 'start_date_unix'" json:"start_date" query:"-"`
 	// When this task ends.
-	EndDate timeutil.TimeStamp `xorm:"int(11) INDEX null 'end_date_unix'" json:"endDate" query:"-"`
+	EndDate timeutil.TimeStamp `xorm:"int(11) INDEX null 'end_date_unix'" json:"end_date" query:"-"`
 	// An array of users who are assigned to this task
 	Assignees []*user.User `xorm:"-" json:"assignees"`
 	// An array of labels which are associated with this task.
 	Labels []*Label `xorm:"-" json:"labels"`
 	// The task color in hex
-	HexColor string `xorm:"varchar(6) null" json:"hexColor" valid:"runelength(0|6)" maxLength:"6"`
+	HexColor string `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
 	// Determines how far a task is left from being done
-	PercentDone float64 `xorm:"DOUBLE null" json:"percentDone"`
+	PercentDone float64 `xorm:"DOUBLE null" json:"percent_done"`

 	// The task identifier, based on the list identifier and the task's index
 	Identifier string `xorm:"-" json:"identifier"`
@@ -84,8 +86,19 @@ type Task struct {
 	// A timestamp when this task was last updated. You cannot change this value.
 	Updated timeutil.TimeStamp `xorm:"updated not null" json:"updated"`

+	// BucketID is the ID of the kanban bucket this task belongs to.
+	BucketID int64 `xorm:"int(11) null" json:"bucket_id"`
+
+	// The position of the task - any task list can be sorted as usual by this parameter.
+	// When accessing tasks via kanban buckets, this is primarily used to sort them based on a range
+	// We're using a float64 here to make it possible to put any task within any two other tasks (by changing the number).
+	// You would calculate the new position between two tasks with something like task3.position = (task2.position - task1.position) / 2.
+	// A 64-Bit float leaves plenty of room to initially give tasks a position with 2^16 difference to the previous task
+	// which also leaves a lot of room for rearranging and sorting later.
+	Position float64 `xorm:"double null" json:"position"`
+
 	// The user who initially created the task.
-	CreatedBy *user.User `xorm:"-" json:"createdBy" valid:"-"`
+	CreatedBy *user.User `xorm:"-" json:"created_by" valid:"-"`

 	web.CRUDable `xorm:"-" json:"-"`
 	web.Rights   `xorm:"-" json:"-"`
@@ -109,13 +122,20 @@ func (TaskReminder) TableName() string {
 	return "task_reminders"
 }

+type taskFilterConcatinator string
+
+const (
+	filterConcatAnd = "and"
+	filterConcatOr  = "or"
+)
+
 type taskOptions struct {
-	search    string
-	startDate time.Time
-	endDate   time.Time
-	page      int
-	perPage   int
-	sortby    []*sortParam
+	search       string
+	page         int
+	perPage      int
+	sortby       []*sortParam
+	filters      []*taskFilter
+	filterConcat taskFilterConcatinator
 }

 // ReadAll is a dummy function to still have that endpoint documented
@@ -127,9 +147,12 @@ type taskOptions struct {
 // @Param page query int false "The page number. Used for pagination. If not provided, the first page of results is returned."
 // @Param per_page query int false "The maximum number of items per page. Note this parameter is limited by the configured maximum of items per page."
 // @Param s query string false "Search tasks by task text."
-// @Param sort query string false "The sorting parameter. Possible values to sort by are priority, prioritydesc, priorityasc, duedate, duedatedesc, duedateasc."
-// @Param startdate query int false "The start date parameter to filter by. Expects a timestamp. If no end date, but a start date is specified, the end date is set to the current time."
-// @Param enddate query int false "The end date parameter to filter by. Expects a timestamp. If no start date, but an end date is specified, the start date is set to the current time."
+// @Param sort_by query string false "The sorting parameter. You can pass this multiple times to get the tasks ordered by multiple different parametes, along with `order_by`. Possible values to sort by are `id`, `text`, `description`, `done`, `done_at_unix`, `due_date_unix`, `created_by_id`, `list_id`, `repeat_after`, `priority`, `start_date_unix`, `end_date_unix`, `hex_color`, `percent_done`, `uid`, `created`, `updated`. Default is `id`."
+// @Param order_by query string false "The ordering parameter. Possible values to order by are `asc` or `desc`. Default is `asc`."
+// @Param filter_by query string false "The name of the field to filter by. Accepts an array for multiple filters which will be chanied together, all supplied filter must match."
+// @Param filter_value query string false "The value to filter for."
+// @Param filter_comparator query string false "The comparator to use for a filter. Available values are `equals`, `greater`, `greater_equals`, `less` and `less_equals`. Defaults to `equals`"
+// @Param filter_concat query string false "The concatinator to use for filters. Available values are `and` or `or`. Defaults to `or`."
 // @Security JWTKeyAuth
 // @Success 200 {array} models.Task "The tasks"
 // @Failure 500 {object} models.Message "Internal error"
@@ -138,7 +161,12 @@ func (t *Task) ReadAll(a web.Auth, search string, page int, perPage int) (result
 	return nil, 0, 0, nil
 }

-func getRawTasksForLists(lists []*List, opts *taskOptions) (taskMap map[int64]*Task, resultCount int, totalItems int64, err error) {
+func getRawTasksForLists(lists []*List, opts *taskOptions) (tasks []*Task, resultCount int, totalItems int64, err error) {
+
+	// Set the default concatinator of filter variables to or if none was provided
+	if opts.filterConcat == "" {
+		opts.filterConcat = filterConcatOr
+	}

 	// Get all list IDs and get the tasks
 	var listIDs []int64
@@ -146,6 +174,15 @@ func getRawTasksForLists(lists []*List, opts *taskOptions) (taskMap map[int64]*T
 		listIDs = append(listIDs, l.ID)
 	}

+	// Add the id parameter as the last parameter to sorty by default, but only if it is not already passed as the last parameter.
+	if len(opts.sortby) == 0 ||
+		len(opts.sortby) > 0 && opts.sortby[len(opts.sortby)-1].sortBy != taskPropertyID {
+		opts.sortby = append(opts.sortby, &sortParam{
+			sortBy:  taskPropertyID,
+			orderBy: orderAscending,
+		})
+	}
+
 	// Since xorm does not use placeholders for order by, it is possible to expose this with sql injection if we're directly
 	// passing user input to the db.
 	// As a workaround to prevent this, we check for valid column names here prior to passing it to the db.
@@ -155,81 +192,106 @@ func getRawTasksForLists(lists []*List, opts *taskOptions) (taskMap map[int64]*T
 		if err := param.validate(); err != nil {
 			return nil, 0, 0, err
 		}
-		orderby += param.sortBy.String() + " " + param.orderBy.String()
+		orderby += param.sortBy + " " + param.orderBy.String()
+
+		// Postgres sorts by default entries with null values after ones with values.
+		// To make that consistent with the sort order we have and other dbms, we're adding a separate clause here.
+		if x.Dialect().URI().DBType == schemas.POSTGRES {
+			if param.orderBy == orderAscending {
+				orderby += " NULLS FIRST"
+			}
+			if param.orderBy == orderDescending {
+				orderby += " NULLS LAST"
+			}
+		}
+
 		if (i + 1) < len(opts.sortby) {
 			orderby += ", "
 		}
 	}

-	taskMap = make(map[int64]*Task)
-
-	// Then return all tasks for that lists
-	if opts.startDate.Unix() != 0 || opts.endDate.Unix() != 0 {
-
-		startDateUnix := time.Now().Unix()
-		if opts.startDate.Unix() != 0 {
-			startDateUnix = opts.startDate.Unix()
-		}
-
-		endDateUnix := time.Now().Unix()
-		if opts.endDate.Unix() != 0 {
-			endDateUnix = opts.endDate.Unix()
-		}
-
-		err := x.In("list_id", listIDs).
-			Where("text LIKE ?", "%"+opts.search+"%").
-			And("((due_date_unix BETWEEN ? AND ?) OR "+
-				"(start_date_unix BETWEEN ? and ?) OR "+
-				"(end_date_unix BETWEEN ? and ?))", startDateUnix, endDateUnix, startDateUnix, endDateUnix, startDateUnix, endDateUnix).
-			OrderBy(orderby).
-			Limit(getLimitFromPageIndex(opts.page, opts.perPage)).
-			Find(&taskMap)
-		if err != nil {
-			return nil, 0, 0, err
-		}
-
-		totalItems, err = x.In("list_id", listIDs).
-			Where("text LIKE ?", "%"+opts.search+"%").
-			And("((due_date_unix BETWEEN ? AND ?) OR "+
-				"(start_date_unix BETWEEN ? and ?) OR "+
-				"(end_date_unix BETWEEN ? and ?))", startDateUnix, endDateUnix, startDateUnix, endDateUnix, startDateUnix, endDateUnix).
-			Count(&Task{})
-		if err != nil {
-			return nil, 0, 0, err
-		}
-	} else {
-		err := x.In("list_id", listIDs).
-			Where("text LIKE ?", "%"+opts.search+"%").
-			OrderBy(orderby).
-			Limit(getLimitFromPageIndex(opts.page, opts.perPage)).
-			Find(&taskMap)
-		if err != nil {
-			return nil, 0, 0, err
-		}
-		totalItems, err = x.In("list_id", listIDs).
-			Where("text LIKE ?", "%"+opts.search+"%").
-			Count(&Task{})
-		if err != nil {
-			return nil, 0, 0, err
+	var filters = make([]builder.Cond, 0, len(opts.filters))
+	// To still find tasks with nil values, we exclude 0s when comparing with >/< values.
+	for _, f := range opts.filters {
+		switch f.comparator {
+		case taskFilterComparatorEquals:
+			filters = append(filters, &builder.Eq{f.field: f.value})
+		case taskFilterComparatorNotEquals:
+			filters = append(filters, &builder.Neq{f.field: f.value})
+		case taskFilterComparatorGreater:
+			filters = append(filters, builder.Or(&builder.Gt{f.field: f.value}, &builder.Eq{f.field: 0}))
+		case taskFilterComparatorGreateEquals:
+			filters = append(filters, builder.Or(&builder.Gte{f.field: f.value}, &builder.Eq{f.field: 0}))
+		case taskFilterComparatorLess:
+			filters = append(filters, builder.Or(&builder.Lt{f.field: f.value}, &builder.Eq{f.field: 0}))
+		case taskFilterComparatorLessEquals:
+			filters = append(filters, builder.Or(&builder.Lte{f.field: f.value}, &builder.Eq{f.field: 0}))
 		}
 	}
-	return taskMap, len(taskMap), totalItems, nil
+
+	// Then return all tasks for that lists
+	query := x.NewSession().
+		OrderBy(orderby)
+	queryCount := x.NewSession()
+
+	if len(opts.search) > 0 {
+		query = query.Where("text LIKE ?", "%"+opts.search+"%")
+		queryCount = queryCount.Where("text LIKE ?", "%"+opts.search+"%")
+	}
+
+	if len(listIDs) > 0 {
+		query = query.In("list_id", listIDs)
+		queryCount = queryCount.In("list_id", listIDs)
+	}
+
+	if len(filters) > 0 {
+		if opts.filterConcat == filterConcatOr {
+			query = query.Where(builder.Or(filters...))
+			queryCount = queryCount.Where(builder.Or(filters...))
+		}
+		if opts.filterConcat == filterConcatAnd {
+			query = query.Where(builder.And(filters...))
+			queryCount = queryCount.Where(builder.And(filters...))
+		}
+	}
+
+	limit, start := getLimitFromPageIndex(opts.page, opts.perPage)
+
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+
+	tasks = []*Task{}
+	err = query.Find(&tasks)
+	if err != nil {
+		return nil, 0, 0, err
+	}
+
+	totalItems, err = queryCount.
+		Count(&Task{})
+	if err != nil {
+		return nil, 0, 0, err
+	}
+
+	return tasks, len(tasks), totalItems, nil
 }

 func getTasksForLists(lists []*List, opts *taskOptions) (tasks []*Task, resultCount int, totalItems int64, err error) {

-	taskMap, resultCount, totalItems, err := getRawTasksForLists(lists, opts)
+	tasks, resultCount, totalItems, err = getRawTasksForLists(lists, opts)
 	if err != nil {
 		return nil, 0, 0, err
 	}

-	tasks, err = addMoreInfoToTasks(taskMap)
+	taskMap := make(map[int64]*Task, len(tasks))
+	for _, t := range tasks {
+		taskMap[t.ID] = t
+	}
+
+	err = addMoreInfoToTasks(taskMap)
 	if err != nil {
 		return nil, 0, 0, err
 	}
-	// Because the list is fully unsorted (since we're dealing with maps)
-	// we have to manually sort the tasks again here.
-	sortTasks(tasks, opts.sortby)

 	return tasks, resultCount, totalItems, err
 }
@@ -265,25 +327,28 @@ func (bt *BulkTask) GetTasksByIDs() (err error) {
 		}
 	}

-	taskMap := make(map[int64]*Task, len(bt.Tasks))
-	err = x.In("id", bt.IDs).Find(&taskMap)
+	err = x.In("id", bt.IDs).Find(&bt.Tasks)
 	if err != nil {
 		return
 	}

-	bt.Tasks, err = addMoreInfoToTasks(taskMap)
 	return
 }

 // GetTasksByUIDs gets all tasks from a bunch of uids
 func GetTasksByUIDs(uids []string) (tasks []*Task, err error) {
-	taskMap := make(map[int64]*Task)
-	err = x.In("uid", uids).Find(&taskMap)
+	tasks = []*Task{}
+	err = x.In("uid", uids).Find(&tasks)
 	if err != nil {
 		return
 	}

-	tasks, err = addMoreInfoToTasks(taskMap)
+	taskMap := make(map[int64]*Task, len(tasks))
+	for _, t := range tasks {
+		taskMap[t.ID] = t
+	}
+
+	err = addMoreInfoToTasks(taskMap)
 	return
 }

@@ -295,7 +360,7 @@ func getRemindersForTasks(taskIDs []int64) (reminders []*TaskReminder, err error

 // This function takes a map with pointers and returns a slice with pointers to tasks
 // It adds more stuff like assignees/labels/etc to a bunch of tasks
-func addMoreInfoToTasks(taskMap map[int64]*Task) (tasks []*Task, err error) {
+func addMoreInfoToTasks(taskMap map[int64]*Task) (err error) {

 	// No need to iterate over users and stuff if the list doesn't has tasks
 	if len(taskMap) == 0 {
@@ -345,7 +410,7 @@ func addMoreInfoToTasks(taskMap map[int64]*Task) (tasks []*Task, err error) {
 		In("task_id", taskIDs).
 		Find(&attachments)
 	if err != nil {
-		return nil, err
+		return
 	}

 	fileIDs := []int64{}
@@ -440,19 +505,22 @@ func addMoreInfoToTasks(taskMap map[int64]*Task) (tasks []*Task, err error) {
 		taskMap[rt.TaskID].RelatedTasks[rt.RelationKind] = append(taskMap[rt.TaskID].RelatedTasks[rt.RelationKind], fullRelatedTasks[rt.OtherTaskID])
 	}

-	// make a complete slice from the map
-	tasks = []*Task{}
-	for _, t := range taskMap {
-		tasks = append(tasks, t)
+	return
+}
+
+func checkBucketAndTaskBelongToSameList(fullTask *Task, bucketID int64) (err error) {
+	if bucketID != 0 {
+		b, err := getBucketByID(bucketID)
+		if err != nil {
+			return err
+		}
+		if fullTask.ListID != b.ListID {
+			return ErrBucketDoesNotBelongToList{
+				ListID:   fullTask.ListID,
+				BucketID: fullTask.BucketID,
+			}
+		}
 	}
-
-	// Sort the output. In Go, contents on a map are put on that map in no particular order.
-	// Because of this, tasks are not sorted anymore in the output, this leads to confiusion.
-	// To avoid all this, we need to sort the slice afterwards
-	sort.Slice(tasks, func(i, j int) bool {
-		return tasks[i].ID < tasks[j].ID
-	})
-
 	return
 }

@@ -485,9 +553,16 @@ func (t *Task) Create(a web.Auth) (err error) {
 		return
 	}

-	u, err := user.GetUserByID(a.GetID())
-	if err != nil {
-		return err
+	if _, is := a.(*LinkSharing); is {
+		// A negative user id indicates user share links
+		t.CreatedByID = a.GetID() * -1
+	} else {
+		u, err := user.GetUserByID(a.GetID())
+		if err != nil {
+			return err
+		}
+		t.CreatedByID = u.ID
+		t.CreatedBy = u
 	}

 	// Generate a uuid if we don't already have one
@@ -495,6 +570,21 @@ func (t *Task) Create(a web.Auth) (err error) {
 		t.UID = utils.MakeRandomString(40)
 	}

+	// If there is a bucket set, make sure they belong to the same list as the task
+	err = checkBucketAndTaskBelongToSameList(t, t.BucketID)
+	if err != nil {
+		return
+	}
+
+	// Get the default bucket and move the task there
+	if t.BucketID == 0 {
+		defaultBucket, err := getDefaultBucket(t.ListID)
+		if err != nil {
+			return err
+		}
+		t.BucketID = defaultBucket.ID
+	}
+
 	// Get the index for this task
 	latestTask := &Task{}
 	_, err = x.Where("list_id = ?", t.ListID).OrderBy("id desc").Get(latestTask)
@@ -503,8 +593,10 @@ func (t *Task) Create(a web.Auth) (err error) {
 	}

 	t.Index = latestTask.Index + 1
-	t.CreatedByID = u.ID
-	t.CreatedBy = u
+	// If no position was supplied, set a default one
+	if t.Position == 0 {
+		t.Position = float64(latestTask.ID+1) * math.Pow(2, 16)
+	}
 	if _, err = x.Insert(t); err != nil {
 		return err
 	}
@@ -570,6 +662,21 @@ func (t *Task) Update() (err error) {
 		return err
 	}

+	// If there is a bucket set, make sure they belong to the same list as the task
+	err = checkBucketAndTaskBelongToSameList(&ot, t.BucketID)
+	if err != nil {
+		return
+	}
+
+	// If the task is being moved between lists, make sure to move the bucket as well
+	if t.ListID != 0 && ot.ListID != t.ListID {
+		b, err := getDefaultBucket(t.ListID)
+		if err != nil {
+			return err
+		}
+		t.BucketID = b.ID
+	}
+
 	// Update the labels
 	//
 	// Maybe FIXME:
@@ -630,10 +737,14 @@ func (t *Task) Update() (err error) {
 	if t.HexColor == "" {
 		ot.HexColor = ""
 	}
-	// Percent DOnw
+	// Percent Done
 	if t.PercentDone == 0 {
 		ot.PercentDone = 0
 	}
+	// Position
+	if t.Position == 0 {
+		ot.Position = 0
+	}

 	_, err = x.ID(t.ID).
 		Cols("text",
@@ -646,7 +757,11 @@ func (t *Task) Update() (err error) {
 			"end_date_unix",
 			"hex_color",
 			"done_at_unix",
-			"percent_done").
+			"percent_done",
+			"list_id",
+			"bucket_id",
+			"position",
+		).
 		Update(ot)
 	*t = ot
 	if err != nil {
@@ -835,16 +950,16 @@ func (t *Task) ReadOne() (err error) {
 		return
 	}

-	tasks, err := addMoreInfoToTasks(taskMap)
+	err = addMoreInfoToTasks(taskMap)
 	if err != nil {
 		return
 	}

-	if len(tasks) == 0 {
+	if len(taskMap) == 0 {
 		return ErrTaskDoesNotExist{t.ID}
 	}

-	*t = *tasks[0]
+	*t = *taskMap[t.ID]

 	return
 }
@@ -59,12 +59,24 @@ func (t *Task) CanWrite(a web.Auth) (canWrite bool, err error) {
 // Helper function to check if a user can do stuff on a list task
 func (t *Task) canDoTask(a web.Auth) (bool, error) {
 	// Get the task
-	lI, err := GetTaskByIDSimple(t.ID)
+	ot, err := GetTaskByIDSimple(t.ID)
 	if err != nil {
 		return false, err
 	}

+	// Check if we're moving the task into a different list to check if the user has sufficient rights for that on the new list
+	if t.ListID != 0 && t.ListID != ot.ListID {
+		newList := &List{ID: t.ListID}
+		can, err := newList.CanWrite(a)
+		if err != nil {
+			return false, err
+		}
+		if !can {
+			return false, ErrGenericForbidden{}
+		}
+	}
+
 	// A user can do a task if it has write acces to its list
-	l := &List{ID: lI.ListID}
+	l := &List{ID: ot.ListID}
 	return l.CanWrite(a)
 }
@@ -47,6 +47,8 @@ func TestTask_Create(t *testing.T) {
 		// Assert getting a new index
 		assert.NotEmpty(t, task.Index)
 		assert.Equal(t, int64(18), task.Index)
+		// Assert moving it into the default bucket
+		assert.Equal(t, int64(1), task.BucketID)

 	})
 	t.Run("empty text", func(t *testing.T) {
@@ -35,7 +35,7 @@ type Team struct {
 	CreatedByID int64  `xorm:"int(11) not null INDEX" json:"-"`

 	// The user who created this team.
-	CreatedBy *user.User `xorm:"-" json:"createdBy"`
+	CreatedBy *user.User `xorm:"-" json:"created_by"`
 	// An array of all members in this team.
 	Members []*TeamUser `xorm:"-" json:"members"`

@@ -203,14 +203,18 @@ func (t *Team) ReadAll(a web.Auth, search string, page int, perPage int) (result
 		return nil, 0, 0, ErrGenericForbidden{}
 	}

+	limit, start := getLimitFromPageIndex(page, perPage)
+
 	all := []*Team{}
-	err = x.Select("teams.*").
+	query := x.Select("teams.*").
 		Table("teams").
 		Join("INNER", "team_members", "team_members.team_id = teams.id").
 		Where("team_members.user_id = ?", a.GetID()).
-		Limit(getLimitFromPageIndex(page, perPage)).
-		Where("teams.name LIKE ?", "%"+search+"%").
-		Find(&all)
+		Where("teams.name LIKE ?", "%"+search+"%")
+	if limit > 0 {
+		query = query.Limit(limit, start)
+	}
+	err = query.Find(&all)
 	if err != nil {
 		return nil, 0, 0, err
 	}
@@ -56,7 +56,9 @@ func SetupTests() {
 		"teams",
 		"users",
 		"users_list",
-		"users_namespace")
+		"users_namespace",
+		"buckets",
+	)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -19,7 +19,7 @@ package red
 import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v7"
 )

 var r *redis.Client
@@ -59,7 +59,7 @@ func NewLinkShareJWTAuthtoken(share *models.LinkSharing) (token string, err erro
 	claims["type"] = AuthTypeLinkShare
 	claims["id"] = share.ID
 	claims["hash"] = share.Hash
-	claims["listID"] = share.ListID
+	claims["list_id"] = share.ListID
 	claims["right"] = share.Right
 	claims["sharedByID"] = share.SharedByID
 	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
@@ -39,6 +39,7 @@ type Token struct {
 // @Param credentials body user.UserLogin true "The login credentials"
 // @Success 200 {object} v1.Token
 // @Failure 400 {object} models.Message "Invalid user password model."
+// @Failure 412 {object} models.Message "Invalid totp passcode."
 // @Failure 403 {object} models.Message "Invalid username or password."
 // @Router /login [post]
 func Login(c echo.Context) error {
@@ -53,6 +54,21 @@ func Login(c echo.Context) error {
 		return handler.HandleHTTPError(err, c)
 	}

+	totpEnabled, err := user2.TOTPEnabledForUser(user)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	if totpEnabled {
+		_, err = user2.ValidateTOTPPasscode(&user2.TOTPPasscode{
+			User:     user,
+			Passcode: u.TOTPPasscode,
+		})
+		if err != nil {
+			return handler.HandleHTTPError(err, c)
+		}
+	}
+
 	// Create token
 	t, err := NewUserJWTAuthtoken(user)
 	if err != nil {
@@ -18,7 +18,6 @@ package v1

 import (
 	"code.vikunja.io/api/pkg/models"
-	user2 "code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
 	"net/http"
@@ -46,11 +45,12 @@ func UploadTaskAttachment(c echo.Context) error {
 	}

 	// Rights check
-	user, err := user2.GetCurrentUser(c)
+	auth, err := GetAuthFromClaims(c)
 	if err != nil {
 		return handler.HandleHTTPError(err, c)
 	}
-	can, err := taskAttachment.CanCreate(user)
+
+	can, err := taskAttachment.CanCreate(auth)
 	if err != nil {
 		return handler.HandleHTTPError(err, c)
 	}
@@ -83,7 +83,7 @@ func UploadTaskAttachment(c echo.Context) error {
 		}
 		defer f.Close()

-		err = ta.NewAttachment(f, file.Filename, uint64(file.Size), user)
+		err = ta.NewAttachment(f, file.Filename, uint64(file.Size), auth)
 		if err != nil {
 			r.Errors = append(r.Errors, handler.HandleHTTPError(err, c))
 			continue
@@ -115,11 +115,11 @@ func GetTaskAttachment(c echo.Context) error {
 	}

 	// Rights check
-	user, err := user2.GetCurrentUser(c)
+	auth, err := GetAuthFromClaims(c)
 	if err != nil {
 		return handler.HandleHTTPError(err, c)
 	}
-	can, err := taskAttachment.CanRead(user)
+	can, err := taskAttachment.CanRead(auth)
 	if err != nil {
 		return handler.HandleHTTPError(err, c)
 	}
@@ -73,11 +73,12 @@ func ListUsersForList(c echo.Context) error {
 	}

 	list := models.List{ID: listID}
-	currentUser, err := user.GetCurrentUser(c)
+	auth, err := GetAuthFromClaims(c)
 	if err != nil {
 		return handler.HandleHTTPError(err, c)
 	}
-	canRead, err := list.CanRead(currentUser)
+
+	canRead, err := list.CanRead(auth)
 	if err != nil {
 		return handler.HandleHTTPError(err, c)
 	}
@@ -0,0 +1,194 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package v1
+
+import (
+	"bytes"
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web/handler"
+	"fmt"
+	"github.com/labstack/echo/v4"
+	"image/jpeg"
+	"net/http"
+)
+
+// UserTOTPEnroll is the handler to enroll a user into totp
+// @Summary Enroll a user into totp
+// @Description Creates an initial setup for the user in the db. After this step, the user needs to verify they have a working totp setup with the "enable totp" endpoint.
+// @tags user
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Success 200 {object} user.TOTP
+// @Failure 400 {object} code.vikunja.io/web.HTTPError "Something's invalid."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "User does not exist."
+// @Failure 500 {object} models.Message "Internal server error."
+// @Router /user/settings/totp/enroll [post]
+func UserTOTPEnroll(c echo.Context) error {
+	u, err := user.GetCurrentUser(c)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	t, err := user.EnrollTOTP(u)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	return c.JSON(http.StatusOK, t)
+}
+
+// UserTOTPEnable is the handler to enable totp for a user
+// @Summary Enable a previously enrolled totp setting.
+// @Description Enables a previously enrolled totp setting by providing a totp passcode.
+// @tags user
+// @Accept json
+// @Produce json
+// @Param totp body user.TOTPPasscode true "The totp passcode."
+// @Security JWTKeyAuth
+// @Success 200 {object} models.Message "Successfully enabled"
+// @Failure 400 {object} code.vikunja.io/web.HTTPError "Something's invalid."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "User does not exist."
+// @Failure 412 {object} code.vikunja.io/web.HTTPError "TOTP is not enrolled."
+// @Failure 500 {object} models.Message "Internal server error."
+// @Router /user/settings/totp/enable [post]
+func UserTOTPEnable(c echo.Context) error {
+	u, err := user.GetCurrentUser(c)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	passcode := &user.TOTPPasscode{
+		User: u,
+	}
+	if err := c.Bind(passcode); err != nil {
+		log.Debugf("Invalid model error. Internal error was: %s", err.Error())
+		if he, is := err.(*echo.HTTPError); is {
+			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message))
+		}
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided."))
+	}
+
+	err = user.EnableTOTP(passcode)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	return c.JSON(http.StatusOK, models.Message{Message: "TOTP was enabled successfully."})
+}
+
+// UserTOTPDisable disables totp settings for the current user.
+// @Summary Disable totp settings
+// @Description Disables any totp settings for the current user.
+// @tags user
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Param totp body user.Login true "The current user's password (only password is enough)."
+// @Success 200 {object} models.Message "Successfully disabled"
+// @Failure 400 {object} code.vikunja.io/web.HTTPError "Something's invalid."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "User does not exist."
+// @Failure 500 {object} models.Message "Internal server error."
+// @Router /user/settings/totp/disable [post]
+func UserTOTPDisable(c echo.Context) error {
+	login := &user.Login{}
+	if err := c.Bind(login); err != nil {
+		log.Debugf("Invalid model error. Internal error was: %s", err.Error())
+		if he, is := err.(*echo.HTTPError); is {
+			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message))
+		}
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided."))
+	}
+
+	u, err := user.GetCurrentUser(c)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	u, err = user.GetUserByID(u.ID)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	err = user.CheckUserPassword(u, login.Password)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	err = user.DisableTOTP(u)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	return c.JSON(http.StatusOK, models.Message{Message: "TOTP was enabled successfully."})
+}
+
+// UserTOTPQrCode is the handler to show a qr code to enroll the user into totp
+// @Summary Totp QR Code
+// @Description Returns a qr code for easier setup at end user's devices.
+// @tags user
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Success 200 {} string "The qr code as jpeg image"
+// @Failure 500 {object} models.Message "Internal server error."
+// @Router /user/settings/totp/qrcode [get]
+func UserTOTPQrCode(c echo.Context) error {
+	u, err := user.GetCurrentUser(c)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	qrcode, err := user.GetTOTPQrCodeForUser(u)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	buff := &bytes.Buffer{}
+	err = jpeg.Encode(buff, qrcode, nil)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	return c.Blob(http.StatusOK, "image/jpeg", buff.Bytes())
+}
+
+// UserTOTP returns the current totp implementation if any is enabled.
+// @Summary Totp setting for the current user
+// @Description Returns the current user totp setting or an error if it is not enabled.
+// @tags user
+// @Accept json
+// @Produce json
+// @Security JWTKeyAuth
+// @Success 200 {object} user.TOTP "The totp settings."
+// @Failure 500 {object} models.Message "Internal server error."
+// @Router /user/settings/totp [get]
+func UserTOTP(c echo.Context) error {
+	u, err := user.GetCurrentUser(c)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	t, err := user.GetTOTPForUser(u)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	return c.JSON(http.StatusOK, t)
+}
@@ -0,0 +1,72 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package v1
+
+import (
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web/handler"
+	"fmt"
+	"github.com/labstack/echo/v4"
+	"net/http"
+)
+
+// UpdateUserEmail is the handler to let a user update their email address.
+// @Summary Update email address
+// @Description Lets the current user change their email address.
+// @tags user
+// @Accept json
+// @Produce json
+// @Param userEmailUpdate body user.EmailUpdate true "The new email address and current password."
+// @Security JWTKeyAuth
+// @Success 200 {object} models.Message
+// @Failure 400 {object} code.vikunja.io/web.HTTPError "Something's invalid."
+// @Failure 404 {object} code.vikunja.io/web.HTTPError "User does not exist."
+// @Failure 500 {object} models.Message "Internal server error."
+// @Router /user/settings/email [post]
+func UpdateUserEmail(c echo.Context) (err error) {
+
+	var emailUpdate = &user.EmailUpdate{}
+	if err := c.Bind(emailUpdate); err != nil {
+		log.Debugf("Invalid model error. Internal error was: %s", err.Error())
+		if he, is := err.(*echo.HTTPError); is {
+			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided. Error was: %s", he.Message))
+		}
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid model provided."))
+	}
+
+	emailUpdate.User, err = user.GetCurrentUser(c)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	emailUpdate.User, err = user.CheckUserCredentials(&user.Login{
+		Username: emailUpdate.User.Username,
+		Password: emailUpdate.Password,
+	})
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	err = user.UpdateEmail(emailUpdate)
+	if err != nil {
+		return handler.HandleHTTPError(err, c)
+	}
+
+	return c.JSON(http.StatusOK, models.Message{Message: "We sent you email with a link to confirm your email address."})
+}
@@ -202,10 +202,18 @@ func registerAPIRoutes(a *echo.Group) {
 	a.POST("/tokenTest", apiv1.CheckToken)

 	// User stuff
-	a.GET("/user", apiv1.UserShow)
-	a.POST("/user/password", apiv1.UserChangePassword)
-	a.GET("/users", apiv1.UserList)
-	a.POST("/user/token", apiv1.RenewToken)
+	u := a.Group("/user")
+
+	u.GET("", apiv1.UserShow)
+	u.POST("/password", apiv1.UserChangePassword)
+	u.GET("s", apiv1.UserList)
+	u.POST("/token", apiv1.RenewToken)
+	u.POST("/settings/email", apiv1.UpdateUserEmail)
+	u.GET("/settings/totp", apiv1.UserTOTP)
+	u.POST("/settings/totp/enroll", apiv1.UserTOTPEnroll)
+	u.POST("/settings/totp/enable", apiv1.UserTOTPEnable)
+	u.POST("/settings/totp/disable", apiv1.UserTOTPDisable)
+	u.GET("/settings/totp/qrcode", apiv1.UserTOTPQrCode)

 	listHandler := &handler.WebHandler{
 		EmptyStruct: func() handler.CObject {
@@ -238,6 +246,16 @@ func registerAPIRoutes(a *echo.Group) {
 	}
 	a.GET("/lists/:list/tasks", taskCollectionHandler.ReadAllWeb)

+	kanbanBucketHandler := &handler.WebHandler{
+		EmptyStruct: func() handler.CObject {
+			return &models.Bucket{}
+		},
+	}
+	a.GET("/lists/:list/buckets", kanbanBucketHandler.ReadAllWeb)
+	a.PUT("/lists/:list/buckets", kanbanBucketHandler.CreateWeb)
+	a.POST("/lists/:list/buckets/:bucket", kanbanBucketHandler.UpdateWeb)
+	a.DELETE("/lists/:list/buckets/:bucket", kanbanBucketHandler.DeleteWeb)
+
 	taskHandler := &handler.WebHandler{
 		EmptyStruct: func() handler.CObject {
 			return &models.Task{}
@@ -989,7 +989,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "The list ID.",
-                        "name": "listID",
+                        "name": "list_id",
                        "in": "path",
                        "required": true
                    },
@@ -1026,13 +1026,13 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "The start date parameter to filter by. Expects a unix timestamp. If no end date, but a start date is specified, the end date is set to the current time.",
-                        "name": "startdate",
+                        "name": "start_date",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "The end date parameter to filter by. Expects a unix timestamp. If no start date, but an end date is specified, the start date is set to the current time.",
-                        "name": "enddate",
+                        "name": "end_date",
                        "in": "query"
                    }
                ],
@@ -1077,14 +1077,14 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "List ID",
-                        "name": "listID",
+                        "name": "list_id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "Team ID",
-                        "name": "teamID",
+                        "name": "team_id",
                        "in": "path",
                        "required": true
                    },
@@ -1144,14 +1144,14 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "List ID",
-                        "name": "listID",
+                        "name": "list_id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "Team ID",
-                        "name": "teamID",
+                        "name": "team_id",
                        "in": "path",
                        "required": true
                    }
@@ -1206,14 +1206,14 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "List ID",
-                        "name": "listID",
+                        "name": "list_id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "User ID",
-                        "name": "userID",
+                        "name": "user_id",
                        "in": "path",
                        "required": true
                    },
@@ -1273,14 +1273,14 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "List ID",
-                        "name": "listID",
+                        "name": "list_id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "User ID",
-                        "name": "userID",
+                        "name": "user_id",
                        "in": "path",
                        "required": true
                    }
@@ -2430,7 +2430,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "Team ID",
-                        "name": "teamID",
+                        "name": "team_id",
                        "in": "path",
                        "required": true
                    },
@@ -2497,7 +2497,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "team ID",
-                        "name": "teamID",
+                        "name": "team_id",
                        "in": "path",
                        "required": true
                    }
@@ -2559,7 +2559,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "User ID",
-                        "name": "userID",
+                        "name": "user_id",
                        "in": "path",
                        "required": true
                    },
@@ -2626,7 +2626,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "user ID",
-                        "name": "userID",
+                        "name": "user_id",
                        "in": "path",
                        "required": true
                    }
@@ -2796,13 +2796,13 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "The start date parameter to filter by. Expects a unix timestamp. If no end date, but a start date is specified, the end date is set to the current time.",
-                        "name": "startdate",
+                        "name": "start_date",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "The end date parameter to filter by. Expects a unix timestamp. If no start date, but an end date is specified, the start date is set to the current time.",
-                        "name": "enddate",
+                        "name": "end_date",
                        "in": "query"
                    }
                ],
@@ -3505,7 +3505,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "Assignee user ID",
-                        "name": "userID",
+                        "name": "user_id",
                        "in": "path",
                        "required": true
                    }
@@ -4208,7 +4208,7 @@ var doc = `{
                    {
                        "type": "integer",
                        "description": "User ID",
-                        "name": "userID",
+                        "name": "user_id",
                        "in": "path",
                        "required": true
                    }
@@ -4652,7 +4652,7 @@ var doc = `{
                    "description": "A unix timestamp when this task was created. You cannot change this value.",
                    "type": "integer"
                },
-                "createdBy": {
+                "created_by": {
                    "description": "The user who initially created the task.",
                    "type": "object",
                    "$ref": "#/definitions/user.User"
@@ -4665,19 +4665,19 @@ var doc = `{
                    "description": "Whether a task is done or not.",
                    "type": "boolean"
                },
-                "doneAt": {
+                "done_at": {
                    "description": "The unix timestamp when a task was marked as done.",
                    "type": "integer"
                },
-                "dueDate": {
+                "due_date": {
                    "description": "A unix timestamp when the task is due.",
                    "type": "integer"
                },
-                "endDate": {
+                "end_date": {
                    "description": "When this task ends.",
                    "type": "integer"
                },
-                "hexColor": {
+                "hex_color": {
                    "description": "The task color in hex",
                    "type": "string",
                    "maxLength": 6
@@ -4701,11 +4701,11 @@ var doc = `{
                        "$ref": "#/definitions/models.Label"
                    }
                },
-                "listID": {
+                "list_id": {
                    "description": "The list this task belongs to.",
                    "type": "integer"
                },
-                "percentDone": {
+                "percent_done": {
                    "description": "Determines how far a task is left from being done",
                    "type": "number"
                },
@@ -4718,18 +4718,18 @@ var doc = `{
                    "type": "object",
                    "$ref": "#/definitions/models.RelatedTaskMap"
                },
-                "reminderDates": {
+                "reminder_dates": {
                    "description": "An array of unix timestamps when the user wants to be reminded of the task.",
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                },
-                "repeatAfter": {
+                "repeat_after": {
                    "description": "An amount in seconds this task repeats itself. If this is set, when marking the task as done, it will mark itself as \"undone\" and then increase all remindes and the due date by its amount.",
                    "type": "integer"
                },
-                "startDate": {
+                "start_date": {
                    "description": "When this task starts.",
                    "type": "integer"
                },
@@ -4920,7 +4920,7 @@ var doc = `{
                    "description": "A unix timestamp when this relation was last updated. You cannot change this value.",
                    "type": "integer"
                },
-                "userID": {
+                "user_id": {
                    "description": "The username.",
                    "type": "string"
                }
@@ -4988,7 +4988,7 @@ var doc = `{
                    "description": "A unix timestamp when this relation was last updated. You cannot change this value.",
                    "type": "integer"
                },
-                "userID": {
+                "user_id": {
                    "description": "The username.",
                    "type": "string"
                }
@@ -5079,7 +5079,7 @@ var doc = `{
                            "description": "A unix timestamp when this task was created. You cannot change this value.",
                            "type": "integer"
                        },
-                        "createdBy": {
+                        "created_by": {
                            "description": "The user who initially created the task.",
                            "type": "object",
                            "$ref": "#/definitions/user.User"
@@ -5092,19 +5092,19 @@ var doc = `{
                            "description": "Whether a task is done or not.",
                            "type": "boolean"
                        },
-                        "doneAt": {
+                        "done_at": {
                            "description": "The unix timestamp when a task was marked as done.",
                            "type": "integer"
                        },
-                        "dueDate": {
+                        "due_date": {
                            "description": "A unix timestamp when the task is due.",
                            "type": "integer"
                        },
-                        "endDate": {
+                        "end_date": {
                            "description": "When this task ends.",
                            "type": "integer"
                        },
-                        "hexColor": {
+                        "hex_color": {
                            "description": "The task color in hex",
                            "type": "string",
                            "maxLength": 6
@@ -5128,11 +5128,11 @@ var doc = `{
                                "$ref": "#/definitions/models.Label"
                            }
                        },
-                        "listID": {
+                        "list_id": {
                            "description": "The list this task belongs to.",
                            "type": "integer"
                        },
-                        "percentDone": {
+                        "percent_done": {
                            "description": "Determines how far a task is left from being done",
                            "type": "number"
                        },
@@ -5145,18 +5145,18 @@ var doc = `{
                            "type": "object",
                            "$ref": "#/definitions/models.RelatedTaskMap"
                        },
-                        "reminderDates": {
+                        "reminder_dates": {
                            "description": "An array of unix timestamps when the user wants to be reminded of the task.",
                            "type": "array",
                            "items": {
                                "type": "integer"
                            }
                        },
-                        "repeatAfter": {
+                        "repeat_after": {
                            "description": "An amount in seconds this task repeats itself. If this is set, when marking the task as done, it will mark itself as \"undone\" and then increase all remindes and the due date by its amount.",
                            "type": "integer"
                        },
-                        "startDate": {
+                        "start_date": {
                            "description": "When this task starts.",
                            "type": "integer"
                        },
@@ -5195,7 +5195,7 @@ var doc = `{
                    "description": "A unix timestamp when this task was created. You cannot change this value.",
                    "type": "integer"
                },
-                "createdBy": {
+                "created_by": {
                    "description": "The user who initially created the task.",
                    "type": "object",
                    "$ref": "#/definitions/user.User"
@@ -5208,19 +5208,19 @@ var doc = `{
                    "description": "Whether a task is done or not.",
                    "type": "boolean"
                },
-                "doneAt": {
+                "done_at": {
                    "description": "The unix timestamp when a task was marked as done.",
                    "type": "integer"
                },
-                "dueDate": {
+                "due_date": {
                    "description": "A unix timestamp when the task is due.",
                    "type": "integer"
                },
-                "endDate": {
+                "end_date": {
                    "description": "When this task ends.",
                    "type": "integer"
                },
-                "hexColor": {
+                "hex_color": {
                    "description": "The task color in hex",
                    "type": "string",
                    "maxLength": 6
@@ -5244,11 +5244,11 @@ var doc = `{
                        "$ref": "#/definitions/models.Label"
                    }
                },
-                "listID": {
+                "list_id": {
                    "description": "The list this task belongs to.",
                    "type": "integer"
                },
-                "percentDone": {
+                "percent_done": {
                    "description": "Determines how far a task is left from being done",
                    "type": "number"
                },
@@ -5261,18 +5261,18 @@ var doc = `{
                    "type": "object",
                    "$ref": "#/definitions/models.RelatedTaskMap"
                },
-                "reminderDates": {
+                "reminder_dates": {
                    "description": "An array of unix timestamps when the user wants to be reminded of the task.",
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                },
-                "repeatAfter": {
+                "repeat_after": {
                    "description": "An amount in seconds this task repeats itself. If this is set, when marking the task as done, it will mark itself as \"undone\" and then increase all remindes and the due date by its amount.",
                    "type": "integer"
                },
-                "startDate": {
+                "start_date": {
                    "description": "When this task starts.",
                    "type": "integer"
                },
@@ -5354,7 +5354,7 @@ var doc = `{
                    "description": "A unix timestamp when this relation was created. You cannot change this value.",
                    "type": "integer"
                },
-                "createdBy": {
+                "created_by": {
                    "description": "The user who created this team.",
                    "type": "object",
                    "$ref": "#/definitions/user.User"
@@ -5403,7 +5403,7 @@ var doc = `{
                    "default": 0,
                    "maximum": 2
                },
-                "teamID": {
+                "team_id": {
                    "description": "The team id.",
                    "type": "integer"
                },
@@ -5451,7 +5451,7 @@ var doc = `{
                    "default": 0,
                    "maximum": 2
                },
-                "teamID": {
+                "team_id": {
                    "description": "The team id.",
                    "type": "integer"
                },
@@ -5504,7 +5504,7 @@ var doc = `{
                    "description": "A unix timestamp when this relation was created. You cannot change this value.",
                    "type": "integer"
                },
-                "createdBy": {
+                "created_by": {
                    "description": "The user who created this team.",
                    "type": "object",
                    "$ref": "#/definitions/user.User"
@@ -46,5 +46,6 @@ func InitDB() (err error) {
 func GetTables() []interface{} {
 	return []interface{}{
 		&User{},
+		&TOTP{},
 	}
 }
@@ -119,7 +119,7 @@ func (err ErrUserDoesNotExist) HTTPError() web.HTTPError {
 	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeUserDoesNotExist, Message: "The user does not exist."}
 }

-// ErrCouldNotGetUserID represents a "ErrCouldNotGetUserID" kind of error.
+// ErrCouldNotGetUserID represents a "ErrCouldNotGetuser_id" kind of error.
 type ErrCouldNotGetUserID struct{}

 // IsErrCouldNotGetUserID checks if an error is a ErrCouldNotGetUserID.
@@ -289,3 +289,80 @@ const ErrCodeEmptyOldPassword = 1014
 func (err ErrEmptyOldPassword) HTTPError() web.HTTPError {
 	return web.HTTPError{HTTPCode: http.StatusPreconditionFailed, Code: ErrCodeEmptyOldPassword, Message: "Please specify old password."}
 }
+
+// ErrTOTPAlreadyEnabled represents a "TOTPAlreadyEnabled" kind of error.
+type ErrTOTPAlreadyEnabled struct{}
+
+// IsErrTOTPAlreadyEnabled checks if an error is a ErrTOTPAlreadyEnabled.
+func IsErrTOTPAlreadyEnabled(err error) bool {
+	_, ok := err.(ErrTOTPAlreadyEnabled)
+	return ok
+}
+
+func (err ErrTOTPAlreadyEnabled) Error() string {
+	return fmt.Sprintf("Totp is already enabled for this user")
+}
+
+// ErrCodeTOTPAlreadyEnabled holds the unique world-error code of this error
+const ErrCodeTOTPAlreadyEnabled = 1015
+
+// HTTPError holds the http error description
+func (err ErrTOTPAlreadyEnabled) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusPreconditionFailed,
+		Code:     ErrCodeTOTPAlreadyEnabled,
+		Message:  "Totp is already enabled for this user, but not activated.",
+	}
+}
+
+// ErrTOTPNotEnabled represents a "TOTPNotEnabled" kind of error.
+type ErrTOTPNotEnabled struct{}
+
+// IsErrTOTPNotEnabled checks if an error is a ErrTOTPNotEnabled.
+func IsErrTOTPNotEnabled(err error) bool {
+	_, ok := err.(ErrTOTPNotEnabled)
+	return ok
+}
+
+func (err ErrTOTPNotEnabled) Error() string {
+	return fmt.Sprintf("Totp is not enabled for this user")
+}
+
+// ErrCodeTOTPNotEnabled holds the unique world-error code of this error
+const ErrCodeTOTPNotEnabled = 1016
+
+// HTTPError holds the http error description
+func (err ErrTOTPNotEnabled) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusPreconditionFailed,
+		Code:     ErrCodeTOTPNotEnabled,
+		Message:  "Totp is not enabled for this user.",
+	}
+}
+
+// ErrInvalidTOTPPasscode represents a "InvalidTOTPPasscode" kind of error.
+type ErrInvalidTOTPPasscode struct {
+	Passcode string
+}
+
+// IsErrInvalidTOTPPasscode checks if an error is a ErrInvalidTOTPPasscode.
+func IsErrInvalidTOTPPasscode(err error) bool {
+	_, ok := err.(ErrInvalidTOTPPasscode)
+	return ok
+}
+
+func (err ErrInvalidTOTPPasscode) Error() string {
+	return fmt.Sprintf("Invalid totp passcode")
+}
+
+// ErrCodeInvalidTOTPPasscode holds the unique world-error code of this error
+const ErrCodeInvalidTOTPPasscode = 1017
+
+// HTTPError holds the http error description
+func (err ErrInvalidTOTPPasscode) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusPreconditionFailed,
+		Code:     ErrCodeInvalidTOTPPasscode,
+		Message:  "Invalid totp passcode.",
+	}
+}
@@ -0,0 +1,140 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package user
+
+import (
+	"github.com/pquerna/otp"
+	"github.com/pquerna/otp/totp"
+	"image"
+)
+
+// TOTP holds a user's totp setting in the database.
+type TOTP struct {
+	ID     int64  `xorm:"int(11) autoincr not null unique pk" json:"-"`
+	UserID int64  `xorm:"int(11) not null" json:"-"`
+	Secret string `xorm:"text not null" json:"secret"`
+	// The totp entry will only be enabled after the user verified they have a working totp setup.
+	Enabled bool `xorm:"null" json:"enabled"`
+	// The totp url used to be able to enroll the user later
+	URL string `xorm:"text null" json:"url"`
+}
+
+// TableName holds the table name for totp secrets
+func (T *TOTP) TableName() string {
+	return "totp"
+}
+
+// TOTPPasscode is used to validate a users totp passcode
+type TOTPPasscode struct {
+	User     *User  `json:"-"`
+	Passcode string `json:"passcode"`
+}
+
+// TOTPEnabledForUser checks if totp is enabled for a user - not if it is activated, use GetTOTPForUser to check that.
+func TOTPEnabledForUser(user *User) (bool, error) {
+	return x.Where("user_id = ?", user.ID).Exist(&TOTP{})
+}
+
+// GetTOTPForUser returns the current state of totp settings for the user.
+func GetTOTPForUser(user *User) (t *TOTP, err error) {
+	t = &TOTP{}
+	exists, err := x.Where("user_id = ?", user.ID).Get(t)
+	if err != nil {
+		return
+	}
+	if !exists {
+		return nil, ErrTOTPNotEnabled{}
+	}
+
+	return
+}
+
+// EnrollTOTP creates a new TOTP entry for the user - it does not enable it yet.
+func EnrollTOTP(user *User) (t *TOTP, err error) {
+	isEnrolled, err := x.Where("user_id = ?", user.ID).Exist(&TOTP{})
+	if err != nil {
+		return
+	}
+	if isEnrolled {
+		return nil, ErrTOTPAlreadyEnabled{}
+	}
+
+	key, err := totp.Generate(totp.GenerateOpts{
+		Issuer:      "Vikunja",
+		AccountName: user.Username,
+	})
+	if err != nil {
+		return
+	}
+
+	t = &TOTP{
+		UserID:  user.ID,
+		Secret:  key.Secret(),
+		Enabled: false,
+		URL:     key.URL(),
+	}
+	_, err = x.Insert(t)
+	return
+}
+
+// EnableTOTP enables totp for a user. The provided passcode is used to verify the user has a working totp setup.
+func EnableTOTP(passcode *TOTPPasscode) (err error) {
+	t, err := ValidateTOTPPasscode(passcode)
+	if err != nil {
+		return
+	}
+
+	_, err = x.
+		Where("id = ?", t.ID).
+		Cols("enabled").
+		Update(&TOTP{Enabled: true})
+	return
+}
+
+// DisableTOTP removes all totp settings for a user.
+func DisableTOTP(user *User) (err error) {
+	_, err = x.Where("user_id = ?", user.ID).Delete(&TOTP{})
+	return
+}
+
+// ValidateTOTPPasscode validated totp codes of users.
+func ValidateTOTPPasscode(passcode *TOTPPasscode) (t *TOTP, err error) {
+	t, err = GetTOTPForUser(passcode.User)
+	if err != nil {
+		return
+	}
+
+	if !totp.Validate(passcode.Passcode, t.Secret) {
+		return nil, ErrInvalidTOTPPasscode{Passcode: passcode.Passcode}
+	}
+
+	return
+}
+
+// GetTOTPQrCodeForUser returns a qrcode for a user's totp setting
+func GetTOTPQrCodeForUser(user *User) (qrcode image.Image, err error) {
+	t, err := GetTOTPForUser(user)
+	if err != nil {
+		return
+	}
+
+	key, err := otp.NewKeyFromURL(t.URL)
+	if err != nil {
+		return
+	}
+	return key.Image(300, 300)
+}
@@ -0,0 +1,79 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package user
+
+import (
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/mail"
+	"code.vikunja.io/api/pkg/utils"
+)
+
+// EmailUpdate is the data structure to update a user's email address
+type EmailUpdate struct {
+	User *User `json:"-"`
+	// The new email address. Needs to be a valid email address.
+	NewEmail string `json:"new_email" valid:"email,length(0|250),required"`
+	// The password of the user for confirmation.
+	Password string `json:"password"`
+}
+
+// UpdateEmail lets a user update their email address
+func UpdateEmail(update *EmailUpdate) (err error) {
+
+	// Check the email is not already used
+	user := &User{}
+	has, err := x.Where("email = ?", update.NewEmail).Get(user)
+	if err != nil {
+		return
+	}
+
+	if has {
+		return ErrUserEmailExists{UserID: user.ID, Email: update.NewEmail}
+	}
+
+	// Set the user as unconfirmed and the new email address
+	update.User, err = GetUserWithEmail(&User{ID: update.User.ID})
+	if err != nil {
+		return
+	}
+
+	update.User.IsActive = false
+	update.User.Email = update.NewEmail
+	update.User.EmailConfirmToken = utils.MakeRandomString(64)
+	_, err = x.
+		Where("id = ?", update.User.ID).
+		Cols("email", "is_active", "email_confirm_token").
+		Update(update.User)
+	if err != nil {
+		return
+	}
+
+	// Send the confirmation mail
+	if !config.MailerEnabled.GetBool() {
+		return
+	}
+
+	// Send the user a mail with a link to confirm the mail
+	data := map[string]interface{}{
+		"User":  update.User,
+		"IsNew": false,
+	}
+
+	mail.SendMailWithTemplate(update.User.Email, update.User.Username+", please confirm your email address at Vikunja", "confirm-email", data)
+
+	return
+}
@@ -37,6 +37,8 @@ type Login struct {
 	Username string `json:"username"`
 	// The password for the user.
 	Password string `json:"password"`
+	// The totp passcode of a user. Only needs to be provided when enabled.
+	TOTPPasscode string `json:"totp_passcode"`
 }

 // User holds information about an user
@@ -160,7 +162,7 @@ func CheckUserCredentials(u *Login) (*User, error) {
 	user, err := GetUserByUsername(u.Username)
 	if err != nil {
 		// hashing the password takes a long time, so we hash something to not make it clear if the username was wrong
-		bcrypt.GenerateFromPassword([]byte(u.Username), 14)
+		_, _ = bcrypt.GenerateFromPassword([]byte(u.Username), 14)
 		return &User{}, ErrWrongUsernameOrPassword{}
 	}

@@ -170,17 +172,27 @@ func CheckUserCredentials(u *Login) (*User, error) {
 	}

 	// Check the users password
-	err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(u.Password))
+	err = CheckUserPassword(user, u.Password)
 	if err != nil {
-		if err == bcrypt.ErrMismatchedHashAndPassword {
-			return &User{}, ErrWrongUsernameOrPassword{}
-		}
 		return &User{}, err
 	}

 	return user, nil
 }

+// CheckUserPassword checks and verifies a user's password. The user object needs to contain the hashed password from the database.
+func CheckUserPassword(user *User, password string) error {
+	err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))
+	if err != nil {
+		if err == bcrypt.ErrMismatchedHashAndPassword {
+			return ErrWrongUsernameOrPassword{}
+		}
+		return err
+	}
+
+	return nil
+}
+
 // GetCurrentUser returns the current user based on its jwt token
 func GetCurrentUser(c echo.Context) (user *User, err error) {
 	jwtinf := c.Get("user").(*jwt.Token)
@@ -252,7 +264,7 @@ func CreateUser(user *User) (newUser *User, err error) {
 		// The new user should not be activated until it confirms his mail address
 		newUser.IsActive = false
 		// Generate a confirm token
-		newUser.EmailConfirmToken = utils.MakeRandomString(400)
+		newUser.EmailConfirmToken = utils.MakeRandomString(60)
 	}

 	// Insert it
@@ -277,7 +289,8 @@ func CreateUser(user *User) (newUser *User, err error) {

 	// Send the user a mail with a link to confirm the mail
 	data := map[string]interface{}{
-		"User": newUserOut,
+		"User":  newUserOut,
+		"IsNew": true,
 	}

 	mail.SendMailWithTemplate(user.Email, newUserOut.Username+" + Vikunja = <3", "confirm-email", data)
@@ -309,7 +322,7 @@ func UpdateUser(user *User) (updatedUser *User, err error) {
 	user.Password = theUser.Password // set the password to the one in the database to not accedently resetting it

 	// Update it
-	_, err = x.Id(user.ID).Update(user)
+	_, err = x.ID(user.ID).Update(user)
 	if err != nil {
 		return &User{}, err
 	}
@@ -344,7 +357,7 @@ func UpdateUserPassword(user *User, newPassword string) (err error) {
 	theUser.Password = hashed

 	// Update it
-	_, err = x.Id(user.ID).Update(theUser)
+	_, err = x.ID(user.ID).Update(theUser)
 	if err != nil {
 		return err
 	}
@@ -147,36 +147,36 @@ func TestGetUser(t *testing.T) {
 func TestCheckUserCredentials(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		_, err := CheckUserCredentials(&Login{"user1", "1234"})
+		_, err := CheckUserCredentials(&Login{Username: "user1", Password: "1234"})
 		assert.NoError(t, err)
 	})
 	t.Run("unverified email", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		_, err := CheckUserCredentials(&Login{"user5", "1234"})
+		_, err := CheckUserCredentials(&Login{Username: "user5", Password: "1234"})
 		assert.Error(t, err)
 		assert.True(t, IsErrEmailNotConfirmed(err))
 	})
 	t.Run("wrong password", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		_, err := CheckUserCredentials(&Login{"user1", "12345"})
+		_, err := CheckUserCredentials(&Login{Username: "user1", Password: "12345"})
 		assert.Error(t, err)
 		assert.True(t, IsErrWrongUsernameOrPassword(err))
 	})
 	t.Run("nonexistant user", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		_, err := CheckUserCredentials(&Login{"dfstestuu", "1234"})
+		_, err := CheckUserCredentials(&Login{Username: "dfstestuu", Password: "1234"})
 		assert.Error(t, err)
 		assert.True(t, IsErrWrongUsernameOrPassword(err))
 	})
 	t.Run("empty password", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		_, err := CheckUserCredentials(&Login{"user1", ""})
+		_, err := CheckUserCredentials(&Login{Username: "user1"})
 		assert.Error(t, err)
 		assert.True(t, IsErrNoUsernamePassword(err))
 	})
 	t.Run("empty username", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		_, err := CheckUserCredentials(&Login{"", "1234"})
+		_, err := CheckUserCredentials(&Login{Password: "1234"})
 		assert.Error(t, err)
 		assert.True(t, IsErrNoUsernamePassword(err))
 	})
@@ -17,14 +17,15 @@
 package utils

 import (
-	"crypto/md5"
+	"crypto/md5" // #nosec
 	"fmt"
 	"io"
 )

 // Md5String generates an md5 hash from a string
 func Md5String(in string) string {
+	// #nosec
 	h := md5.New()
-	io.WriteString(h, in)
+	_, _ = io.WriteString(h, in)
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
@@ -0,0 +1,15 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "labels": ["dependencies"],
+  "hostRules": [
+    {
+      "domainName": "github.com",
+      "encrypted": {
+        "token": "jaazUwAHa7jio3jq+UFvUeVR5/fOwt3BNAzEBlhixggSYqooJ7Paq7aJ77mNHYBEYwCWFuUG3+SlQ/uLeMU0AtGNdxk9VQ2mbcZIpSbIPR2YU4NoQ0HrhL0XyrN6eShqLBQYKz47o3gaHd3ltWhVeMCxGjfoAlPw+z0DhUQCfuFWUJu3lYYNIhY+CVeir6r0s0AablpxMJ1kpak6fCQ6BdaOW11rC/bQfW82fAp4Pkv877AolB+fVU7klMXfU6d2Ihk343jOEvltI5g1l5ss0vjiJnGZh4Sxump0ivoc73/P1TnywKTrvEdWs9df42IUAZozJwfqAIOUCtWbZifEXg=="
+      }
+    }
+  ],
+  "extends": [
+    "config:base"
+  ]
+}
@@ -1,10 +1,12 @@
 {{template "mail-header.tmpl" .}}
 <p>
    Hi {{.User.Username}},<br>
-    <br>
-    Welcome to Vikunja!
+    {{if .IsNew}}
+        <br>
+        Welcome to Vikunja!
+    {{end}}
    <br/>
-    To confirm you email address, click the link below:
+    To confirm your email address, click the link below:
 </p>
 <a href="{{.FrontendURL}}?userEmailConfirm={{.User.EmailConfirmToken}}" title="Confirm your email address" style="background: rgb(20, 131, 175); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; border: 1px solid rgb(16, 106, 140); border-bottom-width: 3px;  color: rgb(255, 255, 255); font-weight: 700; font-size: 13px; margin: 10px auto; padding: 5px 10px; text-decoration: none; text-align: center; text-rendering: optimizelegibility; text-transform: uppercase; display: block; width: 200px;">
    Confirm your email address
@@ -1,7 +1,9 @@
 Hi {{.User.Username}},

-Welcome to Vikunja!
+{{if .IsNew}}
+    Welcome to Vikunja!

-To confirm you email address, click the link below:
+{{end}}
+To confirm your email address, copy the link below and paste it in your browser:

 {{.FrontendURL}}?userEmailConfirm={{.User.EmailConfirmToken}}
@@ -0,0 +1,10 @@
+module gitea.com/xorm/xorm-redis-cache
+
+go 1.13
+
+require (
+	gitea.com/xorm/tests v0.7.0
+	github.com/garyburd/redigo v1.6.0
+	github.com/go-sql-driver/mysql v1.4.1
+	xorm.io/xorm v1.0.1
+)
@@ -0,0 +1,173 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
+cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
+gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
+gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
+gitea.com/xorm/tests v0.7.0 h1:pFcaxTGGAWw3rDuVfhBdyr+mX1uzdTtncyAKxkCQ/IE=
+gitea.com/xorm/tests v0.7.0/go.mod h1:ngmhQrSBgihBbOqw1hdReSQJAnTlbStYTn0vruUFwDc=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADGYw5LqMnHqSkyIELsHCGF6PkrmM31V8rF7o=
+github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
+github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
+github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-oci8 v0.0.0-20191108001511-cbd8d5bc1da0/go.mod h1:/M9VLO+lUPmxvoOK2PfWRZ8mTtB4q1Hy9lEGijv9Nr8=
+github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/shopspring/decimal v0.0.0-20191009025716-f1972eb1d1f5/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
+github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw=
+google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+xorm.io/builder v0.3.7 h1:2pETdKRK+2QG4mLX4oODHEhn5Z8j1m8sXa7jfu+/SZI=
+xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
+xorm.io/xorm v1.0.1 h1:/lITxpJtkZauNpdzj+L9CN/3OQxZaABrbergMcJu+Cw=
+xorm.io/xorm v1.0.1/go.mod h1:o4vnEsQ5V2F1/WK6w4XTwmiWJeGj82tqjAnHe44wVHY=
@@ -10,7 +10,8 @@ import (
 	"unsafe"

 	"github.com/garyburd/redigo/redis"
-	"xorm.io/core"
+	"xorm.io/xorm/caches"
+	"xorm.io/xorm/log"
 )

 const (
@@ -25,7 +26,7 @@ type RedisCacher struct {
 	pool              *redis.Pool
 	defaultExpiration time.Duration

-	Logger core.ILogger
+	Logger log.ContextLogger
 }

 // NewRedisCacher creates a Redis Cacher, host as IP endpoint, i.e., localhost:6379, provide empty string or nil if Redis server doesn't
@@ -38,7 +39,7 @@ type RedisCacher struct {
 //
 //     engine.MapCacher(&user, xormrediscache.NewRedisCacher("localhost:6379", "", xormrediscache.DEFAULT_EXPIRATION, engine.Logger))
 //
-func NewRedisCacher(host string, password string, defaultExpiration time.Duration, logger core.ILogger) *RedisCacher {
+func NewRedisCacher(host string, password string, defaultExpiration time.Duration, logger log.ContextLogger) *RedisCacher {
 	var pool = &redis.Pool{
 		MaxIdle:     5,
 		IdleTimeout: 240 * time.Second,
@@ -74,7 +75,7 @@ func NewRedisCacher(host string, password string, defaultExpiration time.Duratio
 }

 // MakeRedisCacher build a cacher based on redis.Pool
-func MakeRedisCacher(pool *redis.Pool, defaultExpiration time.Duration, logger core.ILogger) *RedisCacher {
+func MakeRedisCacher(pool *redis.Pool, defaultExpiration time.Duration, logger log.ContextLogger) *RedisCacher {
 	return &RedisCacher{pool: pool, defaultExpiration: defaultExpiration, Logger: logger}
 }

@@ -166,8 +167,8 @@ func (c *RedisCacher) delObject(key string) error {
 	conn := c.pool.Get()
 	defer conn.Close()
 	if !exists(conn, key) {
-		c.logErrf("delObject key:[%s] err: %v", key, core.ErrCacheMiss)
-		return core.ErrCacheMiss
+		c.logErrf("delObject key:[%s] err: %v", key, caches.ErrCacheMiss)
+		return caches.ErrCacheMiss
 	}
 	_, err := conn.Do("DEL", key)
 	return err
@@ -0,0 +1 @@
+.vscode/
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014 Joel
+Copyright (c) 2014 Florian Sundermann

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -0,0 +1,53 @@
+[![Join the chat at https://gitter.im/golang-barcode/Lobby](https://badges.gitter.im/golang-barcode/Lobby.svg)](https://gitter.im/golang-barcode/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+## Introduction ##
+
+This is a package for GO which can be used to create different types of barcodes.
+
+## Supported Barcode Types ##
+* 2 of 5
+* Aztec Code
+* Codabar
+* Code 128
+* Code 39
+* Code 93
+* Datamatrix
+* EAN 13
+* EAN 8
+* PDF 417
+* QR Code
+
+## Example ##
+
+This is a simple example on how to create a QR-Code and write it to a png-file
+```go
+package main
+
+import (
+	"image/png"
+	"os"
+
+	"github.com/boombuler/barcode"
+	"github.com/boombuler/barcode/qr"
+)
+
+func main() {
+	// Create the barcode
+	qrCode, _ := qr.Encode("Hello World", qr.M, qr.Auto)
+
+	// Scale the barcode to 200x200 pixels
+	qrCode, _ = barcode.Scale(qrCode, 200, 200)
+
+	// create the output file
+	file, _ := os.Create("qrcode.png")
+	defer file.Close()
+
+	// encode the barcode as png
+	png.Encode(file, qrCode)
+}
+```
+
+## Documentation ##
+See [GoDoc](https://godoc.org/github.com/boombuler/barcode)
+
+To create a barcode use the Encode function from one of the subpackages.
@@ -0,0 +1,42 @@
+package barcode
+
+import "image"
+
+const (
+	TypeAztec           = "Aztec"
+	TypeCodabar         = "Codabar"
+	TypeCode128         = "Code 128"
+	TypeCode39          = "Code 39"
+	TypeCode93          = "Code 93"
+	TypeDataMatrix      = "DataMatrix"
+	TypeEAN8            = "EAN 8"
+	TypeEAN13           = "EAN 13"
+	TypePDF             = "PDF417"
+	TypeQR              = "QR Code"
+	Type2of5            = "2 of 5"
+	Type2of5Interleaved = "2 of 5 (interleaved)"
+)
+
+// Contains some meta information about a barcode
+type Metadata struct {
+	// the name of the barcode kind
+	CodeKind string
+	// contains 1 for 1D barcodes or 2 for 2D barcodes
+	Dimensions byte
+}
+
+// a rendered and encoded barcode
+type Barcode interface {
+	image.Image
+	// returns some meta information about the barcode
+	Metadata() Metadata
+	// the data that was encoded in this barcode
+	Content() string
+}
+
+// Additional interface that some barcodes might implement to provide
+// the value of its checksum.
+type BarcodeIntCS interface {
+	Barcode
+	CheckSum() int
+}
@@ -0,0 +1 @@
+module github.com/boombuler/barcode
@@ -0,0 +1,66 @@
+package qr
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/boombuler/barcode/utils"
+)
+
+const charSet string = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:"
+
+func stringToAlphaIdx(content string) <-chan int {
+	result := make(chan int)
+	go func() {
+		for _, r := range content {
+			idx := strings.IndexRune(charSet, r)
+			result <- idx
+			if idx < 0 {
+				break
+			}
+		}
+		close(result)
+	}()
+
+	return result
+}
+
+func encodeAlphaNumeric(content string, ecl ErrorCorrectionLevel) (*utils.BitList, *versionInfo, error) {
+
+	contentLenIsOdd := len(content)%2 == 1
+	contentBitCount := (len(content) / 2) * 11
+	if contentLenIsOdd {
+		contentBitCount += 6
+	}
+	vi := findSmallestVersionInfo(ecl, alphaNumericMode, contentBitCount)
+	if vi == nil {
+		return nil, nil, errors.New("To much data to encode")
+	}
+
+	res := new(utils.BitList)
+	res.AddBits(int(alphaNumericMode), 4)
+	res.AddBits(len(content), vi.charCountBits(alphaNumericMode))
+
+	encoder := stringToAlphaIdx(content)
+
+	for idx := 0; idx < len(content)/2; idx++ {
+		c1 := <-encoder
+		c2 := <-encoder
+		if c1 < 0 || c2 < 0 {
+			return nil, nil, fmt.Errorf("\"%s\" can not be encoded as %s", content, AlphaNumeric)
+		}
+		res.AddBits(c1*45+c2, 11)
+	}
+	if contentLenIsOdd {
+		c := <-encoder
+		if c < 0 {
+			return nil, nil, fmt.Errorf("\"%s\" can not be encoded as %s", content, AlphaNumeric)
+		}
+		res.AddBits(c, 6)
+	}
+
+	addPaddingAndTerminator(res, vi)
+
+	return res, vi, nil
+}
@@ -0,0 +1,23 @@
+package qr
+
+import (
+	"fmt"
+
+	"github.com/boombuler/barcode/utils"
+)
+
+func encodeAuto(content string, ecl ErrorCorrectionLevel) (*utils.BitList, *versionInfo, error) {
+	bits, vi, _ := Numeric.getEncoder()(content, ecl)
+	if bits != nil && vi != nil {
+		return bits, vi, nil
+	}
+	bits, vi, _ = AlphaNumeric.getEncoder()(content, ecl)
+	if bits != nil && vi != nil {
+		return bits, vi, nil
+	}
+	bits, vi, _ = Unicode.getEncoder()(content, ecl)
+	if bits != nil && vi != nil {
+		return bits, vi, nil
+	}
+	return nil, nil, fmt.Errorf("No encoding found to encode \"%s\"", content)
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kolaente	91a3b7aba2	0.13 release preperations	2020-05-12 22:11:46 +02:00
kolaente	4137d4aed2	Fix creating new things with a link share auth	2020-05-12 15:51:48 +02:00
kolaente	cb095d70df	Add explanation to docs about cors	2020-05-12 11:10:07 +02:00
kolaente	e43e601912	Add traefik 2 example configuration	2020-05-11 22:02:15 +02:00
kolaente	55cd40d175	Fix team rights not updating for namespace rights	2020-05-11 18:39:30 +02:00
renovateandkonrad	55cd74efca	Update module go-testfixtures/testfixtures/v3 to v3.2.0 (#505 ) Update module go-testfixtures/testfixtures/v3 to v3.2.0 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/505	2020-05-11 10:10:15 +00:00
renovateandkonrad	a9d0079bf3	Update golang.org/x/crypto commit hash to 06a226f (#504 ) Update golang.org/x/crypto commit hash to 06a226f Reviewed-on: https://kolaente.dev/vikunja/api/pulls/504	2020-05-11 09:02:23 +00:00
konradandkolaente	8ac158cdb4	Task Filter Fixes (#495 ) Fix gocyclo Fix misspell Error codes docs Filter fixes Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/495	2020-05-09 15:48:56 +00:00
renovateandkonrad	def2362682	Update module spf13/viper to v1.7.0 (#494 ) Update module spf13/viper to v1.7.0 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/494	2020-05-09 13:44:17 +00:00
kolaente	18f6e31b54	Fix parsing array style comparators by query param	2020-05-09 15:08:58 +02:00
kolaente	7e1d0a81bf	Change totp secret datatype from varchar to text	2020-05-09 14:45:57 +02:00
renovateandkonrad	f30e405229	Update module lib/pq to v1.5.2 (#491 ) Update module lib/pq to v1.5.2 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/491	2020-05-08 13:23:26 +00:00
kolaente	563fe16bd4	Add checking and logging when trying to put a task into a nonexisting bucket	2020-05-07 10:20:10 +02:00
kolaente	a30a358b73	Update theme	2020-05-06 21:03:15 +02:00
kolaente	497499e221	Fix reference to reverse proxies in docs	2020-05-06 21:02:58 +02:00
kolaente	1fdc51078e	Add docs for changing frontend url	2020-05-06 20:44:48 +02:00
renovateandkonrad	60f343a926	Update module lib/pq to v1.5.1 (#485 ) Update module lib/pq to v1.5.1 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/485	2020-05-05 08:59:08 +00:00
konradandkolaente	fd3ccd6130	Fix total label count when getting all labels (#477 ) Fix total label count when getting all labels Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/477	2020-05-03 21:28:36 +00:00
kolaente	a97ce76f1f	Fix bucket ID being reset with no need to do so	2020-05-03 22:25:48 +02:00
kolaente	83cf6e191c	Fix not moving its bucket when moving a task between lists	2020-05-03 21:33:59 +02:00
kolaente	f0ac6e89be	Remove setting task bucket to 0	2020-05-03 21:24:28 +02:00
renovateandkonrad	23950c0602	Update module lib/pq to v1.5.0 (#476 ) Update module lib/pq to v1.5.0 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/476	2020-05-03 18:14:57 +00:00
renovateandkonrad	19a05a7c2c	Update golang.org/x/crypto commit hash to 4b2356b (#475 ) Update golang.org/x/crypto commit hash to 4b2356b Reviewed-on: https://kolaente.dev/vikunja/api/pulls/475	2020-05-01 10:06:00 +00:00
renovateandkonrad	299e856736	Update module prometheus/client_golang to v1.6.0 (#463 ) Update module prometheus/client_golang to v1.6.0 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/463	2020-04-28 18:50:58 +00:00
renovateandkonrad	6d95dc16c2	Update golang.org/x/crypto commit hash to 729f1e8 (#458 ) Update golang.org/x/crypto commit hash to 729f1e8 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/458	2020-04-27 18:56:31 +00:00
kolaente	fa28ddc2f7	Fix pagination count for task collection	2020-04-27 19:28:19 +02:00
kolaente	56dbb564ea	Fix link share creation & creating admin link shares without admin rights	2020-04-27 12:51:09 +02:00
renovateandkonrad	711124f5c0	Update module go-testfixtures/testfixtures/v3 to v3.1.2 (#457 ) Update module go-testfixtures/testfixtures/v3 to v3.1.2 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/457	2020-04-27 09:10:08 +00:00
kolaente	5606f987fa	Add creating a new first bucket when creating a new list	2020-04-26 15:51:59 +02:00
kolaente	f0cb3b5e36	Fix removing the last bucket	2020-04-26 00:57:47 +02:00
konradandkolaente	231dc3913f	Add real buckets for tasks which don't have one (#446 ) Add docs for error code Add moving new tasks into the default bucket when none was provided Add moving tasks in default bucket when deleting one Fix tests again Add test for removing a bucket Fix tests Prevent removing the last bucket Remove the empty pseudo bucket Add migration to create a new bucket for each list (and put all tasks in it Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/446	2020-04-25 20:32:02 +00:00
renovateandkonrad	2b1fc441e6	Update golang.org/x/crypto commit hash to 4bdfaf4 (#438 ) Update golang.org/x/crypto commit hash to 4bdfaf4 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/438	2020-04-24 15:23:22 +00:00
konrad kolaente renovate	e433289832	Task Position (#412 ) Fix misspell Fix sorting tasks with null values Fix sorting by priority for postgres Merge branch 'master' into feature/position Add community link Update golang.org/x/crypto commit hash to 44a6062 (#429) Update golang.org/x/crypto commit hash to 44a6062 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/429 Update module lib/pq to v1.4.0 (#428) Update module lib/pq to v1.4.0 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/428 Fix updating position Add ordering tasks in buckets by position Make task sort by string Merge branch 'master' into feature/position Update golang.org/x/crypto commit hash to 3c4aac8 (#419) Update golang.org/x/crypto commit hash to 3c4aac8 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/419 Merge branch 'master' into feature/position Fix moving tasks back into the empty (ID: 0) bucket Add adding a default position when creating new tasks Update golang.org/x/crypto commit hash to a76a400 (#411) Update golang.org/x/crypto commit hash to a76a400 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/411 Remove unused code Fix tests Add migration for position attribute Add position attribute Co-authored-by: kolaente <k@knt.li> Co-authored-by: renovate <renovatebot@kolaente.de> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/412	2020-04-24 15:23:03 +00:00
kolaente	86bdd1e386	Add community link	2020-04-24 13:00:29 +02:00
renovateandkonrad	4f1c0d99ea	Update golang.org/x/crypto commit hash to 44a6062 (#429 ) Update golang.org/x/crypto commit hash to 44a6062 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/429	2020-04-22 22:49:56 +00:00
renovateandkonrad	f0792cfb0b	Update module lib/pq to v1.4.0 (#428 ) Update module lib/pq to v1.4.0 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/428	2020-04-22 10:16:38 +00:00
renovateandkonrad	dece744685	Update golang.org/x/crypto commit hash to 3c4aac8 (#419 ) Update golang.org/x/crypto commit hash to 3c4aac8 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/419	2020-04-21 07:41:16 +00:00
kolaente	68ab6d2e75	Fix moving tasks back into the empty (ID: 0) bucket	2020-04-20 23:08:38 +02:00
renovateandkonrad	c69f0bf3cb	Update golang.org/x/crypto commit hash to a76a400 (#411 ) Update golang.org/x/crypto commit hash to a76a400 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/411	2020-04-20 20:58:32 +00:00
kolaente	59037e4eee	Fix moving tasks in buckets	2020-04-20 18:08:20 +02:00
kolaente	1bd8348be7	Add categories to error docs	2020-04-19 14:33:51 +02:00
konradandkolaente	ecdecdd94e	Kanban (#393 ) Fix tests Add error docs Add swagger docs for bucket endpoints Add integration tests Fix tests Fix err shadow Make sure a bucket and a task belong to the same list when adding or updating a task Add tests Add getting users of a bucket Fix log level when testing Fix lint Add migration for buckets Cleanup/Comments/Reorganization Add Kanban bucket handling Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/393	2020-04-19 07:27:28 +00:00
konradandkolaente	28ec44c91f	Add moving tasks between lists (#389 ) Fix misspell Add moving tasks between lists Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/389	2020-04-18 12:35:37 +00:00
kolaente	895d9613b5	Add endpoint to disable totp auth	2020-04-18 01:38:49 +02:00
kolaente	87d0c9088d	Add endpoint to get the current users totp status	2020-04-18 00:22:59 +02:00
konradandkolaente	24904585a2	Add 2fa for authentification (#383 ) Fix user tests Add swagger docs Fix lint Add totp check when logging in Make totp enrollment work Add migration for totp table go mod vendor Add routes for totp routes Add route handler for totp routes Add basic implementation to enroll a user in totp Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/383	2020-04-17 19:25:35 +00:00
kolaente	1dca8e96a7	Add changing email for users	2020-04-17 16:01:45 +02:00
kolaente	e1ab2095fa	Update docs theme	2020-04-16 23:31:36 +02:00
renovateandkonrad	12e18de8ad	Update golang.org/x/crypto commit hash to 0848c95 (#371 ) Update golang.org/x/crypto commit hash to 0848c95 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/371	2020-04-15 06:48:46 +00:00
kolaente	025b00247d	Fix replace statements for tail	2020-04-14 21:37:00 +02:00
kolaente	5832991c4d	Fix tests after renaming json fields to snake_case	2020-04-13 23:27:55 +02:00
kolaente	81990f3f80	Update xorm redis cacher to use the xorm logger instead of a special seperate one	2020-04-13 23:18:33 +02:00
kolaente	368cbdf979	Fix gosec in drone	2020-04-13 23:04:59 +02:00
kolaente	b8d7c97eb7	Add gosec static analysis	2020-04-13 22:30:09 +02:00
kolaente	fb8ac92abf	Change all json fields to snake_case	2020-04-12 22:48:46 +02:00
kolaente	0bfb3a4709	Add configuration options for log level	2020-04-12 22:32:21 +02:00
kolaente	9559a68416	Update module prometheus/client_golang to v1	2020-04-12 22:06:24 +02:00
konradandkolaente	d28f005552	Update xorm to v1 (#323 ) Fix limit for databases other than sqlite go mod tidy && go mod vendor Remove unneeded break statements Make everything work with the new xorm version Fix xorm logging Fix lint Fix redis init Fix using id field Fix database init for testing Change default database log level Add xorm logger Use const for postgres go mod tidy Merge branch 'master' into update/xorm # Conflicts: # go.mod # go.sum # vendor/modules.txt go mod vendor Fix loading fixtures for postgres Go mod vendor1 Update xorm to version 1 Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/323	2020-04-12 17:29:24 +00:00
renovateandkonrad	713560702b	Update module go-redis/redis to v7 (#309 ) Update module go-redis/redis to v7 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/309	2020-04-11 21:43:04 +00:00
konradandkolaente	0ba121fdfb	Task filters (#243 ) Fix not returning errors Fix integration tests Add more tests Make task filtering actually work Change tests Fix using filter conditions Fix test Remove unused fields Fix static check Remove start and end date fields on task collection Fix misspell add filter logic when getting tasks Add parsing filter query parameters into task filters Start adding support for filters Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/243	2020-04-11 14:20:33 +00:00
kolaente	0e2449482f	Fix dependencies	2020-04-09 23:06:57 +02:00
renovateandkonrad	8d1a3f4fd7	Update module spf13/viper to v1.6.3 (#291 ) Update module spf13/viper to v1.6.3 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/291	2020-04-09 20:29:11 +00:00
renovateandkonrad	1e0f2dde6a	Update module go-redis/redis to v6.15.7 (#290 ) Update module go-redis/redis to v6.15.7 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/290	2020-04-09 20:28:58 +00:00
renovateandkonrad	7abac07837	Update src.techknowlogick.com/xgo commit hash to bb0faa3 (#279 ) Update src.techknowlogick.com/xgo commit hash to bb0faa3 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/279	2020-04-09 04:36:03 +00:00
renovateandkonrad	15d718fb1a	Update module go-redis/redis to v7 (#277 ) Update module go-redis/redis to v7 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/277	2020-04-09 04:35:36 +00:00
renovateandkonrad	4ca3f714ea	Update module stretchr/testify to v1.5.1 (#274 ) Update module stretchr/testify to v1.5.1 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/274	2020-04-08 20:30:48 +00:00
renovateandkonrad	6d1b123a25	Update module spf13/cobra to v0.0.7 (#271 ) Update module spf13/cobra to v0.0.7 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/271	2020-04-08 19:44:10 +00:00
renovateandkonrad	13ebb98644	Update module spf13/viper to v1.6.2 (#272 ) Update module spf13/viper to v1.6.2 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/272	2020-04-08 18:43:35 +00:00
renovateandkonrad	dda558fe1c	Update module prometheus/client_golang to v0.9.4 (#245 ) Update module prometheus/client_golang to v0.9.4 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/245	2020-04-07 20:42:06 +00:00
renovateandkonrad	76f19db6e7	Update module labstack/echo/v4 to v4.1.16 (#241 ) Update module labstack/echo/v4 to v4.1.16 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/241	2020-04-07 18:59:53 +00:00
renovateandkonrad	f776b799b8	Update module olekukonko/tablewriter to v0.0.4 (#240 ) Update module olekukonko/tablewriter to v0.0.4 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/240	2020-04-07 16:58:27 +00:00
renovateandkonrad	746a443660	Update module imdario/mergo to v0.3.9 (#238 ) Update module imdario/mergo to v0.3.9 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/238	2020-04-07 16:05:10 +00:00
renovateandkonrad	026d3dc80d	Update module go-redis/redis to v6.15.7 (#234 ) Update module go-redis/redis to v6.15.7 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/234	2020-04-07 12:31:33 +00:00
renovateandkonrad	fd7dd47d5e	Update github.com/gordonklaus/ineffassign commit hash to 7953dde (#233 ) Update github.com/gordonklaus/ineffassign commit hash to 7953dde Reviewed-on: https://kolaente.dev/vikunja/api/pulls/233	2020-04-07 12:30:57 +00:00
renovateandkonrad	1e5a1b4892	Update github.com/shurcooL/httpfs commit hash to 8d4bc4b (#229 ) Update github.com/shurcooL/httpfs commit hash to 8d4bc4b Reviewed-on: https://kolaente.dev/vikunja/api/pulls/229	2020-04-07 08:39:00 +00:00
renovateandkonrad	c7f6748761	Update github.com/jgautheron/goconst commit hash to cda7ea3 (#228 ) Update github.com/jgautheron/goconst commit hash to cda7ea3 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/228	2020-04-07 08:38:00 +00:00
renovateandkonrad	7efa0069cb	Update golang.org/x/crypto commit hash to 056763e (#222 ) Update golang.org/x/crypto commit hash to 056763e Update golang.org/x/lint commit hash to 738671d (#223) Update golang.org/x/lint commit hash to 738671d Reviewed-on: https://kolaente.dev/vikunja/api/pulls/223 Update src.techknowlogick.com/xgo commit hash to c43d4c4 (#224) Update src.techknowlogick.com/xgo commit hash to c43d4c4 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/224 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/222	2020-04-07 08:37:20 +00:00
renovateandkonrad	424cf80e5c	Update golang.org/x/lint commit hash to 738671d (#223 ) Update golang.org/x/lint commit hash to 738671d Reviewed-on: https://kolaente.dev/vikunja/api/pulls/223	2020-04-07 07:29:05 +00:00
renovateandkonrad	1448d9de98	Update src.techknowlogick.com/xgo commit hash to c43d4c4 (#224 ) Update src.techknowlogick.com/xgo commit hash to c43d4c4 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/224	2020-04-07 07:28:48 +00:00
renovateandkonrad	cbf01e118a	Update github.com/c2h5oh/datasize commit hash to 28bbd47 (#212 ) Update github.com/c2h5oh/datasize commit hash to 28bbd47 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/212	2020-04-06 20:28:57 +00:00
renovateandkonrad	191942fcd1	Update alpine Docker tag to v3.11 (#160 ) Update alpine Docker tag to v3.11 Add github token for renovate (#164) Add github token for renovate Add github token for renovate Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/164 Update Renovate Configuration (#161) Add labels to renovate Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/161 Co-authored-by: konrad <konrad@kola-entertainments.de> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/160	2020-04-06 06:40:42 +00:00
konradandkolaente	d5c8f2541d	Add github token for renovate (#164 ) Add github token for renovate Add github token for renovate Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/164	2020-04-05 19:16:21 +00:00
konradandkolaente	6e9ad3d808	Update Renovate Configuration (#161 ) Add labels to renovate Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/161	2020-04-05 17:24:06 +00:00
renovateandkonrad	36fdff5b8b	Configure Renovate (#159 ) Add renovate.json Reviewed-on: https://kolaente.dev/vikunja/api/pulls/159	2020-04-05 15:11:27 +00:00