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: capi/trilium
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.63.6
Choose a base ref
...
head repository: capi/trilium
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 9 commits
  • 12 files changed
  • 2 contributors

Commits on May 18, 2024

  1. Copy the full SHA
    d142d32 View commit details
  2. Copy the full SHA
    f0d30db View commit details

Commits on May 30, 2024

  1. Merge pull request zadam#4772 from gigamonster256/macos-arm64

    Support compiling native MacOS arm64 (Apple Silicon) builds
    zadam authored May 30, 2024
    Copy the full SHA
    8ebebec View commit details
  2. verify that the uploaded modified file is temporary

    (cherry picked from commit a2711cf)
    zadam committed May 30, 2024
    Copy the full SHA
    a88bf68 View commit details
  3. remove warning about the relation map - trilium is sunsetting anyway,…

    … there's no point now in deprecating this feature, fixes zadam#4779
    zadam committed May 30, 2024
    Copy the full SHA
    305d28b View commit details
  4. error handling

    zadam committed May 30, 2024
    Copy the full SHA
    b6c7e2e View commit details
  5. lock file

    zadam committed May 30, 2024
    Copy the full SHA
    88c4171 View commit details
  6. Merge branch 'refs/heads/stable'

    # Conflicts:
    #	package-lock.json
    zadam committed May 30, 2024
    Copy the full SHA
    a64a0e5 View commit details
  7. Copy the full SHA
    82a437f View commit details
Loading