aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2023-07-26 01:12:17 +0200
committerpacien2023-07-26 01:12:17 +0200
commit8951f65d116b020bc95ba509c1ecf69b24bec1f0 (patch)
tree07ec167ecb1589b74fd93418196256edad9a2f0d
parent46cd42de44e402fbf33522d999fa2649729ffaa8 (diff)
parentf187b6f2653092d4034ec1561280d286f956c36e (diff)
downloadldgallery-master.tar.gz
Merge branch 'develop': release v2.3HEADv2.3masterdevelop
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--changelog.md9
-rw-r--r--compiler/ldgallery.1.md2
-rw-r--r--compiler/package.yaml2
-rw-r--r--flake.lock8
-rw-r--r--flake.nix7
-rw-r--r--ldgallery-quickstart.7.md2
-rw-r--r--mre/mre_only_subtraction_shows_others/berlin.md0
-rw-r--r--mre/mre_only_subtraction_shows_others/berlin.md.yaml2
-rw-r--r--mre/mre_only_subtraction_shows_others/gallery.yaml2
-rw-r--r--mre/mre_only_subtraction_shows_others/paris.md0
-rw-r--r--mre/mre_only_subtraction_shows_others/paris.md.yaml2
-rw-r--r--mre/mre_only_subtraction_shows_others/readme.md20
-rw-r--r--mre/mre_similar_tags_caps/gallery.yaml2
-rw-r--r--mre/mre_similar_tags_caps/readme.md49
-rw-r--r--mre/mre_similar_tags_caps/test.md0
-rw-r--r--mre/mre_similar_tags_caps/test.md.yaml2
-rw-r--r--mre/mre_similar_tags_caps/test_with_caps.md0
-rw-r--r--mre/mre_similar_tags_caps/test_with_caps.md.yaml2
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/baseball_bat.md0
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/baseball_bat.md.yaml2
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/cricket_bat.md0
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/cricket_bat.md.yaml2
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/gallery.yaml6
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/readme.md105
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/winged_bat.md0
-rw-r--r--mre/mre_tags_in_multiple_categories_not_correctly_filtered/winged_bat.md.yaml2
-rw-r--r--viewer/ldgallery-viewer.7.md2
-rw-r--r--viewer/package.json6
-rw-r--r--viewer/src/views/MainLayout.vue8
-rw-r--r--viewer/src/views/item_handlers/PictureViewer.vue2
-rw-r--r--viewer/src/views/item_handlers/PlainTextViewer.vue29
-rw-r--r--viewer/yarn.lock8
33 files changed, 241 insertions, 44 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7387fe7..0d31f8a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
9 - uses: actions/setup-node@v3 9 - uses: actions/setup-node@v3
10 with: 10 with:
11 # Latest version officially tested for Ld 11 # Latest version officially tested for Ld
12 node-version: 16.14.2 12 node-version: 18.16.0
13 - name: Lint and build Node.js Vue project 13 - name: Lint and build Node.js Vue project
14 working-directory: viewer 14 working-directory: viewer
15 run: | 15 run: |
diff --git a/changelog.md b/changelog.md
index ea2385e..3634566 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,15 +4,20 @@ This file lists notable changes that have been made to the application on each
4release. Releases are tracked and referred to using git tags. 4release. Releases are tracked and referred to using git tags.
5 5
6 6
7## [next release] 7## v2.3 - 2023-07-26
8 8
9- _None yet._ 9- New features:
10 - viewer: resizable viewport width for markdown and other views
11- Bug fixes:
12 - viewer: fix plain text view scroll with keyboard
13 - viewer: properly prevent drag'n'drop in picture viewer on Firefox
10 14
11 15
12## v2.2 - 2023-02-17 16## v2.2 - 2023-02-17
13- New features: 17- New features:
14 - viewer: add `CTRL-K` keyboard shortcut for quick search. 18 - viewer: add `CTRL-K` keyboard shortcut for quick search.
15 - viewer: added a button to download the current item. 19 - viewer: added a button to download the current item.
20 - viewer: add support for EPUB files
16- Bug fixes: 21- Bug fixes:
17 - compiler: fix detection of dimensions of EXIF-rotated pictures. 22 - compiler: fix detection of dimensions of EXIF-rotated pictures.
18 Rebuild the gallery with `--rebuild-all` to purge erroneous cached data. 23 Rebuild the gallery with `--rebuild-all` to purge erroneous cached data.
diff --git a/compiler/ldgallery.1.md b/compiler/ldgallery.1.md
index 908715f..75d4cf1 100644
--- a/compiler/ldgallery.1.md
+++ b/compiler/ldgallery.1.md
@@ -2,7 +2,7 @@
2pagetitle: Compiler user manual - ldgallery 2pagetitle: Compiler user manual - ldgallery
3title: LDGALLERY(1) ldgallery 3title: LDGALLERY(1) ldgallery
4author: Pacien TRAN-GIRARD, Guillaume FOUET 4author: Pacien TRAN-GIRARD, Guillaume FOUET
5date: 2023-02-17 (v2.2) 5date: 2023-07-26 (v2.3)
6--- 6---
7 7
8 8
diff --git a/compiler/package.yaml b/compiler/package.yaml
index d7c07e9..3d54d85 100644
--- a/compiler/package.yaml
+++ b/compiler/package.yaml
@@ -1,5 +1,5 @@
1name: ldgallery-compiler 1name: ldgallery-compiler
2version: 2.2 2version: 2.3
3homepage: https://ldgallery.pacien.org 3homepage: https://ldgallery.pacien.org
4github: "pacien/ldgallery" 4github: "pacien/ldgallery"
5license: AGPL-3.0-only 5license: AGPL-3.0-only
diff --git a/flake.lock b/flake.lock
index cef6a3f..cf612cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,16 +32,16 @@
32 }, 32 },
33 "nixpkgs": { 33 "nixpkgs": {
34 "locked": { 34 "locked": {
35 "lastModified": 1669853768, 35 "lastModified": 1686331006,
36 "narHash": "sha256-hIrUOoQ1/Da5kFKRfubQK9jK/DfJK3mkjiS8/ptuX6g=", 36 "narHash": "sha256-hElRDWUNG655aqF0awu+h5cmDN+I/dQcChRt2tGuGGU=",
37 "owner": "NixOS", 37 "owner": "NixOS",
38 "repo": "nixpkgs", 38 "repo": "nixpkgs",
39 "rev": "445f2646b373100600f3463f28bc7656e0e82384", 39 "rev": "85bcb95aa83be667e562e781e9d186c57a07d757",
40 "type": "github" 40 "type": "github"
41 }, 41 },
42 "original": { 42 "original": {
43 "owner": "NixOS", 43 "owner": "NixOS",
44 "ref": "445f264", 44 "ref": "nixos-23.05",
45 "repo": "nixpkgs", 45 "repo": "nixpkgs",
46 "type": "github" 46 "type": "github"
47 } 47 }
diff --git a/flake.nix b/flake.nix
index a5a4f46..bb31db2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,8 +20,7 @@
20 description = "A static web gallery generator with tags"; 20 description = "A static web gallery generator with tags";
21 21
22 inputs = { 22 inputs = {
23 # GHC 9.2: https://github.com/NixOS/nixpkgs/pull/202022 23 nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
24 nixpkgs.url = "github:NixOS/nixpkgs/445f264";
25 flake-utils.url = "github:numtide/flake-utils"; 24 flake-utils.url = "github:numtide/flake-utils";
26 flaky-utils.url = "git+https://cgit.pacien.net/libs/flaky-utils"; 25 flaky-utils.url = "git+https://cgit.pacien.net/libs/flaky-utils";
27 }; 26 };
@@ -29,13 +28,13 @@
29 outputs = { self, nixpkgs, flake-utils, flaky-utils }: 28 outputs = { self, nixpkgs, flake-utils, flaky-utils }:
30 flake-utils.lib.eachDefaultSystem (system: let 29 flake-utils.lib.eachDefaultSystem (system: let
31 pkgs = nixpkgs.legacyPackages.${system}; 30 pkgs = nixpkgs.legacyPackages.${system};
32 ldgalleryVersion = "2.2"; 31 ldgalleryVersion = "2.3";
33 devTools = with pkgs; [ 32 devTools = with pkgs; [
34 # generic 33 # generic
35 tmux 34 tmux
36 35
37 # viewer 36 # viewer
38 nodejs-16_x 37 nodejs-18_x
39 yarn 38 yarn
40 39
41 # compiler 40 # compiler
diff --git a/ldgallery-quickstart.7.md b/ldgallery-quickstart.7.md
index d6a6660..8b23373 100644
--- a/ldgallery-quickstart.7.md
+++ b/ldgallery-quickstart.7.md
@@ -2,7 +2,7 @@
2pagetitle: Quickstart guide - ldgallery 2pagetitle: Quickstart guide - ldgallery
3title: LDGALLERY-QUICKSTART(7) ldgallery 3title: LDGALLERY-QUICKSTART(7) ldgallery
4author: Pacien TRAN-GIRARD, Guillaume FOUET 4author: Pacien TRAN-GIRARD, Guillaume FOUET
5date: 2023-02-17 (v2.2) 5date: 2023-07-26 (v2.3)
6--- 6---
7 7
8# ABOUT 8# ABOUT
diff --git a/mre/mre_only_subtraction_shows_others/berlin.md b/mre/mre_only_subtraction_shows_others/berlin.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mre/mre_only_subtraction_shows_others/berlin.md
diff --git a/mre/mre_only_subtraction_shows_others/berlin.md.yaml b/mre/mre_only_subtraction_shows_others/berlin.md.yaml
new file mode 100644
index 0000000..628c1f4
--- /dev/null
+++ b/mre/mre_only_subtraction_shows_others/berlin.md.yaml
@@ -0,0 +1,2 @@
1tags:
2- germany
diff --git a/mre/mre_only_subtraction_shows_others/gallery.yaml b/mre/mre_only_subtraction_shows_others/gallery.yaml
new file mode 100644
index 0000000..8cbc96b
--- /dev/null
+++ b/mre/mre_only_subtraction_shows_others/gallery.yaml
@@ -0,0 +1,2 @@
1includedFiles:
2- '*.md'
diff --git a/mre/mre_only_subtraction_shows_others/paris.md b/mre/mre_only_subtraction_shows_others/paris.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mre/mre_only_subtraction_shows_others/paris.md
diff --git a/mre/mre_only_subtraction_shows_others/paris.md.yaml b/mre/mre_only_subtraction_shows_others/paris.md.yaml
new file mode 100644
index 0000000..f6bf8fd
--- /dev/null
+++ b/mre/mre_only_subtraction_shows_others/paris.md.yaml
@@ -0,0 +1,2 @@
1tags:
2- france
diff --git a/mre/mre_only_subtraction_shows_others/readme.md b/mre/mre_only_subtraction_shows_others/readme.md
new file mode 100644
index 0000000..0e00132
--- /dev/null
+++ b/mre/mre_only_subtraction_shows_others/readme.md
@@ -0,0 +1,20 @@
1# Minimal Reproducible Example
2
3A search query with only subtraction should show all the elements in the
4gallery minus the subtracted elements.
5
6## Reproduction steps
7
81. Search for `-france`.
9
10## Expected result
11
12`berlin.md` should appear in the results.
13
14## Actual result
15
16The search yields no result at all.
17
18## Version info
19
20Bug present in ldgallery v2.2.
diff --git a/mre/mre_similar_tags_caps/gallery.yaml b/mre/mre_similar_tags_caps/gallery.yaml
new file mode 100644
index 0000000..8cbc96b
--- /dev/null
+++ b/mre/mre_similar_tags_caps/gallery.yaml
@@ -0,0 +1,2 @@
1includedFiles:
2- '*.md'
diff --git a/mre/mre_similar_tags_caps/readme.md b/mre/mre_similar_tags_caps/readme.md
new file mode 100644
index 0000000..1a00e52
--- /dev/null
+++ b/mre/mre_similar_tags_caps/readme.md
@@ -0,0 +1,49 @@
1# Minimal Reproducible Example
2
3Having two or more similar tags which differ only in their casing results in
4the lowercase variant to be inserted instead of the other ones.
5
6## Reproduction steps
7