Commit graph

Select branches

Hide pull requests

master

#13

#20

#29

#29

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.2

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1.0

1.1.1

1.1.2

Mono Color

• e7589711f4
  Merge fa6a547202 into d566ded402 Armen Abrahamyan 2026-05-29 11:29:32 +0400
• fa6a547202 chore: minor change Demigoddd 2026-05-29 11:12:59 +0400
• fec7f0d7c0 feat: show notifications for "find sync conflicts and merge" Demigoddd 2026-05-29 11:06:06 +0400
• 78f84e3f6c feat: ability to select and copy text in a diff file Demigoddd 2026-05-29 11:03:29 +0400
• 52132d3353 feat: add filename to color block header Demigoddd 2026-05-29 11:02:22 +0400
• d566ded402 Release version 1.1.2 master 1.1.2 Till Friebe 2025-08-24 02:52:13 +0200
• 7bd7dd41c0
  Merge pull request #20 from TheJusticeMan/master Till Friebe 2025-08-24 01:41:54 +0200
• 185f95f30a I fixed the colors using the css mix function it'll now work on any theme. Justice Vellacott 2025-08-03 22:23:57 -0400
• 08e488d425 Release version 1.1.1 1.1.1 friebetill 2024-02-15 13:39:30 +0700
• ac4ea85fe0
  Merge pull request #13 from blainelewis1/patch-1 Till Friebe 2024-02-15 13:38:53 +0700
• 00567dea68
  fix bug where files have same name but differing paths Blaine Lewis 2024-02-08 10:25:22 -0500
• ad651d827e
  Add SyncThing link Till Friebe 2023-11-08 12:52:26 +0100
• dd31d3d371 Release version 1.1.0 1.1.0 friebetill 2023-11-08 02:39:49 +0100
• 5426feb1e1 Update locked packages friebetill 2023-11-08 02:39:03 +0100
• fa81f5dd62 Show word differences friebetill 2023-11-08 02:37:20 +0100
• 6cb64e9743 ISSUE-10: Fix diff for some files friebetill 2023-11-06 22:16:25 +0100
• e51806b299 11: Don't open result page after deletion friebetill 2023-11-06 21:16:52 +0100
• 5e3c691266
  Remove link to official plugin merge request Till Friebe 2023-05-03 16:37:27 +0200
• 87fc2b1bd8 Release version 1.0.13 1.0.13 friebetill 2023-04-30 11:35:27 +0200
• 1f0ee0187b Apply feedback from liamcain friebetill 2023-04-30 11:34:49 +0200
• 6ee9e381d4 Release version 1.0.12 1.0.12 friebetill 2023-03-27 00:06:02 +0800
• b1883dc436 Add 'Find sync conflicts and merge' command friebetill 2023-03-27 00:05:36 +0800
• 46bb29a745 Release version 1.0.11 1.0.11 friebetill 2023-03-26 18:55:08 +0800
• 6dbb36a16a Register view with registerView friebetill 2023-03-26 18:54:18 +0800
• 9df590f6b2 Release version 1.0.10 1.0.10 friebetill 2023-02-22 12:22:46 +0800
• 5f7503598a Update test friebetill 2023-02-22 12:16:26 +0800
• 7dfff85dd1 Add semicolons to prevent difficult to debug bugs friebetill 2023-02-22 12:14:02 +0800
• dee8138564 Remove file-diff prefix of commands friebetill 2023-02-22 11:58:13 +0800
• 705176ef6b Don't overwrite Obsidian CSS in a plugin friebetill 2023-02-22 11:56:48 +0800
• cd0be499d5 Use existing sleep function friebetill 2023-02-22 11:49:20 +0800
• e48981ab19 Release version 1.0.9 1.0.9 friebetill 2023-02-15 21:47:55 +0800
• e56eac7508 Improve UX by opening in active leaf friebetill 2023-02-15 21:45:30 +0800
• 81c8172a11 Improve UX by opening file 1 after deleting file 2 friebetill 2023-02-15 21:44:43 +0800
• fbd14edf23 Add motivation for plugin friebetill 2023-02-15 21:20:36 +0800
• b2dccfe804 Remove untested compatibility friebetill 2023-02-15 21:19:59 +0800
• 8306c36722 Improve variable name friebetill 2023-02-15 21:16:48 +0800
• 9e677a94b2 Use unused variable friebetill 2023-02-15 21:16:19 +0800
• b5ee9349e7 Release version 1.0.8 1.0.8 friebetill 2023-02-15 20:25:07 +0800
• a240ccfee7 Fix bug where lines where skipped friebetill 2023-02-15 20:24:22 +0800
• 8454d68b54 Fix old name of view type friebetill 2023-02-15 20:23:46 +0800
• 941c5f0c80 Remove edge cases by add trailing new line friebetill 2023-02-15 19:58:17 +0800
• e9c4a7aba6 Release version 1.0.7 1.0.7 friebetill 2023-02-14 12:31:54 +0800
• cc1ffac60b Reactivate ignoring line breaks at the end of the file friebetill 2023-02-14 12:31:15 +0800
• dd5a1fc2b8 Release version 1.0.6 1.0.6 friebetill 2023-02-14 12:14:58 +0800
• 428d9b4682 Show all lines in diff friebetill 2023-02-14 12:13:55 +0800
• add2cb75b4 Ignore whitespaces at the end of each line friebetill 2023-02-14 12:13:38 +0800
• 5c4f98d48b Release version 1.0.5 1.0.5 friebetill 2023-02-11 12:54:15 +0800
• fad48c595c Fix bug on deleting modal friebetill 2023-02-11 12:53:42 +0800
• d8000bd0fc Use correct name friebetill 2023-02-11 10:51:56 +0800
• 5065a53482 Streamline style of modals friebetill 2023-02-11 10:47:24 +0800
• bfd7500d5b
  Add link to how to adjust the colors Till Friebe 2023-02-10 12:33:11 +0800
• fe165918ac Release version 1.0.4 1.0.4 friebetill 2023-02-10 12:26:10 +0800
• c3b005e909 Fix bug when file 2 has multiple lines friebetill 2023-02-10 12:25:32 +0800
• 56b8e2d7b0 Refresh state when one of the files changes friebetill 2023-02-10 11:49:02 +0800
• 66b7f06154 Fix bug when replacing multiple lines friebetill 2023-02-10 11:37:52 +0800
• de98f88a83 Make colors easily adjustable friebetill 2023-02-10 11:21:53 +0800
• 68b0e9ec09 Release version 1.0.3 1.0.3 friebetill 2023-02-07 16:13:29 +0800
• a7e1afcb52 Add "Accept None" button friebetill 2023-02-07 16:09:41 +0800
• f0b2c3a20b Fix accept from one file friebetill 2023-02-07 16:02:23 +0800
• 37319e5c5d Fix showing duplicate lines friebetill 2023-02-07 16:01:58 +0800
• 92b7a25737 Release version 1.0.2 1.0.2 friebetill 2023-02-05 16:35:15 +0800
• 525b7bf9ae Scroll automatically to differences friebetill 2023-02-05 16:34:39 +0800
• b2a91f2670 Release version 1.0.1 1.0.1 friebetill 2023-02-04 15:06:15 +0800
• 956aa853c1 Remove edge cases with trailing newlines friebetill 2023-02-04 15:05:24 +0800
• 2bd2e46aa2 Fix bug when accepting a merge friebetill 2023-02-04 15:05:03 +0800
• 60fd218e7b
  Update README.md Till Friebe 2023-02-04 15:01:08 +0800
• 3a46aec5d0
  Make it easier to read Till Friebe 2023-02-04 14:34:09 +0800
• 54ff7b8351
  Simplify install instructions Till Friebe 2023-02-04 14:32:45 +0800
• eeaac83dfe
  Add like notice Till Friebe 2023-02-04 14:10:19 +0800
• d3015bc8c2
  Improve instructions to install the plugin Till Friebe 2023-02-04 14:06:53 +0800
• 51a954db85
  Add link to review PR Till Friebe 2023-02-04 13:56:36 +0800
• 04e550f015 Merge branch 'master' of github.com:friebetill/obsidian-file-diff 1.0.0 friebetill 2023-02-04 13:35:15 +0800
• 142566e264 Release version 1.0.0 friebetill 2023-02-04 13:34:56 +0800
• f631a5db1c
  Add a command overview Till Friebe 2023-02-04 13:30:30 +0800
• 06a270469f
  Add support me note Till Friebe 2023-02-04 13:09:39 +0800
• 477e74d5af
  Increase width of gif even more :) Till Friebe 2023-02-04 13:05:49 +0800
• afab65eb9b
  Increase width of gif Till Friebe 2023-02-04 13:04:39 +0800
• 12aaa70bcb
  Remove WIP warning Till Friebe 2023-02-04 13:01:05 +0800
• b1dfd5859c
  Update demo gif Till Friebe 2023-02-04 13:00:40 +0800
• ec0f52badd
  Create FUNDING.yml Till Friebe 2023-02-04 12:43:41 +0800
• 8f1f33d52d Handle empty lines at the end friebetill 2023-02-04 12:37:33 +0800
• 572cfbc790 Wait for the dispatch event to be handled friebetill 2023-02-04 09:51:46 +0800
• 0de8d41f77 Add warning modal for irreversible merge options friebetill 2023-02-04 09:43:11 +0800
• c7426d1c3f Sort files by last modification time friebetill 2023-02-03 20:00:08 +0800
• 1b298ed562 Reactivate deletion of file in delete file modal friebetill 2023-02-03 16:19:26 +0800
• 940f18e323 Remove autofocus shadow friebetill 2023-02-03 16:12:45 +0800
• 21d2ea70df Counteract gravity pull friebetill 2023-02-03 16:12:35 +0800
• 3b8500a9bd Show a delete modal when all merge conflicts are solved friebetill 2023-02-03 12:49:55 +0800
• 81754da8b9 Fix action button functionality friebetill 2023-02-03 00:14:03 +0800
• 4d0da6425b Remove more linter warnings friebetill 2023-02-02 23:32:22 +0800
• a01e69a66f Follow guide https://bit.ly/3JIZGTE to improve Prettier + ESLint friebetill 2023-02-02 22:36:11 +0800
• 8d864b7d8f Add command to make merge options explicit friebetill 2023-02-02 20:48:52 +0800
• 457272aafa Add format command friebetill 2023-02-02 18:25:25 +0800
• 02ab435744 Improve slighty code friebetill 2023-02-02 18:25:10 +0800
• e4fbea864f Simplify structure friebetill 2023-02-02 18:09:24 +0800
• 1f55799a1b Fix color in light mode friebetill 2023-02-02 11:50:23 +0800
• 1dcb0dbc38 Improve the README friebetill 2023-02-02 11:50:11 +0800
• a3e2ef35cc
  Tell about the merge options in the README Till Friebe 2023-02-02 11:22:14 +0800
• 14b4fe191b
  Add gif to better show functionality of the extension Till Friebe 2023-02-02 03:26:57 +0800
• e5c4c54e3e Display emptys lines correctly friebetill 2023-02-02 03:12:38 +0800