Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gsantner/markor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.12.4
Choose a base ref
...
head repository: gsantner/markor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.12.5
Choose a head ref
  • 8 commits
  • 60 files changed
  • 6 contributors

Commits on Jul 27, 2024

  1. Latest Android SDK/Gradle fixes, by @gsantner #2360 

    FAILURE: Build failed with an exception.

* What went wrong:
A problem was found with the configuration of task ':app:mapFlavorAtestDebugSourceSetPaths' (type 'MapSourceSetPathsTask').
  - Gradle detected a problem with the following location: '/mnt/store/Dokumente/aaDev/markor/app/src/main/res'.

    Reason: Task ':app:mapFlavorAtestDebugSourceSetPaths' uses this output of task ':copyRepoFiles' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed.
    @gsantner
    gsantner committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    9f4f6f5 View commit details
    Browse the repository at this point in the history

  2. New Color picker, bump Android minSdk from 16 to 18, closes #1428 (PR #… 

    …2203 by @halfdane)

* fixes #1428 by introducing a new color picker

* Update preferences_master.xml

* Restore preference

---------

Co-authored-by: Gregor Santner <gsantner@mailbox.org>
    @halfdane @gsantner
    halfdane and gsantner authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    19e0cdc View commit details
    Browse the repository at this point in the history

  3. Update translations(#2368)

    @gsantner
    gsantner authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    be4ab7f View commit details
    Browse the repository at this point in the history

  4. Various bugfixes (anchor/toc jumping #2364, snippets folder #2369, wi… 

    …kitext newfile #2362, virtual directory browser #2350) (PR #2370 by @hardhard1)

* Jump by a line identifier, not by id
* For all nodes, use eval
* Fixed bad key in snippet directory setting
* Fix virtual folders and wikitext underscores
    @harshad1
    harshad1 authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    57aaf0f View commit details
    Browse the repository at this point in the history

  5. Add history scroll restoration for scroll views (#2366) 

    * feat(font size dialog): add auto scroll for selection list
* feat(special key dialog): add auto restore scroll for key list
* feat(text actions bar): add auto restore scroll position
* refactor: remove unnecessary font size in range 1 to 4
* refactor: minor improvements to padding of Markdown in view mode
* refactor: minor improvements to padding of editor in edit mode
    @guanglinn
    guanglinn authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    80e813e View commit details
    Browse the repository at this point in the history

  6. Zim: Fix link/attachment format (PR #2147 by @mehw) 

    The format {{}} is for images, other types should use [[]] instead.

References:
- https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/c88cf3cb53896bf272e87704826b77e82eddb3ef/data/manual/Help/Wiki_Syntax.txt

Zim: Fix link/attachment path of file selection

While editing a wiki file, Zim adds links to a target residing inside
the Notebook (where notebook.zim file is found) resolving the path as
relative to the wiki file's attachment directory (same parent/name of
the wiki file, but without the extension).  If a link's target is not
a child of the Notebook, Zim adds the link as an absolute path.

Zim always prefixes relative paths, adding './' if a link's target is
a child of a wiki file's attachment directory.

/home/user/Notebook            # Notebook directory
      |    |
      |    `- notebook.zim     # marks the root of the Notebook
      |    |
      |    `- wiki-example     # wiki file's attachment directory
      |    |  |
      |    |  `- video.mkv     # wiki-example.txt file attachment
      |    |
      |    `- wiki-example.txt # wiki file written in wiki markup
      |
      `- README                # file outside the Notebook's root

In wiki-example.txt, [[./video.mkv]] would be a link to an attachment
residing in the 'wiki-example' directory.  Linking notebook.zim would
add [[../notebook.zim]], and [[/home/user/README]] would be a link to
a file outside the Notebook.

Zim: Fix attachment path of imported image

Zim uses the path of the .txt wiki file for attachments, but without
the extension, i.e. wiki-text.txt would be connected to wiki-text as
attachment directory.

Zim: Fix attachment path of edit image

Zim local paths are relative to the current wiki file's attachment
directory.  Properly resolve an attachment path to edit the image.

Zim: Fix file link conversion to markdown

Zim inserts file links relative to a wiki page's attachment directory,
if the target is a child of the Notebook.  Adapt the conversion of Zim
wiki pages to markdown, translating Zim file links accordingly.

Zim: Fallback to the current directory as root

Assume the current directory as top link if root cannot be determined.

Zim: Interpret image link attributes

Zim may insert attributes, as html tags, in an image link: id, width,
height, type, href.

{{./image.png?href=.%2Fvideo.mkv&id=anchor-name&width=50}}

In markdown [![name](image)](link) is close to the above, but without
the possibility to insert extra tags.

Zim: Enable audio recording/link button

Add logic to insert an audio recording/link.

Zim: Contribution for link/attachment fixes

Adding myself to CONTRIBUTORS.md

Co-authored-by: Gregor Santner <gsantner@mailbox.org>
    @mehw @gsantner
    mehw and gsantner authored Jul 27, 2024
    Configuration menu
    Copy the full SHA
    3a506e2 View commit details
    Browse the repository at this point in the history

  7. DocumentEditAndViewFragment: Fix all warnings, especially related to … 

    …null pointers
    @gsantner
    gsantner committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    bc73060 View commit details
    Browse the repository at this point in the history

  8. Markor v2.12.5 (154)

    @gsantner
    gsantner committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    a3cc214 View commit details
    Browse the repository at this point in the history
Loading