Mattias Granlund
c13c706268
Improve "taken" loop when updating hunk ownership
...
- previous veresion inserted more than one ownership claim per branch
- buggy since `branch.clone()` would include things not yet taken
2024-03-25 21:46:53 +01:00
Mattias Granlund
d025293b0e
Fix css for textbox disabled state ( #3315 )
2024-03-25 21:28:38 +01:00
Mattias Granlund
81e61409ca
Fix: cancel input prompt when dismissing input modal
2024-03-25 21:13:36 +01:00
Kiril Videlov
65e7540b96
Merge pull request #3310 from gitbutlerapp/reconcile-ownership-claims
...
refactor: extract ownership calculation for update
2024-03-25 00:44:27 +01:00
Kiril Videlov
eb89c3d08c
refactor: extract ownership calculation for update
...
This should have no functional change. Simply extracting the interesting code to separate function. And also adding an initial test
2024-03-25 00:23:19 +01:00
Kiril Videlov
1dd1e1b0f5
Merge pull request #3308 from gitbutlerapp/add-tab-size-setting
...
feat(settings): Clarify tab size setting for code diffs
2024-03-24 21:28:34 +01:00
Kiril Videlov
f37e9aa422
feat(settings): Clarify tab size setting for code diffs
2024-03-24 20:46:44 +01:00
Mattias Granlund
bec9224ee0
Merge pull request #3298 from mayfieldiv/add-userSettings-tabSize-support
...
feat: make code tab size configurable
2024-03-24 20:41:09 +01:00
Kiril Videlov
91947e5d94
Merge pull request #3307 from gitbutlerapp/check-hunk-ownership-consistency-on-assignment
...
feat: detect conflicting ownership claims
2024-03-24 20:31:31 +01:00
Kiril Videlov
d9b2928a85
feat: detect conflicting ownership claims
2024-03-24 19:25:51 +01:00
Kiril Videlov
8e0a28ef88
Merge pull request #3306 from gitbutlerapp/update-virtual-branch-context-migration
...
feat: Migrate use_diff_context to true if no active virtual branches
2024-03-24 17:37:47 +01:00
Kiril Videlov
1b54b7efdb
feat: Migrate use_diff_context to true if no active virtual branches
...
Migrate to use diff context for any projects that have stale unapplied branches. This will facilitate removing the old code for supporting zero context hunks
2024-03-24 17:28:17 +01:00
Kiril Videlov
a328ad4d7d
Merge pull request #3305 from gitbutlerapp/add-state-dir-for-project
...
feat: namespace virtual_branches.toml under .git/gitbutler
2024-03-24 17:16:59 +01:00
Kiril Videlov
9d7e847f82
feat: namespace virtual_branches.toml under .git/gitbutler
...
The virtual_branches.toml was never read
2024-03-24 17:06:14 +01:00
Kiril Videlov
7e8eab4726
Merge pull request #3304 from gitbutlerapp/expand-lane
...
feat: Update "Collapse lane" help text to "Expand lane"
2024-03-24 16:24:47 +01:00
Eyal Cherevatsky
8fbbe38432
fix: improve Segment button selected state style ( #3301 )
...
* fix: improve `Segment` button selected state style
* Update Segment.svelte
- styles updated. align with the `IconButton` styles
- unused CSS removed
- accessibility navigation fixed. Instead of arrows — use tabs
* Update Segment.svelte
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-03-24 16:16:33 +01:00
Kiril Videlov
b929d180ee
feat: Update "Collapse lane" help text to "Expand lane"
2024-03-24 16:08:24 +01:00
Kiril Videlov
17c9620395
Merge pull request #3294 from gitbutlerapp/fix-unneeded-config-set-calls
...
refactor(AISettings): Remove unneeded config set calls
2024-03-24 15:56:22 +01:00
Mayfield
b2eee287fe
dispatch change event and allow min tab size of 1
2024-03-24 10:43:24 -04:00
Pavel Laptev
87f03bf5d4
Merge branch 'master' into add-userSettings-tabSize-support
2024-03-24 15:03:21 +01:00
Pavel Laptev
16e27b42dd
Fix the order for interactive elements in TexBox
...
In order to support correct keyboard navigation
2024-03-24 15:02:46 +01:00
Pavel Laptev
6558c32fe2
added new input type
...
+ shake animation if the input is invalid
+ added new input props — minVal, maxVal, width and textAlign
+ added new section card prop `centerAlign`
+ new icon
2024-03-24 15:00:37 +01:00
Mayfield
3fc492b3eb
fix import order
2024-03-24 09:03:20 -04:00
Mayfield
a6928381c8
move userSettings to a more appropriate level
2024-03-24 07:33:24 -04:00
Kiril Videlov
37a9e6d916
Merge pull request #3299 from gitbutlerapp/update-repository-dependencies
...
fix: remove unused import
2024-03-24 12:21:11 +01:00
Kiril Videlov
f61679c082
fix: remove unused import
2024-03-24 12:10:39 +01:00
Mayfield
f254d7dc58
feat: add tab size option to Appearance settings
2024-03-23 21:33:25 -04:00
Mayfield
3486bfaf43
fix: background color CSS variable typo
2024-03-23 21:33:25 -04:00
Mayfield
901aed1afe
feat: add tabSize user setting
2024-03-23 21:33:25 -04:00
Mayfield
b8af70a30a
feat: add tab size option to Appearance settings
2024-03-23 21:16:18 -04:00
Mayfield
c691e5b116
fix: background color CSS variable typo
2024-03-23 21:16:18 -04:00
Mayfield
f940d6a1cf
feat: add tabSize user setting
2024-03-23 21:16:18 -04:00
Mattias Granlund
f2a54b7f9f
Fix bug occasionally preventing hunks from being moved
...
- hunks equal if hash is same, regardless of line numbers
- send hash from front end when updating ownership
- use updated line numbers after hunk intersection match
2024-03-24 01:46:17 +01:00
Pavel Laptev
debea8f343
styles: ai options page updated ( #3296 )
...
+ small fixes for related components
+ Settings text case fixed to capitalize only first letter
2024-03-23 23:26:03 +01:00
Kiril Videlov
02dcc3f1e7
Merge pull request #3295 from gitbutlerapp/handle-git-push-update-refs-error
...
feat(virtual_branches): handle push error with user-friendly message
2024-03-23 21:50:07 +01:00
Kiril Videlov
d26cddf445
feat(virtual_branches): handle push error with user-friendly message
2024-03-23 21:40:03 +01:00
Caleb Owens
af9b104059
refactor: Remove unneeded config set calls
2024-03-23 20:14:08 +00:00
Pavel Laptev
2575bbfbd5
Styles updates ( #3292 )
...
* hover states for outline buttons + tokens upd
* design tokens update
* disable showing project name in settings
+ Titles case update
* added settings section component
2024-03-23 17:25:17 +01:00
Mattias Granlund
c78923843c
Fix incorrect tooltip position when zoomed in (cmd+-)
...
Units should be in pixels because they are calculated according to actual layout.
2024-03-23 15:02:36 +01:00
Mattias Granlund
b75d03b267
Add retries to loading pull request data
...
- github can respond with 422 right after pushing
- make three attempts to load data
2024-03-23 15:02:08 +01:00
Kiril Videlov
7c41b56222
Merge pull request #3289 from gitbutlerapp/fetch-with-prune
...
feat: Add --prune option to git fetch command
2024-03-23 10:33:40 +01:00
Kiril Videlov
32c57edaea
feat: Add --prune option to git fetch command
2024-03-23 10:24:04 +01:00
Kiril Videlov
a29c46de87
Merge pull request #3287 from gitbutlerapp/add-trace-propagation-targets-1
...
feat: Add tests for `normalize_branch_name` function
2024-03-22 13:36:34 +01:00
Kiril Videlov
8075f9e04f
feat: Add tests for normalize_branch_name function
2024-03-22 13:26:44 +01:00
Kiril Videlov
47f1ea06a1
Merge pull request #3284 from FaithfulDev/master
...
Allow "#" in branch names #3280
2024-03-22 11:48:29 +01:00
Caleb Owens
61d6c678fc
Merge pull request #3270 from gitbutlerapp/refactor-sync-button-to-use-tag
...
refactor: replace custom sync button with Tag component
2024-03-22 11:32:28 +01:00
Caleb Owens
64e676ae79
Merge pull request #3254 from gitbutlerapp/consolidate-diff-formatting
...
Pass in hunk array rather than diff
2024-03-22 11:19:01 +01:00
Caleb Owens
bffcdbdae4
Pass in hunk array rather than diff
2024-03-22 11:09:14 +01:00
Scott Chacon
5a8b3969de
refactor: Update function parameter to use sortedFiles instead of files
2024-03-22 11:08:10 +01:00
Marcel R
df4578a459
Merge branch 'master' into master
2024-03-22 10:51:47 +01:00
