Sebastian Thiel
ada4b17c47
Make sure test doesn't fail if the default branch isn't master.
...
Ideally repository creation is standardized to avoid these issues,
but for now this is just the minimal fix to make the test suite
work for me.
2024-09-24 11:08:10 +02:00
Sebastian Thiel
9f6c01c5ab
make tests work under more conditions
...
Currently tests rely to be run globally so `branch-actions` can set
the required feature flags.
Now more crates that need it will set it so that their tests can be
run individually.
2024-09-24 11:01:13 +02:00
estib
536dfac6e4
IntegrateUpstreamModal: Factor out the modal
...
Factor out the modal for upstream integration into a dedicated component so that it can be shared easily
2024-09-24 09:54:13 +02:00
Kiril Videlov
4c11a96456
Merge pull request #4962 from gitbutlerapp/Fix-state-for-file-selections-not-propagating
...
Fix state for file selections not propagating
2024-09-24 09:33:19 +02:00
Esteban Vega
8fc1e0d77f
Merge pull request #4928 from gitbutlerapp/fix-use-correct-branch-name
2024-09-24 00:36:47 +02:00
Caleb Owens
9c23e577ba
Constrain FilIdSelection API
2024-09-23 21:00:53 +02:00
Caleb Owens
edc0bd1a1d
Fix state for selections not propagating
2024-09-23 20:26:34 +02:00
Scott Chacon
d2444de8c5
add basic views into stacks
...
this adds a way to view the timeline, branches and stacks, create stacks and more. none of this is pretty, but we're just exercising the server APIs
2024-09-23 16:26:25 +02:00
Nico Domino
82099fe43e
fix: submit commit title/desc with ctrl+Enter everywhere ( #4958 )
2024-09-23 16:16:30 +02:00
Esteban Vega
69b304bc33
Merge pull request #4948 from gitbutlerapp/conflict-fix-commit-info
...
Display the author and commit title in the edit mode
2024-09-23 14:43:18 +02:00
Esteban Vega
48c5e18db1
Merge pull request #4956 from gitbutlerapp/remove-unnecessary-object-utils
...
refactor: replace custom entries with Object.entries
2024-09-23 13:37:06 +02:00
estib
22e7f46950
refactor: replace custom entries with Object.entries
...
Remove custom entries utility and replace its usage with
Object.entries across hotkeys and branch utility files.
2024-09-23 12:21:18 +02:00
Nico Domino
992496f6a5
fix: protect read file from path traversal ( #4943 )
2024-09-22 17:12:45 +00:00
Pavel Laptev
edbc8eb3a3
Small UI fixes ( #4950 )
...
* fix the hunk header font-weight
* Text case fix
* Update sections order
* Fix "Full data synchronization" layout and toggles
2024-09-19 14:09:29 +02:00
estib
c15dbbf083
Edit Mode page: Display commit info
...
Display information about the commit in the edit mode page
2024-09-19 14:02:05 +02:00
estib
838002fa06
Commit service
...
Create a service that enables searching inside a project for a commit information by its ID
2024-09-19 14:01:03 +02:00
estib
184629d1d4
Create a method to find a commit by its ID
...
Find a commit in the repository by its ID
2024-09-18 16:46:16 +02:00
Esteban Vega
ed85637ce1
Merge pull request #4947 from gitbutlerapp/edit-branch-poping-up
...
The edit branch should not be listed in the side bar
2024-09-18 15:07:08 +02:00
estib
d1c71898cc
The edit branch should not be listed in the side bar
...
The `gitbutler/edit` branch should not be listed in the side bar of the application
2024-09-18 14:28:25 +02:00
Caleb Owens
f34d901c87
Merge pull request #4945 from gitbutlerapp/Fix-wrong-files-displaying-in-edit-mode
...
Fix wrong files displaying in edit mode
2024-09-18 12:18:27 +02:00
Caleb Owens
5e48159a83
Merge pull request #4944 from gitbutlerapp/Fix-line-manager-forkpoint-integrated
...
fix: Correct condition for removing right column
2024-09-18 12:18:06 +02:00
Nico Domino
cdae30d1a9
fix: use pull request template form ( #4946 )
2024-09-18 10:01:34 +00:00
Caleb Owens
9ed21936f5
fix: Correct condition for removing right column
2024-09-18 11:51:44 +02:00
Caleb Owens
224c03528b
Improve index resolution
2024-09-18 11:45:38 +02:00
Caleb Owens
c991ec48a8
Merge pull request #4941 from gitbutlerapp/conflict-resolution-fix
...
fix: Calculate the right file tree when resolving
2024-09-18 11:29:42 +02:00
estib
4dca18ff3e
fix: Calculate the right file tree when resolving
...
Get the correct file tree when resolving a conflict
2024-09-18 11:11:00 +02:00
Esteban Vega
7edaaa7db3
Merge pull request #4940 from gitbutlerapp/hunk-locking
...
Update the hunk locking style
2024-09-18 09:55:18 +02:00
estib
ccf7106f49
Update the hunk locking style
...
Update it following the feedback from Discord: https://discord.com/channels/1060193121130000425/1224366824305463337/1285608946870124617
2024-09-18 09:18:49 +02:00
Kiril Videlov
a01cac1baa
Merge pull request #4938 from gitbutlerapp/hunk-column-changes
...
fix: File section max line number & simplify hunk header calculation
2024-09-18 08:34:01 +02:00
Kiril Videlov
089af8e111
Merge pull request #4933 from gitbutlerapp/hunk-locking-design
...
HunkDiff: Display a lock if needed
2024-09-18 08:33:06 +02:00
Kiril Videlov
a6d9701c16
Merge pull request #4939 from gitbutlerapp/"Drop-changes-and-unapply"-copy-update
...
refactor: Improve label for unapplying changes in BranchLaneContextMenu
2024-09-18 08:30:25 +02:00
Kiril Videlov
d9d7e38456
Merge pull request #4937 from gitbutlerapp/bump-tauri-to-1.8.0
...
feat: bump tauri to 1.8.0
2024-09-18 08:29:50 +02:00
Pavel Laptev
4f94be5439
refactor: Improve label for unapplying changes in BranchLaneContextMenu
2024-09-17 22:14:18 +02:00
ndom91
05109246f1
fix: bump tauri-cli
2024-09-17 21:49:32 +02:00
Esteban Vega
cfbb7a56bb
Merge pull request #4936 from gitbutlerapp/User-settings
...
fix: Don't override the user settings
2024-09-17 17:15:31 +02:00
estib
aecae8e2bf
fix: File section max line number & simplify hunk header calculation
...
- Fix a bug in which the max lines would not be taken into account when checking what the biggest line number in a hunk section.
- Simplify the calculation of the header width for the HunkDiff component
2024-09-17 17:15:09 +02:00
ndom91
ad2290dc7a
fix: bump tauri@1.8.0 in preparation for v2 upgrade
2024-09-17 17:10:45 +02:00
estib
cc6c8b9bec
fix: Don't override the user settings
...
The user settings would not be correctly updated because multiple places were reloading it
This fixes the issue https://github.com/gitbutlerapp/gitbutler/issues/4931
2024-09-17 16:49:34 +02:00
Caleb Owens
69487faafa
Merge pull request #4935 from gitbutlerapp/Remove-BS-services
...
Remove BS services
2024-09-17 16:47:59 +02:00
Caleb Owens
beea22bcc3
Remove BS services
2024-09-17 16:46:08 +02:00
estib
8b2ea87ed5
HunkDiff: Display a lock if needed
...
Show a lock icon if the hunk in question is locked to this lane
2024-09-17 15:16:59 +02:00
Caleb Owens
2a3f0e8a04
Fix (some) wrong files displaying in edit mode
2024-09-17 14:31:58 +02:00
Nico Domino
6476a1c754
feat: use new Tabs components to organise Preferences page ( #4906 )
2024-09-17 11:22:17 +02:00
Kiril Videlov
04b854c10c
Merge pull request #4926 from gitbutlerapp/update-dad-jokes-file
...
feat: Add a new dad joke to dad-jokes.txt.
2024-09-17 10:59:48 +02:00
Caleb Owens
eeeb73f8df
Merge pull request #4930 from gitbutlerapp/Improve-scrolling-of-update-modal
...
Improve scrolling of update modal
2024-09-16 20:52:30 +02:00
Caleb Owens
b6a4f7cd35
Improve scrolling of update modal
2024-09-16 20:50:45 +02:00
estib
7dbadb13a9
Get the upstream name from the pushed virtual branch
...
Once the push of a virtual branch succeeded, return the ref name and the remote name in order to correctly determine which branch name to create a PR from.
2024-09-16 18:15:06 +02:00
Esteban Vega
5b34cc75bd
Merge pull request #4925 from gitbutlerapp/commit-context-menu
...
Add commit context menu
2024-09-16 17:31:59 +02:00
Kiril Videlov
f130cb2458
Merge pull request #4927 from gitbutlerapp/fix-branch-name-from-ref
...
fix: Extract the name from the remote ref correctly
2024-09-16 17:03:08 +02:00
Caleb Owens
aac703afa7
Merge pull request #4909 from gitbutlerapp/Improve-applying-branches
...
Improve applying branches
2024-09-16 16:48:50 +02:00
