gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-30 13:06:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,180 Commits 157 Branches 1,073 Tags 61 MiB
7f348d8a6d
Commit Graph

9180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ndom91
09b02feb78 fix: wire up prService template fns correctly 2024-09-10 19:29:24 +02:00
ndom91
8194283275 fix: simplify error handling read_file_from_workspa 2024-09-10 19:22:03 +02:00
ndom91
b7a037b1dc fix: move new template methods to PRService 2024-09-10 19:18:42 +02:00
ndom91
13c866da73 Merged origin/master into ndom91/use-template-dropdown 2024-09-10 18:56:29 +02:00
ndom91
781fbb5a13 fix: merge conflict 2024-09-10 18:55:45 +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
GitButler
e889d90779 GitButler WIP Commit 2024-09-10 18:45:48 +02:00
Kiril Videlov
f93fad98c1
Update gix-path to version 0.10.11 2024-09-10 17:37:10 +02:00
ndom91
f53b5b8f2e chore: more cleanup 2024-09-10 17:34:22 +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
ndom91
4aa9e96ced fix: use pullRequestPath as boolean 2024-09-10 17:24:51 +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
ndom91
eecea80884 fix: read pr tempalte from disk 2024-09-10 17:14:35 +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
ndom91
aaa3dbae5d chore: revert github: pnpm dependency string 2024-09-10 15:13:33 +02:00
ndom91
da8d4d791b chore: test removing protocol in package.json github entries 2024-09-10 14:41:21 +02:00
ndom91
3175174c43 fix: test https+github protocol in package.json 2024-09-10 14:37:50 +02:00
ndom91
bfcc4abc26 chore: add notes to other githost types 2024-09-10 14:02:11 +02:00
ndom91
25bbe28411 fix: cleanup and pass absolute path from rust to FE 2024-09-10 13:55:18 +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
ndom91
e888025499 fix: move PrTemplate fns to gitHost 2024-09-10 12:22:02 +02: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
ndom91
bfe299aa98 fix: cleanup and PR review 2024-09-10 10:37:15 +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
ndom91
cb733d707a chore: add note for future improvement 2024-09-09 15:48:24 +02:00
ndom91
a5fb400985 fix: simplify setting git_host default settings in projects.json 2024-09-09 15:35:15 +02:00
ndom91
22f71c2a58 fix: rename get_pr_templates fn to github specific 2024-09-09 15:22:05 +02:00
ndom91
7dee307aa6 fix: add instrumentation to new tauri cmd and rm unnecessary reference 2024-09-09 15:07:33 +02:00
ndom91
e0c2bdfe14 fix: eslint BranchHeader import-order 2024-09-09 14:57:41 +02:00
ndom91
8efe6c7a71 fix: cleanup createPr arguments and types 2024-09-09 14:02:59 +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
ndom91
8986dc3e12 fix: refactor template inputs to being passed to 'createPr' fn 2024-09-09 13:49:46 +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
ndom91
c5ede5ce79 fix: use correct relative path when sending to GH 2024-09-08 18:49:35 +02:00
ndom91
d7badd82a5 fix: enable saving git_host settings to projects.json 2024-09-08 18:34:45 +02:00