Skip to content

Commit

Permalink
Merge Markor news and FAQ content all into markdown files in the Mark…
Browse files Browse the repository at this point in the history
…or repository
  • Loading branch information
gsantner committed Feb 11, 2023
1 parent efaa965 commit d76cadd
Show file tree
Hide file tree
Showing 251 changed files with 2,143 additions and 578 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body:
required: true
- label: Markor **is** up to date. See [Releases](https://github.com/gsantner/markor/tags) for the latest version. Updates are available from [F-Droid](https://f-droid.org/en/packages/net.gsantner.markor/) and GitHub.
required: true
- label: The bug is still present in the latest development version (git master). (Please [download](https://nightly.link/gsantner/markor/workflows/build-android-project/master) and try the test version of Markor, named **Mordor**. Don't worry; Markor and Mordor appear as completely separate applications. You can install both side-by-side, and Markor settings are not touched. In case the issue is resolved there, you don't need to create a bug report. The change will be part of the next Markor update.)
- label: The bug is still present in the latest development version (git master). (Please [download](https://nightly.link/gsantner/markor/workflows/build-android-project/master) and try the test version of Markor, named **Marder**. Don't worry; Markor and Marder appear as completely separate applications. You can install both side-by-side, and Markor settings are not touched. In case the issue is resolved there, you don't need to create a bug report. The change will be part of the next Markor update.)
required: true
- type: textarea
id: description
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body:
required: true
- label: Markor **is** up to date. See [Releases](https://github.com/gsantner/markor/tags) for the latest version. Updates are available from [F-Droid](https://f-droid.org/en/packages/net.gsantner.markor/) and GitHub.
required: true
- label: The wanted feature/enhancement is not present in the latest development version (git master). (Please [download](https://nightly.link/gsantner/markor/workflows/build-android-project/master) and try the test version of Markor, named **Mordor**. Don't worry; Markor and Mordor appear as completely separate applications. You can install both side-by-side, and Markor's settings are not touched. If your desired feature is present, you don't need to open this issue. The change will be part of the next Markor update.)
- label: The wanted feature/enhancement is not present in the latest development version (git master). (Please [download](https://nightly.link/gsantner/markor/workflows/build-android-project/master) and try the test version of Markor, named **Marder**. Don't worry; Markor and Marder appear as completely separate applications. You can install both side-by-side, and Markor's settings are not touched. If your desired feature is present, you don't need to open this issue. The change will be part of the next Markor update.)
required: true
- type: textarea
id: description
Expand Down
36 changes: 18 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Recent changes
- See [Discussions](https://github.com/gsantner/markor/discussions), [Issues](https://github.com/gsantner/markor/issues) and [Project website](https://gsantner.net/) to see what is going on.
- See [Discussions](https://github.com/gsantner/markor/discussions), [Issues](https://github.com/gsantner/markor/issues) and [Project news](https://github.com/gsantner/markor/blob/news/NEWS.md) to see what is going on.

### v2.10 [Blog Post](https://gsantner.net/blog/2022/07/16/markor-v2.10-custom-file-templates-share-into-remove-tracking-parameters.html?source=changelog)
### v2.10 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v210---custom-file-templates-share-into-remove-url-tracking-parameters))
- [Search: Keep in-files search dialog open, closes #1663, by @harshad1 (PR #1689)](https://github.com/gsantner/markor/pull/1689/files)
- [File management: Support UTF-8 with BOM, by @tifish (PR #1693)](https://github.com/gsantner/markor/pull/1693/files)
- [Editor: Increase performance on editables, more chunked operations, by @harshad1 (PR #1694)](https://github.com/gsantner/markor/pull/1694/files)
Expand All @@ -22,7 +22,7 @@
- [todo.txt filter search: Disable highlighting at completed tasks, by @harshad1 (PR #1754)](https://github.com/gsantner/markor/pull/1754/files)
- [Editor: Restore behaviour - don't overwrite newer files unless content modified, by @harshad1 (PR #1758)](https://github.com/gsantner/markor/pull/1758/files)

### v2.9 [Blog Post](https://gsantner.net/blog/2022/05/14/markor-v2.9-snippets-zimwiki-math-daynight-privacy-markdown-todotxt.html?source=changelog)
### v2.9 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v29---snippets-templates-graphs-charts-diagrams-yaml-front-matter-chemistry))
- Updates are officially only available from GitHub and F-Droid as of now
- New feature: Snippets
- Discussion forum & questions now on Markor GitHub Discussion
Expand All @@ -45,13 +45,13 @@
- Per-file settings - In addition to the global settings, many options are now also configurable on a file basis
- Markdown: Display YAML fron-matter contents (like article titles and publish date)

### v2.8 [Blog Post](https://gsantner.net/blog/2021/07/29/markor-v2.8-todotxt-dialog-contexts-projects-multi-selection.html?source=changelog)
### v2.8 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v28---multi-selection-for-todotxt-dialogs))
- Reference to GitHub discussion on More page, by @gsantner
- Add multi-selection to todo.txt dialogs, by @harshad1 @gsantner
- In-content search support for encrypted files, #1388 by @opensource21
- Remove alternative todo.txt naming (tags/categories), by @gsantner

### v2.7 [Blog Post](https://gsantner.net/blog/2021/06/26/markor-v2.7-search-in-content-backup-restore.html?source=changelog)
### v2.7 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v27---search-in-content-backup--restore-settings))
- Recursive file search with in-content search, #1337 by @adelobosko @harshad1 @gsantner
- Backup and restore settings, Format selection with radio buttons, #1244 by @harshad1 @gsantner
- Per-file font size, #1332 by @harshad1
Expand All @@ -75,7 +75,7 @@
- File Manager: Fix MB being displayed as GB at description (SI 1000 unit), #1352 by @gsantner
- File Manager: Duplicate file / allow copy into same folder, #1345 by @harshad1- Filemanager formatter: fix MB being displayed as GB (SI 1000 unit), #1352 by @gsantner

### v2.6 [Blog Post](https://gsantner.net/blog/2021/02/28/markor-v2.6-per-file-settings-zim-wiki-markdown-newline-paragraph.html?source=changelog)
### v2.6 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v26---zim-wiki-newline--new-paragraph-save-format))
- Markdown: Add settings option for newlines to start new paragraphs, #1260 by @gsantner
- Editor/Viewer: Remember last used file format, show current selected format, #1226 by @harshad1
- Editor/Viewer: Back arrow (top menu) finish activity, #1165 by @gsantner
Expand Down Expand Up @@ -106,7 +106,7 @@
- Improve encryption wording & usage, #1171 #1179 by @opensource21


### v2.5 [Blog Post](https://gsantner.net/blog/2020/12/20/markor-v2.5-zimwiki-searchreplace-githubactions-zettelkasten.html?source=changelog)
### v2.5 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v25---zim-wiki---search--replace---zettelkasten))
- Add Zim Wiki format and template #1098
- Add search & replace (simple|regex, replace once|all) #1112
- Add settings for current file to toolbar #1129
Expand All @@ -118,7 +118,7 @@
- Improve license dialog readability #1119
- General improvements, fixes and translations

### v2.4 [Blog Post](https://gsantner.net/blog/2020/10/30/markor-v2.4-todotxt-source-code-syntax-highlighting.html?source=changelog)
### v2.4 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v24---all-new-todotxt---programming-language-syntax-highlighting))
- Markdown: Correctly insert or remove list item on press enter at empty list item
- Remove title from todo.txt date dialog, better usable on small devices
- Fix search sometimes not working when chaging from view to edit mode
Expand All @@ -143,7 +143,7 @@
- Save last used folder to settings, use info for titlebar
- New File Dialog: Remember type selection

### v2.3 [Blog Post](https://gsantner.net/blog/2020/07/25/markor-v2.3-outline-action-custom-order-todotxt-markdown-plaintext.html?source=changelog)
### v2.3 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v23---table-of-contents-custom-action-order))
- Add action to Move current selected line(s)/cursor text up/down
- Add settings option for View-Mode link color
- Improve table of contents - add border, disable underline
Expand Down Expand Up @@ -175,7 +175,7 @@
- Markdown: Auto update ordered list numbers


### v2.2 [Blog Post](https://gsantner.net/blog/2019/10/27/markor-v2.2-markdown-presentations-voicenotes-audiorecord-tables.html?source=changelog)
### v2.2 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v22---presentations-voice-notes-markdown-table-editor))
- Added Presentations & Slides with Markdown
- Added audio recording dialog which allows to add voice to documents. Manual interaction required to start & stop voice recording. Voice recording permission required for this feature
- Added editor button to create Markdown tables
Expand All @@ -196,7 +196,7 @@
- Sepia editor theme


### v2.1 [Blog post](https://gsantner.net/blog/2019/09/04/markor-v2.1-search-dotfiles-pdf-export.html?source=inapp_changelog&project=markor) | [Code changes](https://github.com/gsantner/markor/compare/v2.0.0...v2.1.0)
### v2.1 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v21---key-value-highlighting-jsoniniyamlcsv-improved-performance))
- Improved editor, highlighting and overall performance
- New file dialog: Templates
- New format: KeyValue - highlighting for json, ini, csv, yaml, vcard, ics, toml and other simple key-value like syntax
Expand All @@ -222,7 +222,7 @@
- Fix folder title not visible sometimes
- Enable hex color highlighting for various prefix/postfixes (like colon, quote, ...)

### v2.0 [Blog post](https://gsantner.net/blog/2019/07/03/markor-v2.0-search-dotfiles-pdf-export.html?source=inapp_changelog&project=markor) | [Code changes](https://github.com/gsantner/markor/compare/v1.8.0...v2.0.0)
### v2.0 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v20---search-dotfiles-pdf-export))
- Recursive file & folder search
- Search button in editor, viewer and file browser
- Always export PDF and images with light theme and white background (improves printing)
Expand All @@ -239,7 +239,7 @@
- Add new line when archiving tasks


### v1.8 [Blog post](https://gsantner.net/blog/2019/05/06/markor-v1.8-file-navigation-favourites-markdown-editor.html?source=inapp_changelog&project=markor) | [Code changes](https://github.com/gsantner/markor/compare/v1.7.0...v1.8.0)
### v1.8 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v18---all-new-file-browser-favourites-and-faster-markdown-preview))
- Show app intro at first start
- All new file navigation
- Add favourite files
Expand All @@ -255,7 +255,7 @@
- Add word count to document info dialog


### v1.7 [Blog post](https://gsantner.net/blog/2019/03/11/markor-release-v1.7-custom-fonts-linkbox-markdown.html?source=inapp_changelog&project=markor)
### v1.7 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v17---custom-fonts-linkbox-with-markdown))
- Improved app color theme for better readability
- Load custom fonts from file
- Markor bundles 5 additional open fonts
Expand All @@ -273,7 +273,7 @@
- Option to set app start tab (Notebook / ToDo / QuickNote / LinkBox / More)


### v1.6 [Blog post](https://gsantner.net/blog/2018/12/30/markor-release-v1.6.html?source=inapp_changelog&project=markor)
### v1.6 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v16---datetime-dialog---jekyll-and-katex-improvements))
**New features:**
- TextAction: Insert date/time
- Add website title when sharing into Markor, if browser supports it
Expand All @@ -293,7 +293,7 @@
- New file dialog: Jekyll option on older devices
- Title not updated when swiping

### v1.5 [Blog post](https://gsantner.net/blog/2018/12/09/markor-release-v1.5.html?source=inapp_changelog&project=markor)
### v1.5 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v15---multiple-windows-markdown-tasks-theming))
**New features:**
- App-wide
- Settings option: Keep screen on
Expand Down Expand Up @@ -373,7 +373,7 @@
- App-wide
- Special files: When app launcher was used, create file if not exists

### v1.2 [Blog post](https://gsantner.net/blog/2018/09/18/markor-release-v1.2.html?source=inapp_changelog&project=markor)
### v1.2 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v12---markdown-with-katexmath---search-in-current-document))
**New features:**
- General
- Launchers to directly open LinkBox/ToDo/QuickNote (opt-in)
Expand All @@ -394,7 +394,7 @@
- Editor
- File saving

### v1.1 [Blog post](https://gsantner.net/blog/2018/09/09/markor-release-v1.1.html?source=inapp_changelog&project=markor)
### v1.1 ([Details](https://github.com/gsantner/markor/blob/news/NEWS.md#markor-v11---markdown-picture-import-from-gallery-and-camera))
**New features:**
- Text Module Actions
- Markdown Picture Dialog
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Where:
## LIST OF CONTRIBUTORS
-->
* **[Gregor Santner](https://gsantner.net)**<br/>~° Current developer of Markor
* **[Gregor Santner](https://github.com/gsantner)**<br/>~° Current developer of Markor
* **[Pedro Lafuente](https://github.com/plafue)**<br/>~° Main developer of writeily-pro
* **[Jeff Martin](http://jeffreymartin.ca)**<br/>~° Main developer of writeily
* **[davydsantos](https://github.com/davydsantos)**<br/>~° writeily contributor
Expand Down
7 changes: 2 additions & 5 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
Copyright 2017-2023 Gregor Santner
<https://gsantner.net/>
Copyright 2017-2023 Gregor Santner <gsantner AT mailbox DOT org>

Licensed under either of:
* Apache 2.0 (see below)
* Commercial (request via given contact details)
-------------------------------------------------------------------------

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit d76cadd

Please sign in to comment.