75 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friebetill	dd5a1fc2b8	Release version 1.0.6	2023-02-14 12:14:58 +08:00
friebetill	428d9b4682	Show all lines in diff ... This fixes a bug where the line count was not caculated correctly.	2023-02-14 12:13:55 +08:00
friebetill	add2cb75b4	Ignore whitespaces at the end of each line	2023-02-14 12:13:38 +08:00
friebetill	5c4f98d48b	Release version 1.0.5	2023-02-11 12:54:15 +08:00
friebetill	fad48c595c	Fix bug on deleting modal	2023-02-11 12:53:42 +08:00
friebetill	d8000bd0fc	Use correct name	2023-02-11 10:51:56 +08:00
friebetill	5065a53482	Streamline style of modals	2023-02-11 10:47:24 +08:00
Till Friebe	bfd7500d5b	Add link to how to adjust the colors	2023-02-10 12:33:11 +08:00
friebetill	fe165918ac	Release version 1.0.4	2023-02-10 12:26:10 +08:00
friebetill	c3b005e909	Fix bug when file 2 has multiple lines	2023-02-10 12:25:32 +08:00
friebetill	56b8e2d7b0	Refresh state when one of the files changes	2023-02-10 11:49:02 +08:00
friebetill	66b7f06154	Fix bug when replacing multiple lines	2023-02-10 11:37:52 +08:00
friebetill	de98f88a83	Make colors easily adjustable ... Add prefix to avoid mixing styles.	2023-02-10 11:21:53 +08:00
friebetill	68b0e9ec09	Release version 1.0.3	2023-02-07 16:13:29 +08:00
friebetill	a7e1afcb52	Add "Accept None" button	2023-02-07 16:09:41 +08:00
friebetill	f0b2c3a20b	Fix accept from one file	2023-02-07 16:02:23 +08:00
friebetill	37319e5c5d	Fix showing duplicate lines	2023-02-07 16:01:58 +08:00
friebetill	92b7a25737	Release version 1.0.2	2023-02-05 16:35:15 +08:00
friebetill	525b7bf9ae	Scroll automatically to differences	2023-02-05 16:34:39 +08:00
friebetill	b2a91f2670	Release version 1.0.1	2023-02-04 15:06:15 +08:00
friebetill	956aa853c1	Remove edge cases with trailing newlines	2023-02-04 15:05:24 +08:00
friebetill	2bd2e46aa2	Fix bug when accepting a merge	2023-02-04 15:05:03 +08:00
Till Friebe	60fd218e7b	Update README.md	2023-02-04 15:01:08 +08:00
Till Friebe	3a46aec5d0	Make it easier to read	2023-02-04 14:34:09 +08:00
Till Friebe	54ff7b8351	Simplify install instructions ... The reader probably knows how to install a Obsidian plugin	2023-02-04 14:32:45 +08:00
Till Friebe	eeaac83dfe	Add like notice	2023-02-04 14:10:19 +08:00
Till Friebe	d3015bc8c2	Improve instructions to install the plugin	2023-02-04 14:06:53 +08:00
Till Friebe	51a954db85	Add link to review PR	2023-02-04 13:56:36 +08:00
friebetill	04e550f015	Merge branch 'master' of github.com:friebetill/obsidian-file-diff	2023-02-04 13:35:15 +08:00
friebetill	142566e264	Release version 1.0.0	2023-02-04 13:34:56 +08:00
Till Friebe	f631a5db1c	Add a command overview	2023-02-04 13:30:30 +08:00
Till Friebe	06a270469f	Add support me note	2023-02-04 13:09:39 +08:00
Till Friebe	477e74d5af	Increase width of gif even more :)	2023-02-04 13:05:49 +08:00
Till Friebe	afab65eb9b	Increase width of gif	2023-02-04 13:04:39 +08:00
Till Friebe	12aaa70bcb	Remove WIP warning	2023-02-04 13:01:05 +08:00
Till Friebe	b1dfd5859c	Update demo gif	2023-02-04 13:00:40 +08:00
Till Friebe	ec0f52badd	Create FUNDING.yml	2023-02-04 12:43:41 +08:00
friebetill	8f1f33d52d	Handle empty lines at the end	2023-02-04 12:37:33 +08:00
friebetill	572cfbc790	Wait for the dispatch event to be handled	2023-02-04 09:51:46 +08:00
friebetill	0de8d41f77	Add warning modal for irreversible merge options ... In a later version this merge options could be make reversible	2023-02-04 09:43:11 +08:00
friebetill	c7426d1c3f	Sort files by last modification time	2023-02-03 20:00:08 +08:00
friebetill	1b298ed562	Reactivate deletion of file in delete file modal	2023-02-03 16:19:26 +08:00
friebetill	940f18e323	Remove autofocus shadow	2023-02-03 16:12:45 +08:00
friebetill	21d2ea70df	Counteract gravity pull	2023-02-03 16:12:35 +08:00
friebetill	3b8500a9bd	Show a delete modal when all merge conflicts are solved	2023-02-03 12:49:55 +08:00
friebetill	81754da8b9	Fix action button functionality	2023-02-03 00:15:24 +08:00
friebetill	4d0da6425b	Remove more linter warnings	2023-02-02 23:32:22 +08:00
friebetill	a01e69a66f	Follow guide https://bit.ly/3JIZGTE to improve Prettier + ESLint	2023-02-02 22:36:11 +08:00
friebetill	8d864b7d8f	Add command to make merge options explicit ... The merge options are destructive and should only be shown with a warning.	2023-02-02 20:48:52 +08:00
friebetill	457272aafa	Add format command	2023-02-02 18:25:25 +08:00