Commit Graph

8958 Commits

Author SHA1 Message Date
Kiril Videlov
530a982379
fixes a bug where discarding created files does not work 2024-09-11 21:06:50 +02:00
Kiril Videlov
63a8603054
fixes a bug where discarding deleted files doesnt work 2024-09-11 21:06:34 +02:00
Kiril Videlov
8ad8797b5d
whenever a hunk is reversed also reverse change type 2024-09-11 20:48:09 +02:00
Kiril Videlov
199129162d
on empty new file the generic hunk is type added 2024-09-11 20:47:15 +02:00
Nico Domino
4700d5b2f1
fix: improve deeply nested token rendering (#4883) 2024-09-11 18:36:57 +02:00
Caleb Owens
5e19bdda53
Merge pull request #4882 from gitbutlerapp/Fix-janky-generics
Fix janky generics
2024-09-11 16:03:46 +02:00
Caleb Owens
d76d900a7e
Fix janky generics 2024-09-11 16:00:04 +02:00
Esteban Vega
c4686bbf63
Merge pull request #4859 from gitbutlerapp/check-boxes-behavior
Improve the file list checkboxes behavior
2024-09-11 15:43:18 +02:00
Esteban Vega
2d8b82309d
Merge pull request #4876 from gitbutlerapp/file-navigation
fix: File key navigation and selection
2024-09-11 14:28:43 +02:00
Nico Domino
0595319405
fix: rm unnecessary Space.svelte and add List/ListItem (#4874) 2024-09-11 13:59:08 +02:00
Nico Domino
a1ff2079db
fix: createPr arguments order (#4878) 2024-09-11 11:43:26 +00:00
estib
390119e009 fix: File key navigation and selection 2024-09-11 12:19:52 +02:00
Pavel Laptev
25c2f516fd
style: Updated box-shadow to use custom variable in ContextMenu and Select components (#4870) 2024-09-11 12:12:10 +02:00
Caleb Owens
5a3d788927
Merge pull request #4873 from gitbutlerapp/issues
Issues
2024-09-11 10:31:05 +02:00
Caleb Owens
f5477a502b
Issues 2024-09-10 22:35:02 +02:00
estib
aaae6e605c HunkDiff: Udpate the diff table style 2024-09-10 19:52:35 +02:00
Kiril Videlov
0717b69740
Merge pull request #4867 from gitbutlerapp/update-gix-path-to-0-10-11
Update gix-path to version 0.10.11
2024-09-10 18:48:44 +02:00
Kiril Videlov
f93fad98c1
Update gix-path to version 0.10.11 2024-09-10 17:37:10 +02:00
Kiril Videlov
4ddc6a9a32
Merge pull request #4863 from gitbutlerapp/update-branch-repo-commit-removal
fix a bug where deleting a vbranch fails to update state
2024-09-10 17:32:02 +02:00
Kiril Videlov
620ea1418f
Merge pull request #4864 from Zamoca42/fix/wsl-window-maximize-bug
fix: A bug with Wayland display (Error 71) in WSL
2024-09-10 17:23:34 +02:00
Esteban Vega
f70f3dd7e6
Merge pull request #4858 from gitbutlerapp/fix-pr-button
PR service: Initialize it only with the base branch
2024-09-10 17:06:14 +02:00
Chooooooo
d4718f73bc fix: Disable window state plugin on Linux
Disable the `tauri_plugin_window_state` plugin on Linux platforms as it
causes issues with the application's window behavior. This change ensures
the application runs smoothly across all supported platforms.
2024-09-10 23:42:24 +09:00
Kiril Videlov
dfa38908f9
Merge pull request #4865 from gitbutlerapp/use-https-for-pnpm-on-git
fix ci lol
2024-09-10 16:40:50 +02:00
Kiril Videlov
23cd9b0e97
fix ci lol 2024-09-10 16:38:12 +02:00
Kiril Videlov
bea01c15b8
Merge pull request #4866 from gitbutlerapp/revert-4861-dependabot/npm_and_yarn/eslint-plugin-storybook-0.9.0--canary.165.991522a.0
Revert "Bump eslint-plugin-storybook from 0.9.0--canary.156.ed236ca.0 to 0.9.0--canary.165.991522a.0"
2024-09-10 16:36:49 +02:00
Kiril Videlov
bcf13059cf
Revert "Bump eslint-plugin-storybook"
This reverts commit b4546388a2.
2024-09-10 16:20:14 +02:00
Chooooooo
0dc81b1e49 fix: Disable window state plugin for now
The window state plugin is causing issues with the application, so it is being temporarily disabled. This change will allow the application to function without the plugin until the issue can be resolved.
2024-09-10 20:42:47 +09:00
Pavel Laptev
85462206a4
Edit mode UI updates (#4862)
* Show full status tag only if file modified

* tooltip to the page added
2024-09-10 11:35:17 +02:00
estib
ba021da232 PR service: Initialize it only with the base branch
Re-write the PR service interface in order to set the upstream branch when creating the PR, not the service.
2024-09-10 11:16:03 +02:00
estib
f19c2158eb push_virtual_branch: Return the remote reference
Pushing a virtual branch also returns the branch refname
2024-09-10 11:12:30 +02:00
estib
041344bab5 Utils: Create branch module
Add a branch utilities module with a function that retrieves the branch name from a reference
2024-09-10 11:09:20 +02:00
Kiril Videlov
310d4cf73a
fix a bug where deleting a vbranch fails to update state 2024-09-10 10:55:36 +02:00
Esteban Vega
9e8f5997c4
Merge pull request #4845 from gitbutlerapp/allow-force-push-to-remove-commits
Commit List: Allow force push when removing commits
2024-09-10 10:42:54 +02:00
dependabot[bot]
b4546388a2 Bump eslint-plugin-storybook
Bumps [eslint-plugin-storybook](https://github.com/storybookjs/eslint-plugin-storybook) from 0.9.0--canary.156.ed236ca.0 to 0.9.0--canary.165.991522a.0.
- [Release notes](https://github.com/storybookjs/eslint-plugin-storybook/releases)
- [Changelog](https://github.com/storybookjs/eslint-plugin-storybook/blob/main/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/eslint-plugin-storybook/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-storybook
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-10 10:35:03 +02:00
estib
94b4744c3f Move the error logging to the Branch controller 2024-09-10 09:19:33 +02:00
estib
8c22b6c0d1 Update Ownership class
Rename the `Ownership` class to `SelectedOwnership`, as it is only used to determine the selected state of the files to add to a commit.

Renamed the methods as well to convey their actual purpose.

The `SelectedOwnership` class will be updated in a way that the selected is persisted across file/hunk ownership updates
2024-09-09 13:53:57 +02:00
Kiril Videlov
33c4447fd8
Merge pull request #4856 from gitbutlerapp/update-clone-form-validation
remove incorrect placeholder
2024-09-09 13:39:49 +02:00
Kiril Videlov
db2f33a2ef
remove incorrect placeholder 2024-09-09 13:12:18 +02:00
estib
7bb3c7c9cf BranchFilesList: Clean-up and prefer Svelte 5 APIs
Refactor and clean-up the component, so that the newer, more readable Svelte 5 state APIs are used
2024-09-09 12:00:34 +02:00
estib
660c555cd9 Move chunk to array utilities
Deduplicate and move the chunk utility into the array utilities module
2024-09-09 11:56:03 +02:00
Sebastian Thiel
ee083deada
Merge pull request #4849 from Byron/nicer-clone
refactor clone for clarity
2024-09-09 06:56:31 +02:00
estib
0a6493087b FileListItem: Track whether all or some hunks have been selected
If only some of the hunks have been selected, display the file checkbox as indeterminate
2024-09-08 12:21:49 +02:00
estib
d7c8c78100 Utils: Check for array items compliance
Create a module for array utilities.
Add a function that determines what amount of items in an array satisfy a condition
2024-09-08 12:18:56 +02:00
estib
d3c1ed8ed4 Style: Checkbox indeterminate state
Make it so that the indeterminate state of the checkbox matches the selected style
2024-09-08 12:16:56 +02:00
Esteban Vega
d1462f1ea5
UI: Info Button component (#4829)
* UI: Info Button component

Info button that displays a custom component on hover.

* Extend tooltip

Optionally, toggle the tooltip on click.
If enabled, clicking outside will close the tooltip

* Click outside: Broaden the elements that can be ignored

Broaden the types of elements that can be ignored

* Info Button: Ignore the SVG when checking for clicking outside

* Info Button: Add Storybook

* Info Button: Use a separate component for the tooltip arrow

That way we can set the border-radius easliy, plus it's probably a bit more CSS-compatible with picky browser engines

* TooltipWrapper shared component

Factor out the common logic of the Tooltip and Info Button so that there is no duplicated functionality and so that the Info Button doesn't have to depend on the Tooltip

* Tooltip and the InfoButton use the TooltipWrapper

Use the shared component.
Also:
- Info button is opened (and stays open) on hover

* separate tooltip components

* icon transition effect added

* button tooltip to the body level + utils function

* Remove log

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-07 22:12:52 +02:00
Sebastian Thiel
a4df70c422
refactor clone for clarity 2024-09-07 21:08:31 +02:00
Nico Domino
68f0a3c288
fix: use our own open-rs implementation instead of relying on tauri's "shell-open" (#4748)
Co-authored-by: Yerke Tulibergenov <yerke@squareup.com>
Co-authored-by: Caleb Owens <caleb@gitbutler.com>
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
Co-authored-by: GitButler <gitbutler@gitbutler.com>
2024-09-07 19:28:50 +02:00
estib
a904bcc567 Commit List: Allow force push when removing commits
Display the force-push action button even when only removing "localAndRemote" commits.
2024-09-06 17:30:28 +02:00
Esteban Vega
6fdcf9fcc8
Merge pull request #4844 from gitbutlerapp/clean-up-branch-lane
Clean-up: BranchLaneContextMenu: Remove console.log
2024-09-06 15:58:07 +02:00
Esteban Vega
ff6dff1729
Merge branch 'master' into clean-up-branch-lane 2024-09-06 15:56:36 +02:00