Merge master into stable

jendrikseipp · Nov 24, 2024 · 825b53d · 825b53d
2 parents e0f21d8 + dd5d913
commit 825b53d
Show file tree

Hide file tree

Showing 12 changed files with 261 additions and 279 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.36 (2024-11-24)
+* When searching for hashtags, show remainder of line after hashtag in search results (@jendrikseipp).
+* When searching for a hashtag, scroll to hashtag and highlight it (@jendrikseipp).
+* Add simple way for showing all entries: allow searching for whitespace (which should be part of all days) (@jendrikseipp).
+
 # 2.35 (2024-09-22)
 * Add option to auto-indent text in editor and activate it by default (#561, #562, Allen Benter, Varunjay Varma).
 

diff --git a/TODO.md b/TODO.md
@@ -11,7 +11,7 @@ status.
 - [ ] Use separate file for storing CSS to allow users to override styles more easily.
 - [ ] Make default CSS prettier.
 - [ ] Allow searching for days that contain *multiple* words or tags.
-- [ ] Add simple way to show all entries: allow searching for whitespace (i.e., don't strip whitespace from search string).
+- [X] Add simple way to show all entries: allow searching for whitespace (i.e., don't strip whitespace from search string).
 - [ ] Copy files and pictures into data subdirectory (#163, #469).
 - [ ] Require minimum width for calendar panel to avoid hiding it by accident.
 
@@ -25,11 +25,9 @@ status.
 
 ### Remove right-side tags panel (disabled by default)
 
-- [ ] When searching for a hashtag (see #498):
-  - if hashtag is the only text on the line: show text around hashtag.
-  - otherwise, show all content on the line except for the hashtag.
-- [ ] When searching for a hashtag, scroll to hashtag and highlight it.
-- [ ] Optional: enable right-side tags panel by default, if journal has right-side tags.
+- [X] When searching for a hashtag (see #498): if hashtag starts the line: show text after hashtag.
+- [X] When searching for a hashtag, scroll to hashtag and highlight it.
+- [-] Optional: enable right-side tags panel by default, if journal has right-side tags.
 - [ ] Transform existing right-side tags foo:bar to "#foo bar" when loading a journal.
 - [ ] Remove code for right-side tags panel.
 

diff --git a/data/rednotebook.appdata.xml b/data/rednotebook.appdata.xml
@@ -6,7 +6,9 @@
   <!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-project_license -->
   <project_license>GPL-2.0+</project_license>
   <name>RedNotebook</name>
-  <developer_name>Jendrik Seipp</developer_name>
+  <developer>
+    <name>Jendrik Seipp</name>
+  </developer>
   <update_contact>jendrikseipp_AT_gmail.com</update_contact>
   <summary>Graphical diary and journal</summary>
   <description>
@@ -37,12 +39,6 @@
       <image>https://rednotebook.app/screenshots/rednotebook-2.0-2.png</image>
     </screenshot>
   </screenshots>
-  <kudos>
-    <kudo>ModernToolkit</kudo>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>HighContrast</kudo>
-    <kudo>UserDocs</kudo>
-  </kudos>
 
   <!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-content_rating -->
   <content_rating type="oars-1.0" />
@@ -60,40 +56,6 @@
 
   <!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-releases -->
   <releases>
-    <release version="2.30" date="2023-08-10"/>
-    <release version="2.22" date="2021-04-25"/>
-    <release version="2.21" date="2020-12-07"/>
-    <release version="2.20" date="2020-08-03"/>
-    <release version="2.19" date="2020-05-04"/>
-    <release version="2.18" date="2020-02-29"/>
-    <release version="2.17" date="2020-02-23"/>
-    <release version="2.16" date="2020-01-23"/>
-    <release version="2.15" date="2019-12-04"/>
-    <release version="2.14" date="2019-11-17"/>
-    <release version="2.13" date="2019-11-07"/>
-    <release version="2.12" date="2019-11-02"/>
-    <release version="2.11.1" date="2019-04-07"/>
-    <release version="2.11" date="2019-03-26"/>
-    <release version="2.10" date="2019-03-24"/>
-    <release version="2.9.1" date="2019-03-20"/>
-    <release version="2.9" date="2019-03-17"/>
-    <release version="2.8.1" date="2019-03-17"/>
-    <release version="2.8" date="2018-11-15"/>
-    <release version="2.7.1" date="2018-11-13"/>
-    <release version="2.7" date="2018-11-06"/>
-    <release version="2.6.1" date="2018-08-21"/>
-    <release version="2.6" date="2018-08-20"/>
-    <release version="2.5" date="2018-06-08"/>
-    <release version="2.4" date="2018-03-07"/>
-    <release version="2.3" date="2017-09-25"/>
-    <release version="2.2" date="2017-09-08"/>
-    <release version="2.1.5" date="2017-08-09"/>
-    <release version="2.1.4" date="2017-08-08"/>
-    <release version="2.1.3" date="2017-08-06"/>
-    <release version="2.1.2" date="2017-08-03"/>
-    <release version="2.1.1" date="2017-08-02"/>
-    <release version="2.1" date="2017-07-29"/>
-    <release version="2.0" date="2017-05-19"/>
-    <!-- No need to add legacy releases that predate Python 3/GTK 3 port. -->
+    <release version="2.34" date="2024-09-16"/>
   </releases>
 </component>
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,12 @@
+rednotebook (2.36-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * When searching for hashtags, show remainder of line after hashtag in search results (@jendrikseipp).
+  * When searching for a hashtag, scroll to hashtag and highlight it (@jendrikseipp).
+  * Add simple way for showing all entries: allow searching for whitespace (which should be part of all days) (@jendrikseipp).
+
+ -- Jendrik Seipp <[email protected]>  Sun, 24 Nov 2024 19:15:29 +0100
+
 rednotebook (2.35-1) UNRELEASED; urgency=low
 
   * New upstream release