100 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friebetill	87fc2b1bd8	Release version 1.0.13	2023-04-30 11:35:27 +02:00
friebetill	1f0ee0187b	Apply feedback from liamcain	2023-04-30 11:34:49 +02:00
friebetill	6ee9e381d4	Release version 1.0.12	2023-03-27 00:06:02 +08:00
friebetill	b1883dc436	Add 'Find sync conflicts and merge' command	2023-03-27 00:05:36 +08:00
friebetill	46bb29a745	Release version 1.0.11	2023-03-26 18:55:08 +08:00
friebetill	6dbb36a16a	Register view with registerView ... If we don't register the view, as before, then the workspace won't be able to properly serialize it.	2023-03-26 18:54:18 +08:00
friebetill	9df590f6b2	Release version 1.0.10	2023-02-22 12:22:46 +08:00
friebetill	5f7503598a	Update test	2023-02-22 12:16:26 +08:00
friebetill	7dfff85dd1	Add semicolons to prevent difficult to debug bugs	2023-02-22 12:14:02 +08:00
friebetill	dee8138564	Remove file-diff prefix of commands ... Obsidian will automatically prefix the command id with the plugin id, we don't need to do it ourself.	2023-02-22 11:58:13 +08:00
friebetill	705176ef6b	Don't overwrite Obsidian CSS in a plugin	2023-02-22 11:56:48 +08:00
friebetill	cd0be499d5	Use existing sleep function	2023-02-22 11:49:20 +08:00
friebetill	e48981ab19	Release version 1.0.9	2023-02-15 21:47:55 +08:00
friebetill	e56eac7508	Improve UX by opening in active leaf	2023-02-15 21:45:30 +08:00
friebetill	81c8172a11	Improve UX by opening file 1 after deleting file 2	2023-02-15 21:44:43 +08:00
friebetill	fbd14edf23	Add motivation for plugin	2023-02-15 21:20:36 +08:00
friebetill	b2dccfe804	Remove untested compatibility	2023-02-15 21:19:59 +08:00
friebetill	8306c36722	Improve variable name	2023-02-15 21:16:48 +08:00
friebetill	9e677a94b2	Use unused variable	2023-02-15 21:16:19 +08:00
friebetill	b5ee9349e7	Release version 1.0.8	2023-02-15 20:25:07 +08:00
friebetill	a240ccfee7	Fix bug where lines where skipped	2023-02-15 20:24:22 +08:00
friebetill	8454d68b54	Fix old name of view type	2023-02-15 20:23:46 +08:00
friebetill	941c5f0c80	Remove edge cases by add trailing new line ... This solves some problems for my test cases, but not sure if this is bulletproof.	2023-02-15 19:58:17 +08:00
friebetill	e9c4a7aba6	Release version 1.0.7	2023-02-14 12:31:54 +08:00
friebetill	cc1ffac60b	Reactivate ignoring line breaks at the end of the file	2023-02-14 12:31:15 +08:00
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