Merge branch 'master' into current-docs

This commit is contained in:
eikek 2021-05-31 13:58:22 +02:00
commit 3da95c4300
6 changed files with 21 additions and 6 deletions
Changelog.md
modules
joexapi/src/main/resources
restapi/src/main/resources
nix
version.sbt
website/site

@ -2,7 +2,7 @@
## v0.23.0
*Soon*
*May 29, 2021*
This release enables deleting multiple files at once of an item. It
also changes how user settings are stored. Additionally several bugs

@ -2,7 +2,7 @@ openapi: 3.0.0
info:
title: Docspell JOEX
version: 0.23.0
version: 0.24.0-SNAPSHOT
servers:
- url: /api/v1

@ -2,7 +2,7 @@ openapi: 3.0.0
info:
title: Docspell
version: 0.23.0
version: 0.24.0-SNAPSHOT
description: |
This is the remote API to Docspell, a personal document organizer.

@ -1,5 +1,20 @@
rec {
cfg = {
v0_23_0 = rec {
version = "0.23.0";
server = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
sha256 = "1sd4r6358kf3nb0x1ypw77a1p17984kwdbjijzkyvvw2757w7rig";
};
joex = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
sha256 = "0n7ig7xk2in655iqs92ylvpchgysbxlfq3vwz296ch8pxp48p49n";
};
tools = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
sha256 = "1jqiva0p929kbcy6k6pxzlgmxfjrcbvqpwhdg0wyxd35k97gww6l";
};
};
v0_22_0 = rec {
version = "0.22.0";
server = {
@ -347,7 +362,7 @@ rec {
};
};
pkg = v: import ./pkg.nix v;
currentPkg = pkg cfg.v0_22_0;
currentPkg = pkg cfg.v0_23_0;
module-joex = ./module-joex.nix;
module-restserver = ./module-server.nix;
module-consumedir = ./module-consumedir.nix;

@ -1 +1 @@
ThisBuild / version := "0.23.0"
ThisBuild / version := "0.24.0-SNAPSHOT"

@ -26,4 +26,4 @@ skip_anchor_prefixes = [
[extra]
# Put all your custom variables here
version = "0.23.0"
version = "0.24.0-SNAPSHOT"