Kiril Videlov
|
35e348261b
|
Merge pull request #5255 from gitbutlerapp/fix-simplify-stacking-conflict-detection
fix: simplify stacking hasConflicts derived
|
2024-10-22 11:50:37 +02:00 |
|
Kiril Videlov
|
56a4a4ac0d
|
Adding an extra dedup step to absolutely prevent duplication
Duplicate keys crashes the UI
|
2024-10-22 02:02:12 +02:00 |
|
Kiril Videlov
|
adbc69a80d
|
Fix - remove the assumption that a stack can only have one commit with a given change id
Having a change id being duplicated is a bad state but we must be able to handle it
|
2024-10-22 01:57:58 +02:00 |
|
ndom91
|
42c33cb895
|
fix: simplify Stack.svelte hasConflicts
|
2024-10-21 22:05:39 +02:00 |
|
ndom91
|
a7e98d20a3
|
fix: simplify StackingCommitList hasConflicts prop
|
2024-10-21 21:54:03 +02:00 |
|
Kiril Videlov
|
d78c77cf3d
|
Merge pull request #5254 from gitbutlerapp/add-tests-to-ui-slugify
UI: add tests to slugify
|
2024-10-21 19:36:03 +02:00 |
|
ndom91
|
7e7e867762
|
fix: stack header z-index
|
2024-10-21 19:32:52 +02:00 |
|
Kiril Videlov
|
58c9d119ee
|
Merge pull request #5251 from gitbutlerapp/kv-branch-1
add large file protection for the UI on commits
|
2024-10-21 19:32:11 +02:00 |
|
Kiril Videlov
|
b9124e8545
|
UI: add tests to slugify
|
2024-10-21 19:31:56 +02:00 |
|
Kiril Videlov
|
c843e5d7ec
|
add large file protection for the UI on commits
If there are large non-binary files, it can lock up the UI. Add the same handling that we already apply for the uncommitted files
|
2024-10-21 19:09:38 +02:00 |
|
Kiril Videlov
|
aea28549af
|
Merge pull request #5250 from gitbutlerapp/fix-loosen-slugify-rules
fix: don't force lowercase and allow `/` character
|
2024-10-21 18:50:41 +02:00 |
|
ndom91
|
90e40f49a9
|
fix: don't force lowercase and allow / character
|
2024-10-21 18:42:15 +02:00 |
|
estib
|
0ddbbc4283
|
Project settings: GitForm
Create a dedicated git project settings form component.
Move the option to force-push to that new form
|
2024-10-21 18:27:11 +02:00 |
|
Kiril Videlov
|
3e131b4acb
|
Merge pull request #5244 from gitbutlerapp/fix-incorrect-branch-deletion
Fix for branches incorrectly deleted
|
2024-10-21 14:48:34 +02:00 |
|
Kiril Videlov
|
6ed54349d0
|
Fix for branches incorrectly deleted
If a branch is being "unapplied' due to conflicts - dont delete the state
|
2024-10-21 14:42:24 +02:00 |
|
ndom91
|
6ba0bfc2ff
|
fix: stacking remove pseudo dropzone line overlay
|
2024-10-21 14:23:12 +02:00 |
|
ndom91
|
dfec47a962
|
fix: do not error on empty dropzoneIndexes map
|
2024-10-21 14:09:23 +02:00 |
|
Esteban Vega
|
9851549d08
|
Merge pull request #5241 from gitbutlerapp/e-branch-1
Stacking Commit Card: Port the conflict resolution confirmation modal
|
2024-10-21 13:56:12 +02:00 |
|
estib
|
3c4eb5c6d8
|
Stacking Commit Card: Port the conflict resolution confirmation modal
Port the confirmation modal shown when attempting to resolve the conflicts not in the first conflicted commit
|
2024-10-21 12:25:39 +02:00 |
|
Esteban Vega
|
a55e2fcee3
|
Merge pull request #5220 from gitbutlerapp/pr-modal-template-selector
PR details modal: Allow user to choose the PR template
|
2024-10-21 12:13:47 +02:00 |
|
Pavel Laptev
|
029b8e5b2c
|
move Toggle and ToggleButton to UI
|
2024-10-21 12:07:19 +02:00 |
|
Pavel Laptev
|
abdee0e5d0
|
fix button states
|
2024-10-21 11:54:39 +02:00 |
|
estib
|
eba7f9c388
|
PR template section: Persist the user selection
The user can choose whether to use a PR template and that will be persisted accross PRs.
- remove the PR template section from the Project settings
|
2024-10-21 11:37:00 +02:00 |
|
estib
|
41b9ed4ad7
|
BorderlessTextarea: Auto height on value changes
Update the height on value changes instead of only on input events.
That way, if the value is externally updated then the height will update as well
|
2024-10-21 11:34:55 +02:00 |
|
Kiril Videlov
|
16135675bc
|
Reorder stack API stub
|
2024-10-21 11:28:57 +02:00 |
|
Esteban Vega
|
ae2307b688
|
Merge pull request #5239 from gitbutlerapp/fix-modals-typing
fix: Type the modals correctly
|
2024-10-21 10:40:00 +02:00 |
|
estib
|
e7b514cc52
|
fix: Type the modals correctly
We need to type the modals correctly as possibly undefined in order to guard against calling its methods before the binding has succeeded.
|
2024-10-21 10:27:14 +02:00 |
|
Pavel Laptev
|
5811a5741a
|
fix header styles
|
2024-10-20 23:56:23 +02:00 |
|
Pavel Laptev
|
c20c7c2a10
|
Update PrTemplateSection.svelte
|
2024-10-20 23:42:35 +02:00 |
|
Pavel Laptev
|
121d96931e
|
ToggleButton component updated
|
2024-10-20 23:39:33 +02:00 |
|
Pavel Laptev
|
578461328b
|
Update PrDetailsModal.svelte
|
2024-10-20 23:31:02 +02:00 |
|
Pavel Laptev
|
7cabfe59db
|
remove unused code
|
2024-10-20 23:14:04 +02:00 |
|
Pavel Laptev
|
f27f65a6fb
|
update design
|
2024-10-20 22:18:20 +02:00 |
|
Kiril Videlov
|
2cd5ff24b6
|
Merge pull request #5233 from gitbutlerapp/better-error-message
mention ref-name when reference isn't found
|
2024-10-20 19:14:55 +02:00 |
|
Kiril Videlov
|
1da4a6043b
|
Merge pull request #5237 from gitbutlerapp/kv-branch-1
fix a bug in marking commits as integrated
|
2024-10-20 19:14:31 +02:00 |
|
Kiril Videlov
|
2630dbbc1e
|
fix a bug in marking commits as integrated
Match the implementation of the legacy commits, which check only up to the first integrated commit
|
2024-10-20 19:08:40 +02:00 |
|
Kiril Videlov
|
c17767eddb
|
Merge pull request #5236 from gitbutlerapp/fix-initials-generation
Template branch names - ensure initials generation handles utf8 chars correctly
|
2024-10-20 17:46:42 +02:00 |
|
Kiril Videlov
|
de9dbbd34f
|
fix - when generating initials, handle accents etc correctly
The branch name needs to be ascii
|
2024-10-20 16:39:35 +02:00 |
|
Kiril Videlov
|
fc51c61bf0
|
refactor - move branch generation to a function
|
2024-10-20 12:48:07 +02:00 |
|
Sebastian Thiel
|
fe70427931
|
upgrade to latest version of gitoxide for better error message when reference is not found. (#5229)
Now it will include the name of the reference that wasn't found, which should help with debugging.
|
2024-10-20 09:38:10 +02:00 |
|
Pavel Laptev
|
1b3b8fdb41
|
Copy improve for auto select text (#5231)
* Copy improve
* Update +page.svelte
* Update +page.svelte
|
2024-10-20 02:32:05 +00:00 |
|
Kiril Videlov
|
15ad86c01e
|
Merge pull request #5232 from gitbutlerapp/kv-branch-1
fixes a bug in handling the remote name
|
2024-10-20 00:53:26 +02:00 |
|
Kiril Videlov
|
d2d31644a1
|
remove unnecessary test
|
2024-10-20 00:32:06 +02:00 |
|
Kiril Videlov
|
dd93fc16db
|
fixes a bug in handling the remote name
Seems like projects that were created long time ago do not have the push_remote_name field set up. Add correct handling for all those situations
|
2024-10-20 00:22:57 +02:00 |
|
Pavel Laptev
|
b6967154d6
|
UI fix default editor select (#5228)
* fix Select component height
* Remove unnecessary copy
|
2024-10-19 20:15:54 +02:00 |
|
estib
|
6a64db6c29
|
PR details modal: Allow user to choose the PR template
User can select the PR template to use for each individual PR
Also:
Improve the tests of the forge review crate
|
2024-10-18 18:22:19 +02:00 |
|
ndom91
|
c02dd4cbd9
|
feat: add vscodium for caleb
|
2024-10-18 17:41:02 +02:00 |
|
ndom91
|
101bb6be40
|
feat: add VSCode Insiders to "open in editor" options
|
2024-10-18 17:41:02 +02:00 |
|
Pavel Laptev
|
ff29f37457
|
UI: Stacking branch header (#5217)
* styles update
* fix focusTrap
|
2024-10-18 15:35:09 +00:00 |
|
ndom91
|
6ca48807d0
|
feat: enable stacking for real this time
|
2024-10-18 17:27:19 +02:00 |
|