TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-05 22:55:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-0.17' into master

Browse Source
This commit is contained in:
Eike Kettner 2020-12-15 20:45:39 +01:00
commit 21cd778c37
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Changelog.md
View File

@ -1,5 +1,16 @@
# Changelog # Changelog
## v0.17.1
*Dec 15, 2020*
An unfortunate bug has made it into the previous release that makes
the webapp near unusable. Therefore this release, containing only the
fix for #508.
Sorry for the inconvenience!
## v0.17.0 ## v0.17.0
*Dec 14, 2020* *Dec 14, 2020*

5
modules/webapp/src/main/elm/App/Update.elm
View File

@ -178,8 +178,11 @@ updateWithSub msg model =
page = page =
Page.fromUrl url Page.fromUrl url
|> Maybe.withDefault (defaultPage model.flags) |> Maybe.withDefault (defaultPage model.flags)
( m, c, s ) =
initPage model page
in in
( model, Page.goto page, Sub.none ) ( { m | page = page }, c, s )
ToggleNavMenu -> ToggleNavMenu ->
( { model ( { model

12
nix/release.nix
View File

@ -1,18 +1,18 @@
rec { rec {
cfg = { cfg = {
v0_17_0 = rec { v0_17_1 = rec {
version = "0.17.0"; version = "0.17.1";
server = { server = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip"; url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
sha256 = "0bv7pzpwmdy2wnlvidl54gxfhdrns7n3pm7mcy3jyrqixjk360ic"; sha256 = "1mvzpf8cpc3kwlvvyib2gmbnls6dic7f7z525nvg7v2pm80yy1r5";
}; };
joex = { joex = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip"; url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
sha256 = "1wf29s9aabrkfln1ibna3g026iqghbj0640kh1fxk98s2dncxgm2"; sha256 = "0ymi2smwd5m0jqb6jrnld3xralyrq77h9r6m639wiwjdf4ka8s4a";
}; };
tools = { tools = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip"; url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
sha256 = "1sbvbxvdivrqllagrpfxcq284qrlj7kgg38qn6yzf7k7a6w2n78j"; sha256 = "1fncqw7aif1nv03cjckn401ykbm785hkiws00wbv2qmakymxl5y4";
}; };
}; };
v0_16_0 = rec { v0_16_0 = rec {
@ -272,7 +272,7 @@ rec {
}; };
}; };
pkg = v: import ./pkg.nix v; pkg = v: import ./pkg.nix v;
currentPkg = pkg cfg.v0_17_0; currentPkg = pkg cfg.v0_17_1;
module-joex = ./module-joex.nix; module-joex = ./module-joex.nix;
module-restserver = ./module-server.nix; module-restserver = ./module-server.nix;
module-consumedir = ./module-consumedir.nix; module-consumedir = ./module-consumedir.nix;