ndom91
|
c7140bd2e0
|
fix: apps/web eslint issues
|
2024-10-23 11:09:39 +02:00 |
|
ndom91
|
09297430e0
|
fix: apps/desktop eslint issues
|
2024-10-23 11:09:39 +02:00 |
|
ndom91
|
26713898b8
|
fix: packages/ui eslint issues
|
2024-10-23 11:09:39 +02:00 |
|
ndom91
|
f928b25fff
|
fix: update tsconfig related options
|
2024-10-23 11:09:39 +02:00 |
|
ndom91
|
1838fab7c3
|
fix: enable svelte.config runes mode explicitly
|
2024-10-23 11:09:39 +02:00 |
|
ndom91
|
f34f1f2ebf
|
fix: bump eslint related deps
|
2024-10-23 11:09:39 +02:00 |
|
ndom91
|
3a233b64e3
|
fix: update eslint.config based on svelte5 example
|
2024-10-23 11:09:39 +02:00 |
|
Esteban Vega
|
785a04dbe5
|
Merge pull request #5273 from gitbutlerapp/e-branch-1
style: Fix the history container z-index
|
2024-10-23 09:43:26 +02:00 |
|
estib
|
2107e0e7a5
|
style: Fix the history container z-index
Fix the side-view container so that it is rendered above the lane headers
|
2024-10-23 09:41:00 +02:00 |
|
ndom91
|
9be297edbf
|
fix: ensure anthropic api endpoint can be reached in nightly and release builds
|
2024-10-22 18:37:48 +02:00 |
|
Christoph Hollizeck
|
953fbeedba
|
improvement: introduce direnv .envrc and update gitignore accordingly
|
2024-10-22 17:06:55 +02:00 |
|
Kiril Videlov
|
521d3994a4
|
Merge pull request #5270 from gitbutlerapp/kv-branch-1
Remove stack extention trait - now it can be an impl block
|
2024-10-22 16:15:58 +02:00 |
|
Kiril Videlov
|
068833059d
|
Remove stack extention trait - now it can be an impl block
|
2024-10-22 16:08:59 +02:00 |
|
Kiril Videlov
|
7a4bd35d19
|
Merge pull request #5269 from gitbutlerapp/refactor-stack
Refactor - join stack and stack api crates
|
2024-10-22 15:50:57 +02:00 |
|
Kiril Videlov
|
ccec1868f8
|
Refactor - join stack and stack api crates
Separation was previously needed due to cycle dependency with the repo crate.
The stack_ext is to be refactored as an impl on stack
|
2024-10-22 15:26:53 +02:00 |
|
Kiril Videlov
|
5b5f9b2e45
|
Merge pull request #5268 from gitbutlerapp/kv-branch-2
Refactor - move commit signature code out of branch crate
|
2024-10-22 15:18:39 +02:00 |
|
Kiril Videlov
|
95d4fc15d0
|
Refactor - move commit signature code out of branch crate
|
2024-10-22 14:41:35 +02:00 |
|
Nico Domino
|
5d2f4436e4
|
Merge pull request #5264 from gitbutlerapp/fix-allow-renaming-branch-after-push-with-warning
fix: allow renaming already pushed branches
|
2024-10-22 14:36:01 +02:00 |
|
Kiril Videlov
|
b75f19b32b
|
Merge pull request #5265 from gitbutlerapp/refactor-gitbutler-repository
Refactor gitbutler-repository
|
2024-10-22 14:19:18 +02:00 |
|
Kiril Videlov
|
cea0e219a5
|
Remove unnecessary deps from gitbutler-repository
|
2024-10-22 13:55:50 +02:00 |
|
Kiril Videlov
|
4ef288f60d
|
Move RepoActionsExt out of gitbutler-repository
This is a higher level trait with lots of dependencies
|
2024-10-22 13:44:04 +02:00 |
|
Kiril Videlov
|
9c92eb6107
|
Merge pull request #5263 from gitbutlerapp/kv-branch-1
refactor stack api
|
2024-10-22 13:36:26 +02:00 |
|
Kiril Videlov
|
cb7c4ea486
|
refactor stack api
Make it not depend on RepoActionsExt
|
2024-10-22 13:29:37 +02:00 |
|
ndom91
|
dd098f1e53
|
fix: remove rust validation for branches already pushed
|
2024-10-22 13:25:48 +02:00 |
|
ndom91
|
7f9c29cf5f
|
fix: allow rename after branch has been pushed, with warning
|
2024-10-22 13:08:15 +02:00 |
|
ndom91
|
883cdb510a
|
fix: refactor stacking PR card
|
2024-10-22 12:02:11 +02:00 |
|
ndom91
|
d25a399db6
|
fix: dont show push btn if branch has been integrated
|
2024-10-22 12:01:56 +02:00 |
|
ndom91
|
c642ff751f
|
fix: adjust imports of string utils to new @gitbutler/ui pkg
|
2024-10-22 11:56:40 +02:00 |
|
ndom91
|
e1401d11af
|
fix: move all stirng utils to shared ui utils
|
2024-10-22 11:56:40 +02:00 |
|
ndom91
|
02d5a88612
|
feat: add a few string tests
|
2024-10-22 11:56:40 +02:00 |
|
ndom91
|
3eed596cc8
|
fix: replace lookbehind regex with for loop
|
2024-10-22 11:56:40 +02:00 |
|
Kiril Videlov
|
799898e803
|
Merge pull request #5256 from gitbutlerapp/fix-incorrect-assumption-in-stacking
Fixes a bug where the UI may freeze due to incorrectly processed duplicate changeID
|
2024-10-22 11:51:06 +02:00 |
|
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 |
|
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 |
|