Commit Graph

8975 Commits

Author SHA1 Message Date
Caleb Owens
db992dedfa
Merge pull request #4869 from gitbutlerapp/update-api
Update api
2024-09-12 13:23:05 +02:00
Caleb Owens
932070ca1f
Read index 2024-09-12 13:03:04 +02:00
Caleb Owens
1389b9e465
A time before time 2024-09-12 12:46:36 +02:00
Nico Domino
3a478b4f15
fix: reactive markdown rendering (#4888) 2024-09-12 09:53:21 +00:00
Esteban Vega
a6692415e8
Merge pull request #4886 from gitbutlerapp/UI-fixes-Hunk-preview-and-checkboxes
UI fixes: Hunk preview and checkboxes
2024-09-12 10:46:56 +02:00
Pavel Laptev
7c0a3766af usused CSS removed 2024-09-12 02:03:22 +02:00
Pavel Laptev
8723bd5c17 selected hunk colors update 2024-09-12 01:48:01 +02:00
Pavel Laptev
96d52014e0 Fix hunk header styles
- There was an issue with borders on scroll
- Fix the hunk header paddings
- replaced `box-shadow` with borders. Looks like it's not longer an issue
2024-09-12 01:29:28 +02:00
Pavel Laptev
e4df03aa50 remove unused code 2024-09-12 01:27:41 +02:00
Pavel Laptev
965118de7a Remove duplicated hunk inf and replace indicators with infomessages 2024-09-11 23:29:10 +02:00
Sebastian Thiel
92c36b1a81
Merge pull request #4885 from gitbutlerapp/fix-discarding-of-deleted-and-created-files
fix discarding of deleted and created files
2024-09-11 21:46:01 +02:00
Sebastian Thiel
630c253637
for safety, don't fail if the file to be removed doesn't exist.
The code could run into this if `allow_new_file` is `true` and no
file actually exists.
Maybe in practice this can't happen, but calls can be made that trigger this.
2024-09-11 21:39:21 +02:00
Sebastian Thiel
ffdb0f6e2f
Minor refactor for slightly improved readability
Maybe the intent of some parts is clearer now as well.
2024-09-11 21:34:18 +02:00
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
Caleb Owens
aeea013ba0
Update base branch button feature flagged 2024-09-11 15:18:20 +02:00
Caleb Owens
6e7aefd5c3
Merge commiting 2024-09-11 14:47:36 +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
Caleb Owens
955c99e5d8
Rebasing working 2024-09-11 13:43:39 +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
191686ec4d
Ahhh, don't loose shit 2024-09-11 11:23:20 +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