Commit graph

136 commits

Author SHA1 Message Date
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
Silvano Cerza
bca72c4938 Fix corner case when clamping lines of modify DiffChunks 2025-02-21 18:12:27 +01:00
Silvano Cerza
6c369232e3 Fix action buttons spanning multiple lines not being shown 2025-02-20 19:20:15 +01:00
Silvano Cerza
aae730f0f1 Handle line numbers greater than document lines number 2025-02-20 19:16:01 +01:00
Silvano Cerza
3a7454b86f Better handling diff 2025-02-20 19:10:54 +01:00
Silvano Cerza
f49adaccc8 Remove commented out code 2025-02-20 19:05:18 +01:00
Silvano Cerza
2dcbd11ed0 Fix buttons positioning in case the ribbons spans multiple lines 2025-02-20 19:04:47 +01:00
Silvano Cerza
fd100345a3 Use better diff algorithm 2025-02-20 18:41:16 +01:00
Silvano Cerza
a0f2439b1f Handle action gutter buttons click 2025-02-20 18:36:38 +01:00
Silvano Cerza
fd7cffffab Fix editor height 2025-02-20 18:15:55 +01:00
Silvano Cerza
b5ebe4a638 Move editor content change callback 2025-02-20 18:09:21 +01:00
Silvano Cerza
165f2d277d Fix some sizing stuff 2025-02-20 18:08:46 +01:00
Silvano Cerza
c8908eb7c3 Remove commented out code 2025-02-20 17:57:33 +01:00
Silvano Cerza
9c374f19f2 Restyle actions ribbons in gutter 2025-02-20 17:55:11 +01:00
Silvano Cerza
e024c2c4df Add buttons in actions gutter 2025-02-20 17:54:28 +01:00
Silvano Cerza
8b1d04d110 Handle grid sizes in a nicer way 2025-02-20 14:25:54 +01:00
Silvano Cerza
6ff48b9517 Go with react-codemirror lib 2025-02-20 10:30:22 +01:00
Silvano Cerza
d1b980f031 Throw away dead code 2025-02-19 15:43:36 +01:00
Silvano Cerza
5fd4c94566 Refactor to be more concise 2025-02-19 11:49:09 +01:00
Silvano Cerza
63f9afe738 Bad attempt at diff apply 2025-02-18 11:13:13 +01:00
Silvano Cerza
5edb8ca742 Handle resize 2025-02-13 17:54:59 +01:00
Silvano Cerza
9f62324c2a More progress 2025-02-13 17:23:43 +01:00
Silvano Cerza
6d7c0c8772 Some styling 2025-02-13 15:13:47 +01:00
Silvano Cerza
f409216320 First rought implementation of conflicts resolution view 2025-02-13 14:43:46 +01:00
Silvano Cerza
c0792c79e7 Show notice on sync start, success and failure 2025-02-12 18:34:55 +01:00
Silvano Cerza
3f06dd4f90 Correctly run sync interval as async 2025-02-12 15:25:58 +01:00
Silvano Cerza
6888899e17 Set firstStart to true on mobile 2025-01-27 11:43:08 +01:00
Silvano Cerza
03a3bde3bb Bump version to 0.0.6 2025-01-23 18:19:02 +01:00
Silvano Cerza
98b931ead5 Change GithubClient to use settings directly 2025-01-23 18:18:31 +01:00
Silvano Cerza
8843ae0d17 Bump version to 0.0.5 2025-01-23 18:05:28 +01:00
Silvano Cerza
f64ff13b88 Use mobile compatible util function to convert from base64 string 2025-01-23 18:05:03 +01:00
Silvano Cerza
acefd43f60 Bump version to 0.0.4 2025-01-23 17:35:00 +01:00
Silvano Cerza
5446560b86 Check if syncing is in progress before starting 2025-01-23 17:34:27 +01:00
Silvano Cerza
476b17ba05 Move manifest file name definition 2025-01-23 17:25:44 +01:00
Silvano Cerza
0ba9420b3a Change conflict setting default value and disable selection dropdown 2025-01-23 17:19:16 +01:00
Silvano Cerza
fa995a392e Update README.md with some info about logging 2025-01-23 16:20:00 +01:00