gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-24 05:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,712 Commits 146 Branches 1,015 Tags 63 MiB
e1401d11af
Commit Graph

672 Commits

Author SHA1 Message Date
ndom91
e1401d11af fix: move all stirng utils to shared ui utils 2024-10-22 11:56:40 +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
b9124e8545 UI: add tests to slugify 2024-10-21 19:31:56 +02:00
ndom91
90e40f49a9
fix: don't force lowercase and allow / character 2024-10-21 18:42:15 +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
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
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
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
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
ndom91
92e2116636 enable stackingFeature by default 2024-10-18 17:21:11 +02:00
ndom91
79812d7e43 feat: add diff text wrap userSetting 2024-10-18 17:18:51 +02:00
Esteban Vega
904fd2b458
Merge pull request #5213 from gitbutlerapp/move-out-the-read-pr-template-content 
Refactor the "Read PR template contents logic"
 2024-10-18 16:52:44 +02:00
Esteban Vega
4ba68677da
Merge pull request #5200 from gitbutlerapp/move-out-the-pr-templates-logic 
Refactor the "PR template path" fetch logic
 2024-10-18 16:50:01 +02:00
Caleb Owens
928262a09b
Merge pull request #5209 from gitbutlerapp/branch 
Patch stacks :D
 2024-10-18 16:39:16 +02:00
Pavel Laptev
d9c027dba9
update styles and props (#5204) 2024-10-18 16:26:23 +02:00
Esteban Vega
e37275e8c9
Merge pull request #5214 from gitbutlerapp/e-branch-1 
small-fix: Remove extra quote in add series modal
 2024-10-18 15:58:49 +02:00
ndom91
d4de6aed74 fix: calculating dropzone distance when index 0 2024-10-18 15:54:12 +02:00
estib
4b75964d05 small-fix: Remove extra quote in add series modal 2024-10-18 15:52:16 +02:00
ndom91
51fdce3e35 fix: status icon line on series header 2024-10-18 15:47:01 +02:00
Pavel Laptev
a2b90bab55
UI stacking lanes style fixes (#5211) 
* fix margins and positioning

* fix dots on zoom

* Update StackHeader.svelte

* Update StackingStatusIcon.svelte
 2024-10-18 13:38:55 +00:00
estib
4a96c1a423 Use the forge method to get the PR template content 
Use the forge service to get the PR content method.
 2024-10-18 15:38:02 +02:00
Pavel Laptev
45467f33e5
UI stacking lanes style fixes (#5210) 
* fix margins and positioning

* fix dots on zoom
 2024-10-18 15:19:15 +02:00
Pavel Laptev
e2b08729de
Styles fix: new branch modal (#5206) 2024-10-18 15:14:38 +02:00
Caleb Owens
ff334cccac Patch stacks :D 2024-10-18 14:48:56 +02:00
Kiril Videlov
f62883ffdb
Series UI: update copy to speak about branches 
At least for now, its more familiar terminology
 2024-10-18 14:10:33 +02:00
Esteban Vega
7624ef5e01
Merge pull request #5202 from gitbutlerapp/branch 
PR cards: Remove the mergeable state message
 2024-10-18 13:58:24 +02:00
ndom91
09bcfe5547 fix: update svelte checks of 'vritual branch' 2024-10-18 13:57:33 +02:00
estib
9abc6b72b4 PR cards: Remove the mergeable state message 
Remove the status message regarding the mergeable state in the PR card.
 2024-10-18 13:37:36 +02:00
ndom91
d14c3e9387 fix: revert adding tooltip prop to ContextMenuItem 2024-10-18 12:57:28 +02:00
ndom91
fa2954798d fix: instead of disabling+tooltip, just dont show invalid items in contextMenu 2024-10-18 12:57:28 +02:00