From 1a0cc7670e23c8f79cd7d1ae7f4cfbeeb7efd0da Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Sun, 2 Apr 2023 17:59:31 +0200 Subject: [PATCH 1/2] Prepare release of 1.3.92 --- .changes/1.3.91.md | 96 +++++++++++++++++++ .changes/1.3.92.md | 5 + .../unreleased/Added-20230401-194937.yaml | 3 - CHANGELOG.md | 6 ++ CMakeLists.txt | 2 +- src/linux/nanonote.metainfo.xml | 10 ++ 6 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 .changes/1.3.91.md create mode 100644 .changes/1.3.92.md delete mode 100644 .changes/unreleased/Added-20230401-194937.yaml diff --git a/.changes/1.3.91.md b/.changes/1.3.91.md new file mode 100644 index 0000000..0c93d6c --- /dev/null +++ b/.changes/1.3.91.md @@ -0,0 +1,96 @@ +## 1.3.91 - 2023-03-12 + +### Added + +- Add support for Markdown-style tasks in lists (Daniel Laidig) +- Add tips page (Aurelien Gateau) + +### Changed + +- Use Ctrl+G to open links and Ctrl+Enter for tasks (Daniel Laidig) + +### Fixed + +- Make sure standard actions like Copy or Paste are translated (Aurelien Gateau) +- Show keyboard shortcuts in context menus on macOS (Daniel Laidig) +- Do not change cursor to pointing-hand when not over a link (Aurelien Gateau) + +### Internals + +- CI: Bump Ubuntu to 20.04 and macOS to 11 (Aurelien Gateau) +- CI: Install clang-format from muttleyxd/clang-tools-static-binaries (Aurelien Gateau) +- Bump Qt to 5.15.2 on macOS and Windows (Aurelien Gateau) +- Update singleaplication to 3.3.4 (Aurelien Gateau) +- Update Catch2 to 3.3.0 (Aurelien Gateau) + +## 1.3.0 - 2020-10-03 + +### Changed + +- Update Spanish translation (Victorhck) + +### Fixed + +- Properly encode URL of the note path (Aurelien Gateau) +- Fix untranslated text in About tab on Linux (Aurelien Gateau) + +## 1.2.91 - 2020-09-28 + +### Added + +- You can now search inside your notes with the new search bar (Pavol Oresky) +- You can now move selected lines up and down with Alt+Shift+Up and Down (Aurelien Gateau) +- macOS dmg (Aurelien Gateau) +- Windows installer (Aurelien Gateau) + +### Changed + +- Reorganized context menu: added "Edit" and "View" submenus (Aurelien Gateau) + +## 1.2.0 - 2019-05-11 + +### Added + +- New German translation by Vinzenz Vietzke +- Allow changing the font size using Ctrl + mouse wheel (Daniel Laidig) +- Use the link color of the color theme instead of an hardcoded blue (Daniel Laidig) +- Added a way to reset the font size to the default value (Daniel Laidig) + +### Fixed + +- Added explanation of how to open URLs to the welcome text (Robert Barat) +- Allow '@' in URLs (Aurelien Gateau) +- Use QSaveFile for safer saving (Aurelien Gateau) + +## 1.1.0 - 2019-02-04 + +### Added + +- Pressing tab now indents the whole line when the cursor is at the beginning of a list item (Daniel Laidig). +- Pressing Enter on an empty list item now unindents, then removes the bullet (Aurelien Gateau). +- Added French and Spanish translations (Aurelien Gateau, Victorhck). + +### Fixed + +- Improved url detection: '+', '%' and '~' are now allowed in the middle of urls (Aurelien Gateau). +- Fixed wrong indentation behavior in upward selections (Aurelien Gateau). + +## 1.0.1 - 2019-01-12 + +### Added + +- Added unit-tests. +- Added Travis integration. +- Added rpm and deb packages generated using CPack. + +### Fixed + +- Fixed indentation and make it respect indentation columns. +- Made it possible to indent/unindent selected lines with Tab/Shift+Tab. +- Update welcome text to reflect current shortcuts. + +## 1.0.0 - 2018-12-30 + +### Added + +- First release diff --git a/.changes/1.3.92.md b/.changes/1.3.92.md new file mode 100644 index 0000000..711c963 --- /dev/null +++ b/.changes/1.3.92.md @@ -0,0 +1,5 @@ +## 1.3.92 - 2023-04-02 + +### Added + +- Nanonote now highlights Markdown-like headings. diff --git a/.changes/unreleased/Added-20230401-194937.yaml b/.changes/unreleased/Added-20230401-194937.yaml deleted file mode 100644 index b5debc6..0000000 --- a/.changes/unreleased/Added-20230401-194937.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: Nanonote now highlights Markdown-like headings. -time: 2023-04-01T19:49:37.792830265+02:00 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d5012c..32f5025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.3.92 - 2023-04-02 + +### Added + +- Nanonote now highlights Markdown-like headings. + ## 1.3.91 - 2023-03-12 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index cb78538..cd26b0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.17) project(nanonote - VERSION 1.3.91 + VERSION 1.3.92 DESCRIPTION "Minimalist note taking application for short-lived notes" HOMEPAGE_URL "https://github.com/agateau/nanonote" ) diff --git a/src/linux/nanonote.metainfo.xml b/src/linux/nanonote.metainfo.xml index 729a15f..174afa5 100644 --- a/src/linux/nanonote.metainfo.xml +++ b/src/linux/nanonote.metainfo.xml @@ -25,6 +25,16 @@ https://agateau.com/support com.agateau.nanonote.desktop + + +

+ Added +

+
    +
  • Nanonote now highlights Markdown-like headings.
    • +
+ +

From f231e8b472aa841e73d2d893b7f0e557da2fe95f Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Sun, 2 Apr 2023 18:01:43 +0200 Subject: [PATCH 2/2] Fix branch typo --- tasks.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tasks.py b/tasks.py index bc8a5ad..559688a 100644 --- a/tasks.py +++ b/tasks.py @@ -21,6 +21,8 @@ MAIN_BRANCH = "master" +PREP_RELEASE_BRANCH = "prep-release" + def get_version(): return os.environ["VERSION"] @@ -127,7 +129,7 @@ def create_release_branch(c): @task def create_release_branch2(c): version = get_version() - erun("git checkout -b prep-release") + erun(f"git checkout -b {PREP_RELEASE_BRANCH}") update_version(c) @@ -156,7 +158,7 @@ def commit_push(c): version = get_version() erun("git add .") erun(f'git commit -m "Prepare release of {version}"') - erun("git push -u origin prepare-release") + erun(f"git push -u origin {PREP_RELEASE_BRANCH}") create_pr(c)