Commit Graph

7505 Commits

Author SHA1 Message Date
Pavel Laptev
1421fc0020
UI: commit card update (#4043)
* UI: commit card update

- move "open" commit button
- do not display details if it's empty
- styles tweaking

* "edit message" modal width update

* Styles: fix for the "merge commits" disclaimer

* copy update

* commit card subtitle update

* Merge conflict resolve

* new "Insert empty commit" button

* add `extendWithClass` to draggable + drag handle

- In order to modify the draggable clone with an extended class if needed

* typo fix

* icon `undifined` class fix

* added drag handlers

* drag handle style update

* formatting

* linter warnings fix

* UI styles: context menu paddings
2024-06-09 23:56:39 +02:00
Kiril Videlov
de25abf090
Merge pull request #4048 from gitbutlerapp/update-svelte-dependencies
if an oplog entry had an error, show it
2024-06-09 22:07:41 +02:00
Kiril Videlov
145b69103c
if an oplog entry had an error, show it 2024-06-09 22:05:17 +02:00
Kiril Videlov
8ae0b00b9b
Merge pull request #4047 from gitbutlerapp/add-request-timeout
set timeout of 2 sec when caching assets
2024-06-09 21:57:47 +02:00
Kiril Videlov
ad48640347
set timeout of 2 sec when caching assets 2024-06-09 21:38:20 +02:00
Kiril Videlov
5822dd2238
Merge pull request #4046 from Byron/various-fixes
various fixes
2024-06-09 10:08:20 +02:00
Sebastian Thiel
31eeb9f32b
Merge pull request #4045 from Byron/vscode-in-new-window
open projects in separate vscode window
2024-06-09 09:40:32 +02:00
Sebastian Thiel
134226dae3
feat(menu): open project folder in new vscode window (#4037) 2024-06-09 09:24:25 +02:00
Sebastian Thiel
788958ee08
hide sensitive information from ever being debug-logged 2024-06-09 08:58:17 +02:00
Kiril Videlov
93950c1f58
Merge pull request #4042 from gitbutlerapp/pnpm-lock-yaml-upgrade-to-v7.12.0
captrure update branch errors in snapshot
2024-06-08 22:52:57 +02:00
Kiril Videlov
c0710a05e7
captrure update branch errors in snapshot 2024-06-08 22:31:23 +02:00
Sebastian Thiel
c6b22a727b
Merge pull request #4036 from LukeCarrier/fix-typos
Fix a couple of small typos
2024-06-08 07:58:26 +02:00
Luke Carrier
028ef784a5 fix: accurat{ => e }ly 2024-06-07 22:40:31 +01:00
Luke Carrier
c3242a5a5a fix: subs{ i => e }quently 2024-06-07 22:39:53 +01:00
Nico Domino
793232b0f6
fix: use svelte:window for managing hotkey event listeners (#4005) 2024-06-07 14:56:37 +02:00
Nico Domino
7efe94342c
Merge pull request #4017 from gitbutlerapp/ndom91/hunk-viewer 2024-06-07 14:19:35 +02:00
Nico Domino
d64f5dbe59
Merge branch 'master' into ndom91/hunk-viewer 2024-06-07 14:08:39 +02:00
Nico Domino
b9704835cc
Merge pull request #4033 from gitbutlerapp/ndom91/rm-editorconfig 2024-06-07 14:08:18 +02:00
Nico Domino
e6efc15f4b
Merge branch 'master' into ndom91/rm-editorconfig 2024-06-07 14:06:53 +02:00
Pavel Laptev
5301181c49
fix button style (#4032) 2024-06-07 12:37:59 +02:00
Pavel Laptev
e735959e69
Button refactoring (#4031)
new props `outline`, `dashed` and `solidBackground`
2024-06-07 12:29:29 +02:00
ndom91
b3bebca3a2
chore: rm .editorconfig 2024-06-07 11:29:27 +02:00
Nico Domino
d03f1bf6c2
Merge branch 'master' into ndom91/hunk-viewer 2024-06-07 09:38:51 +02:00
ndom91
15f5bdefac
fix: limit hunk viewer to 2500 lines 2024-06-07 09:37:53 +02:00
Kiril Videlov
db6558b2dd
Merge pull request #4028 from gitbutlerapp/revert-4010-ndom91/modal-cleanup
Revert "fix: simplify Modal logic"
2024-06-06 22:54:41 +02:00
Kiril Videlov
61226358b4
Revert "fix: simplify Modal logic" 2024-06-06 22:52:26 +02:00
Kiril Videlov
1013b3891c
Merge pull request #4026 from gitbutlerapp/change-use-new-locking-to-true
feat(project): enable new locking by default
2024-06-06 19:19:35 +02:00
Mattias Granlund
81feed64d7 More fixes for commit lines 2024-06-06 18:39:49 +02:00
Kiril Videlov
1e253b8a59 feat(project): enable new locking by default 2024-06-06 18:08:10 +02:00
Nico Domino
ce5dced72f
Merge branch 'master' into ndom91/hunk-viewer 2024-06-06 17:32:45 +02:00
ndom91
5595ac1398
fix: cleanup extra squirrely brace 2024-06-06 17:32:19 +02:00
Nico Domino
b06f70054a
Merge pull request #4010 from gitbutlerapp/ndom91/modal-cleanup 2024-06-06 17:22:50 +02:00
ndom91
66f80babee
fix: pnpm-lock 2024-06-06 17:10:05 +02:00
Nico Domino
d5fe2a88d9
Merge branch 'master' into ndom91/modal-cleanup 2024-06-06 17:08:17 +02:00
Nico Domino
da3b27ca83
Merge pull request #4023 from gitbutlerapp/ndom91/add-corepack 2024-06-06 17:05:12 +02:00
Nico Domino
fde990294c
Merge branch 'master' into ndom91/modal-cleanup 2024-06-06 17:01:32 +02:00
Kiril Videlov
85065d9c3a
Merge pull request #4024 from gitbutlerapp/clean-up-core-git-Error
remove unused variants of core::git::Error
2024-06-06 17:01:16 +02:00
ndom91
ea70514b98
fix: avoid handling if no modalForm 2024-06-06 16:59:59 +02:00
Kiril Videlov
5922ed7459 remove error type core::git::Error 2024-06-06 16:49:33 +02:00
Nico Domino
268f8ab521
Merge branch 'master' into ndom91/add-corepack 2024-06-06 16:47:09 +02:00
Kiril Videlov
113d238753 cleanup config.rs unused functions 2024-06-06 16:41:19 +02:00
Kiril Videlov
462a98e5d1 remove unused variants of core::git::Error 2024-06-06 16:38:02 +02:00
ndom91
228fc6e462
fix: use the same version of pnpm across everything 2024-06-06 16:14:57 +02:00
Kiril Videlov
3f32e659e5
Merge pull request #4022 from gitbutlerapp/add-log-for-sign-commits-setting
fix a bug where the "sign commits" toggle did not work
2024-06-06 16:12:19 +02:00
ndom91
a0fb6060f0
feat: add packageManager package.json option and bump lock file to v9 2024-06-06 16:11:50 +02:00
Kiril Videlov
59abae2a04 fix a bug where the "sign commits" toggle did not work 2024-06-06 16:09:33 +02:00
Caleb Owens
d2d02eee7e
Merge pull request #4021 from gitbutlerapp/update-node-version-20.14
Introduce a strict node version
2024-06-06 16:06:04 +02:00
Caleb Owens
f3464a0136
Introduce a strict node version 2024-06-06 16:03:13 +02:00
Caleb Owens
452ae8fe7d
Merge pull request #4020 from gitbutlerapp/update-vscode-settings
Add in some vscode settings
2024-06-06 15:45:52 +02:00
Caleb Owens
50b5b88593
Add in some vscode settings 2024-06-06 15:43:21 +02:00