Commit graph

171 commits

Author SHA1 Message Date
Silvano Cerza
59f93d0aba Update name in README.md: 2025-03-09 18:57:02 +01:00
Silvano Cerza
3979e73708 Bump version to 1.0.1 2025-03-09 18:55:52 +01:00
Silvano Cerza
3f16253487 Rename plugin 2025-03-09 18:55:32 +01:00
Silvano Cerza
c21e728e3c Bump version to 1.0.0 2025-03-09 18:32:32 +01:00
Silvano Cerza
b20cece211 Update README.md 2025-03-09 18:29:55 +01:00
Silvano Cerza
12feb2c90f Add button to reset plugin settings and metadata 2025-03-09 18:13:59 +01:00
Silvano Cerza
42c15f4479 Move diff highlight for split view in editor theme 2025-03-09 17:20:18 +01:00
Silvano Cerza
928ad73696 Remove unnecessary import 2025-03-09 16:48:05 +01:00
Silvano Cerza
8732cdc1f0 Ditch old/new nomenclature in favour of remote/local to avoid confusion 2025-03-09 16:47:08 +01:00
Silvano Cerza
41642b5174 Add settings to choose diff view mode 2025-03-09 16:39:25 +01:00
Silvano Cerza
937e576bcc Restructure conflict view files and add some documentation 2025-03-09 16:22:36 +01:00
Silvano Cerza
8dfa1fe592 Fix type checking issue 2025-03-09 15:43:27 +01:00
Silvano Cerza
bb21bf6c2e Add conflict resolution in unified view 2025-03-09 15:10:03 +01:00
Silvano Cerza
68c3b4e6df Handle conflict resolution 2025-03-06 17:37:00 +01:00
Silvano Cerza
d8ebee26e8 Move line styles to theme 2025-03-06 17:12:10 +01:00
Silvano Cerza
46186d8d23 Styled some stuff 2025-03-06 17:07:11 +01:00
Silvano Cerza
d061ab4803 Handle some errors when user tries to open unified view while already open 2025-03-06 16:32:57 +01:00
Silvano Cerza
e8c95d2824 Handle merging ranges 2025-03-05 18:58:03 +01:00
Silvano Cerza
dc2962cec8 Avoid creating line mapping by creating ranges directly 2025-03-05 17:18:43 +01:00
Silvano Cerza
08d5d05331 Adjust some stuff 2025-03-05 16:46:11 +01:00
Silvano Cerza
132ffff36e Other stuff that works 2025-03-05 15:31:04 +01:00
Silvano Cerza
e2a536c945 Testing things, kinda works 2025-03-03 16:17:11 +01:00
Silvano Cerza
f5ed38f341 Restructure diff view to get ready for mobile view 2025-03-01 18:44:48 +01:00
Silvano Cerza
f72ce44504 Some renames in the conflict view 2025-03-01 18:24:06 +01:00
Silvano Cerza
b263e24941 Move conflict view in root view and adjust style 2025-03-01 18:11:43 +01:00
Silvano Cerza
0ca42124db Respect user settings on conflict 2025-03-01 17:13:43 +01:00
Silvano Cerza
7bca8262f4 Add settings to hide button to open conflicts view 2025-03-01 17:05:09 +01:00
Silvano Cerza
fc890b5d95 Purge onboarding flow
The onboarding flow and UI was a bit clunky and made it annoying to handle
failures, backtracking, errors made by the user, etc.
I decided to remove it completely and just show a notice to the user if
the plugin is not correctly configured, forcing them to take action.
Documentation is going to be key in teaching the user how to configure
the plugin properly.
2025-03-01 16:43:25 +01:00
Silvano Cerza
b9133477c0 Add custom error for GithubClient failures 2025-03-01 16:40:53 +01:00
Silvano Cerza
cd0f54a117 Fix logger not creating log file 2025-02-28 17:51:55 +01:00
Silvano Cerza
28abd1c1cc Clarifies what metadata sha is 2025-02-28 17:40:47 +01:00
Silvano Cerza
7d389f8e0c Handle corner case in conflict check 2025-02-28 17:39:06 +01:00
Silvano Cerza
e4409cb96e Properly decode emoji chars 2025-02-28 17:35:01 +01:00
Silvano Cerza
731920d5a1 Adjust conflict files tabs 2025-02-28 17:15:49 +01:00
Silvano Cerza
b8df463e66 Change filename occurances to filePath for consistency 2025-02-28 17:01:14 +01:00
Silvano Cerza
fa192eb197 Fix some issues with conflict resolution and syncing 2025-02-28 16:57:50 +01:00
Silvano Cerza
a1fea0cb95 Fix issue when rerendering conflict view 2025-02-25 18:50:12 +01:00
Silvano Cerza
2d8ee9f7bd Handle conflicts resolution end to end 2025-02-25 18:47:01 +01:00
Silvano Cerza
4745f91bdc Handle resolved conflicts 2025-02-23 17:30:57 +01:00
Silvano Cerza
cef814f702 Rework how conflicts are passed from SyncManager to ConflictsResolutionView 2025-02-23 16:43:22 +01:00
Silvano Cerza
1d4bc03aac Change GithubClient.getBlob use the sha instead of the URL 2025-02-23 16:42:56 +01:00
Silvano Cerza
d5eec99546 Fix highlight not getting updated when switching files 2025-02-22 17:48:51 +01:00
Silvano Cerza
72a7a7ed62 Rework some stuff 2025-02-22 17:43:45 +01:00
Silvano Cerza
19f797c77a Move FilesTabBar out of DiffView 2025-02-22 17:02:38 +01:00
Silvano Cerza
ca0049c383 Add key for tab elements 2025-02-22 16:50:17 +01:00
Silvano Cerza
c315378fb7 Add tab bar to select files with conflicts 2025-02-22 16:45:23 +01:00
Silvano Cerza
0721aa9d90 Fix annoying TS error 2025-02-22 11:12:55 +01:00
Silvano Cerza
55e1d21e93 Correctly clip the svg paths in the ActionsGutter 2025-02-22 11:08:18 +01:00
Silvano Cerza
88fa756ab9 Handle scrollable editors in the ActionsGutter 2025-02-22 11:03:16 +01:00
Silvano Cerza
64d0223aa0 Clamp diffs lines after merging 2025-02-21 18:40:17 +01:00