Commit Graph

7593 Commits

Author SHA1 Message Date
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
Kiril Videlov
c15125833d
performance: creating an oplog entry does not save a workdir tree
We are already storing the virtual branch trees separately, and merging them together can be a slow operation if the index is large.
2024-06-11 13:21:51 +02:00
Nico Domino
62c312ce96
fix: toggles on preferences form (#4063) 2024-06-11 11:32:36 +02:00
Mattias Granlund
10de79a0b0 Hide error div in toast when no error present
Slots cannot be conditionally filled, so we either need an if statement switching between two `<InfoMessage>` components, or pass error as a prop.
2024-06-10 23:32:47 +02:00
Mattias Granlund
f2da13ea83 Fix github auth
- no longer shows incorrect error message on success
2024-06-10 22:43:59 +02:00
Kiril Videlov
ea31b78f6a
Merge pull request #3992 from estib-vega/select-input-improvements
Select input improvements: Arrow navigation & text filtering
2024-06-10 18:00:54 +02:00
Caleb Owens
c2b4314082
Merge pull request #4057 from gitbutlerapp/update-contextmenu-selection-store-2
update-contextmenu-selection-store-2
2024-06-10 17:32:38 +02:00
Caleb Owens
6d07690508
Loop over methods 2024-06-10 17:31:06 +02:00
Caleb Owens
9e89c6a48b
Make em propper buttons 2024-06-10 17:14:01 +02:00
Mattias Granlund
d5e369ff59 Remove rxjs from context menu component 2024-06-10 16:20:51 +02:00
Caleb Owens
63036a80b2
Merge pull request #4054 from gitbutlerapp/diff-the-correct-way-round
Diff the correct way round
2024-06-10 15:32:47 +02:00
Caleb Owens
a4f548e411
Diff the correct way round 2024-06-10 15:20:28 +02:00
Caleb Owens
848fabdbe5
Merge pull request #4053 from gitbutlerapp/Remove-console-log
Remove console.log
2024-06-10 14:53:42 +02:00
Caleb Owens
67a8884d2a
Remove console.log 2024-06-10 14:51:58 +02:00
Kiril Videlov
316fe6e0a0
Merge pull request #4051 from gitbutlerapp/sort-hunks-by-start
apply hunks in one go for submodules too
2024-06-10 14:32:16 +02:00
Caleb Owens
586889973a
Merge pull request #4052 from gitbutlerapp/Fix-key-for-only-deletions
Fix key for only deletions
2024-06-10 13:42:27 +02:00
Caleb Owens
61ede7a55b
Show local commit shas 2024-06-10 13:41:00 +02:00
Caleb Owens
d9beea9c21
Fix keys for only deletions 2024-06-10 13:38:02 +02:00
Kiril Videlov
88e13bd89e
apply hunks in one go for submodules too 2024-06-10 11:23:36 +02:00
Nico Domino
0c481feb28
fix: refactor Modal rendering and clickOutside handling (#4035) 2024-06-10 11:11:59 +02:00
Pavel Laptev
1c9a41e20e
css fix: fix height on bas commit hover (#4050) 2024-06-10 00:41:48 +02:00
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
estib
bd10fc9c6c Select Component: Address some feedback
- Remove unnecessary comments
- Improve the naming of generic types
- Clean-up the reactive assignment of `highlightedItem` and other style-consistency changes
- Remove the filter function
2024-06-09 17:51:24 +02:00
estib
0925db8a55 Select Component: Handle empty list state
Don't set a highlight index if there are no items being displayed in the list
2024-06-09 17:51:24 +02:00
estib
7bc51460c2 Project Switcher: Prefer derived store
Instead of subscribing to the project list store, create a derived store.
2024-06-09 17:51:24 +02:00
estib
74aed280d2 feat: Select - type to filter and navigate
Add the ability to navigate the options of the Select dropdown input with the up and down keys.
If typing text, filter the results based on whether the display label includes the typed text.

Also
- Generic types for the Select Items list
- Some other adaptions necessary in the component consumers
2024-06-09 17:51:24 +02:00
estib
75383cda21 Utility additions: Misc, Filters and String
Add utilities for type testing, filtering and throttling
2024-06-09 17:51:24 +02:00
estib
790824886d HotKey names
Add an enum of key names for hot keys of interest
- Use the key names in the `on` function
2024-06-09 17:51:24 +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