Commit Graph

7681 Commits

Author SHA1 Message Date
Caleb Owens
bddae4fcbc
Update vscode settings to point to new prettierrc 2024-06-18 13:01:05 +02:00
Nico Domino
7e3360de60
fix: migrate eslint and prettier configs to JS files (#4105) 2024-06-18 10:16:02 +00:00
Pavel Laptev
32a08f16bb
UI tweaks #2 (#4104)
* Zen PC styles updated

* UI update: Textbox count button hover

* Profile sidebar hovers update

* Tokens update

* formatting
2024-06-18 12:04:07 +02:00
Caleb Owens
c1e579656a
Merge pull request #4103 from estib-vega/filter-branches-fix
Branches filtering: Don't hide the filter component when filtering
2024-06-18 10:53:13 +02:00
Caleb Owens
219d3c9f2d
Use clearer properties and refactor to svelte 5 2024-06-18 10:50:55 +02:00
estib
9ba247ec50 Branches filtering: Don't hide the filter component if filters are active
If you filter out all branches, the filter component would disappear. Making it impossible to unset the filters.
This change fixes that.
2024-06-18 07:06:49 +02:00
estib
d0c7391d6a Select component: Minor filtering fix
Filtering and then selecting with the cursor would not reset the filter.
Trying to filter the list after that would only append to the remaining filter string content.
This is now fixed by always reseting the filter text
2024-06-17 21:46:21 +02:00
Nico Domino
db7681f14f
feat: update svelte@5.0.0-next.* + @sveltejs/kit@2.5.10 (#4056) 2024-06-17 16:27:51 +02:00
Pavel Laptev
240d5a6836
CSS animation updates (#4100)
* Remove the PC idol animation

* default branch animation update
2024-06-17 14:50:29 +02:00
Caleb Owens
d8f234dcee
Merge pull request #4094 from gitbutlerapp/Fix-apply-from-fork-for-https-origins
Use https for remotes when remote is using https
2024-06-17 14:23:20 +02:00
Pavel Laptev
0dfb591ac4
Revert "Added hotkey and the accelerator to the top menu (#4097)" (#4099)
This reverts commit e09810bfff.
2024-06-17 14:20:38 +02:00
Pavel Laptev
8c2e029c4e
Button styles updated (#4098)
"commit", "default branch" and the "push" button
2024-06-17 13:50:30 +02:00
Pavel Laptev
e09810bfff
Added hotkey and the accelerator to the top menu (#4097) 2024-06-17 12:46:04 +02:00
Caleb Owens
4693fa1c21
Merge pull request #4096 from gitbutlerapp/Add-keybind-to-open-settings
Add kebind to open settings
2024-06-17 11:40:49 +02:00
Caleb Owens
58ea9879ba
Add a shortcut and menu item to access settings
Co-authored-by: Louis <h1ghbre4k3r@dev.bre4k3r.de>
2024-06-17 11:05:47 +02:00
Louis Meyer
fdb4fda191
Feature: Allow selection of always visible scrollbar (#4083)
* feat: Add checked parameter for RadioButton

* feat: allow selection of always visible scrollbar

* fix: fix linter errors

* fix: fix even more linting errors

* Refactor: some code rearrangement

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-06-17 01:57:57 +02:00
Caleb Owens
2dfd04b91d
Use https for remotes when remote is using https 2024-06-16 17:11:36 +02:00
Pavel Laptev
c83dec6bca
Don't show "Filter" button when no branhes (#4093) 2024-06-16 15:19:32 +02:00
Sebastian Thiel
b27fff77ad
fix performance issue that seems to be introduced by the FileIdMap
This disables the cache entirely which would have been the case before
the refactor as well.
This time, it's explicit though.
2024-06-16 09:44:22 +02:00
Sebastian Thiel
843841981c
minor refactor 2024-06-16 09:38:24 +02:00
Sebastian Thiel
184f557897
move debouncer code into its own crate
That way the public API that isn't used doesn't have to be `dead_code`.

Also adjust CI to run the tests we have in the debouncer crate.
Previously, it might not have run them though.
2024-06-16 09:38:24 +02:00
Sebastian Thiel
3723cd279c
enable rename-tracking by FileId by configuring the cache. 2024-06-16 09:38:24 +02:00
Sebastian Thiel
a63b88669c
revert from original to modified version
This shows the exact changes that were done to the original.
2024-06-16 09:38:24 +02:00
Sebastian Thiel
05d3ef3308
make the original version compile and pass tests, assure it works in-app
For the first time, we also add an extra root to the FileId cache which was
unusable before due to the missing configuration.
2024-06-16 09:38:24 +02:00
Sebastian Thiel
3eaaa7f62d
revert debouncer to original version from 0.3.1
That way it becomes obvious which changes exactly are needed to make
the flush-functionality working.

This commit will be followed up by a revert to get the flush-changes
back.
2024-06-16 09:38:23 +02:00
Sebastian Thiel
659fc99af0
remove duplicate tests (but keep them as unit-tests this time)
Previously the `DebouncerInner` struct was made public to allow the
tests to happen (they initialize it directly), but to keep it closer
to the original, let's keep unit tests this time.

Also I validated that both tests are the same.
2024-06-16 09:38:17 +02:00
Kiril Videlov
81f683777e
Merge pull request #4091 from gitbutlerapp/workdir-tree-function
improve performance of workidir diff
2024-06-16 02:40:33 +02:00
Pavel Laptev
dafc6330aa
Merge pull request #4092 from gitbutlerapp/Tokens-update-1
Update tokens
2024-06-16 02:19:16 +02:00
Kiril Videlov
64729a9a17
improve performance of workidir diff 2024-06-16 01:54:23 +02:00
Pavel Laptev
30880d49e7
Handle loading and disable states for large projects (#4090)
* UI: Fix show spinner icon for the loading state

* UI: Disable actions while waiting for response

* UI: Button spinner updated
2024-06-16 01:26:55 +02:00
Pavel Laptev
9b527c49c0 Update tokens 2024-06-16 00:24:13 +02:00
Pavel Laptev
d5b8afc991
UI: Update "fold" navigation button (#4089) 2024-06-15 23:43:59 +02:00
Pavel Laptev
ff6e145476
UI tweaks (#4088)
* Tokens update

* History error style changed

* Button icons style update

* Filter button update

* rebase icon update

* Navigation "fold" button updated
2024-06-15 23:36:28 +02:00
Kiril Videlov
41c2ab5908
Merge pull request #4086 from gitbutlerapp/add-mempack-backend-reset-oops
feat: Add in-memory method to open temporary repository for comparing or getting diffs.
2024-06-15 21:49:15 +02:00
Kiril Videlov
4963ca7d9a
Merge pull request #4087 from gitbutlerapp/remove-conflict-resolution-code
refactor: Remove commented-out code for conflict handling in virtual branches.
2024-06-15 21:48:57 +02:00
Kiril Videlov
be975b7038
refactor: Remove commented-out code for conflict handling in virtual branches. 2024-06-15 21:36:56 +02:00
Kiril Videlov
b01f35bf26
feat: Add in-memory method to open temporary repository for comparing or getting diffs. 2024-06-15 21:21:11 +02:00
Pavel Laptev
6f5b08f391
Close the History view on Esc (#4079) 2024-06-13 15:10:08 +02:00
Pavel Laptev
a7579306b4
Color tokens updates (#4077)
* Color tokens update

* formatting

* styles upd: account link and commit card divider

* replace color mix CSS functions

* Button icon opacity update

* border color 2 update

* fix neutral and ghost text colors

* neutral tokens tweak

* color tokens tweak
2024-06-12 22:52:04 +02:00
Mattias Granlund
0399f983b5 Fix a couple of issues in commit lines
- local line was not using the `.first` class
- `localIn` prop must be undefined if first
- simplify and fix "out type" calculation
2024-06-12 00:56:22 +02:00
Mattias Granlund
650a463a16 Fix empty commit marked as integrated
- we can't say an empty commit is integrated based on tree ids
2024-06-11 23:38:51 +02:00
Mattias Granlund
18566eb3e4 Don't show option to discard changes in unapplied branch 2024-06-11 21:43:04 +02:00
Kiril Videlov
8c710398dd
Merge pull request #4073 from gitbutlerapp/perf-oplog
improve oplog snapshot creation performance
2024-06-11 21:02:20 +02:00
Kiril Videlov
a5f3649654
remove repeat tree creation when history is being listed 2024-06-11 20:05:13 +02:00
Kiril Videlov
119107c12b
getting the snapshot diff uses workdir from applied vbranches 2024-06-11 19:51:36 +02:00
Kiril Videlov
8e8a0ffce7
list snapshots uses workdir tree from applied vbranches 2024-06-11 19:09:45 +02:00
Mattias Granlund
7ae018c21e Fix: add some missing highlight props to select components 2024-06-11 18:26:11 +02:00
Kiril Videlov
f36be87f8a
add the ability to get workdir tree from merging all applied virtual branches from a snapshot 2024-06-11 17:07:04 +02:00
Mattias Granlund
bd33a2c831 Fix new branch dropzone active state css 2024-06-11 16:35:37 +02:00
Mattias Granlund
8e8ef037cb Bug fix for push button
- fixes case where button had label "undefined"
- "integrate upstream" instead of "rebase branch"
2024-06-11 16:24:21 +02:00