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
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
ndom91
09b02feb78
fix: wire up prService template fns correctly
2024-09-10 19:29:24 +02:00
ndom91
b7a037b1dc
fix: move new template methods to PRService
2024-09-10 19:18:42 +02:00
ndom91
781fbb5a13
fix: merge conflict
2024-09-10 18:55:45 +02:00
ndom91
f53b5b8f2e
chore: more cleanup
2024-09-10 17:34:22 +02:00
ndom91
4aa9e96ced
fix: use pullRequestPath as boolean
2024-09-10 17:24:51 +02:00
ndom91
eecea80884
fix: read pr tempalte from disk
2024-09-10 17:14:35 +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
ndom91
e888025499
fix: move PrTemplate fns to gitHost
2024-09-10 12:22:02 +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
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
23cd9b0e97
fix ci lol
2024-09-10 16:38:12 +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
ndom91
bfe299aa98
fix: cleanup and PR review
2024-09-10 10:37:15 +02:00
estib
94b4744c3f
Move the error logging to the Branch controller
2024-09-10 09:19:33 +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
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
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
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
ndom91
32f13df06d
fix: handle old projects which dont have git_host project settings key
2024-09-08 18:23:05 +02:00
ndom91
b43e9312cb
fix: sync selected values with GitHost preferences form
2024-09-08 18:19:23 +02:00
ndom91
460e19299a
fix: refactor out use of Persisted store values for pr template boolean and path
2024-09-08 18:11:39 +02:00
ndom91
6b55fa56ba
fix: simplify getAvailablePullRequestTemplate args
2024-09-08 18:11:03 +02:00
ndom91
216f5b40f3
fix: update Select to use correct label and value in dropdown
2024-09-08 17:42:36 +02:00
ndom91
3c812cb963
fix: move getAvailableTemplates functionality from project service to github service
2024-09-08 17:42:08 +02:00
ndom91
a02d80807d
fix: rm textinput in GitHostForm
2024-09-08 16:48:30 +02:00
ndom91
6396bfea45
fix: cleanup
2024-09-08 16:39:19 +02:00
ndom91
bbe9249a01
fix: git paths
2024-09-08 16:34:58 +02:00
ndom91
e2bb456f7d
feat: initial template dropdown support
2024-09-08 16:16:09 +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
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
Kiril Videlov
db2f33a2ef
remove incorrect placeholder
2024-09-09 13:12:18 +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
33eb64392f
Clean-up: BranchLaneContextMenu: Remove console.log
2024-09-06 15:55:28 +02:00
Nico Domino
32d766c2d6
fix: bump all svelte related dependencies ( #4828 )
2024-09-06 12:25:41 +02:00
Esteban Vega
710308b4ea
Merge pull request #4832 from gitbutlerapp/fix-create-pr-button
...
fix: Disable the PR button if there is no GitHub integration
2024-09-06 11:14:05 +02:00
Esteban Vega
cb6cdf794f
Merge pull request #4834 from gitbutlerapp/clean-up-select-component
...
Clean-up: Remove anti-pattern from the Select component
2024-09-06 11:11:44 +02:00
estib
bde8c52477
fix: Project Not Found page
...
After successfully untracking the missing project, display the correct messages (whether the success or failure to untrack).
Also, update the projects list accordingly
2024-09-06 09:43:10 +02:00
estib
057df19c9d
Clean-up: Remove anti-pattern from the Select component
...
Instead of updating the state through an effect, factor out the `searchValue` state variable into the parent component, and only derive the filtered options from it
2024-09-05 15:25:29 +02:00
Esteban Vega
3c0f67300d
Merge branch 'master' into fix-create-pr-button
2024-09-05 13:54:26 +02:00
Kiril Videlov
a3800459c3
Merge pull request #4833 from gitbutlerapp/Fix-broken-error-page
...
Fix broken error page
2024-09-05 13:46:33 +02:00
Mattias Granlund
13be25f3e5
Fix broken error page
...
- nested if condition left the page blank
2024-09-05 14:20:55 +03:00
estib
5e05cd787c
fix: Disable the PR button if there is no GitHub integration
...
If there is no GitHub integration, correctly disable the create PR button
2024-09-05 12:10:12 +02:00
Esteban Vega
3b0a2761e0
Merge branch 'master' into unapply-only-hunks-from-lane
2024-09-04 18:19:08 +02:00
Nico Domino
36e98459a2
feat: add support for custom pull request template paths ( #4814 )
2024-09-04 17:25:30 +02:00
Esteban Vega
768c9470ad
Merge branch 'master' into unapply-only-hunks-from-lane
2024-09-04 17:21:09 +02:00
Esteban Vega
e06e93efbf
Merge pull request #4826 from gitbutlerapp/improve-commit-text-input
...
Improve the commit text content experience
2024-09-04 14:40:39 +02:00
estib
ee238fdfd1
Improve the commit text content experience
...
Pressing enter on from the title will behave in the expected way, pushing down the content into the description box
2024-09-04 14:21:02 +02:00
Esteban Vega
43346053c5
Merge branch 'master' into fix-select-update-error
2024-09-04 11:37:50 +02:00
Esteban Vega
924cc5df1e
Merge pull request #4813 from gitbutlerapp/remove-missing-repo
...
Can remove repository if it's missing, from the error boundary page
2024-09-04 11:32:56 +02:00
Pavel Laptev
ab2a9ccc9f
fix: Update rootMargin values to include units in CommitAction and GroupHeader components ( #4822 )
2024-09-04 09:08:58 +01:00
estib
23a5bb7ee4
Connect the project methods to the new components
...
Plug in the newly implemented methods to the new designs
2024-09-03 17:08:21 +02:00
estib
fa4727dcb7
fix: Update the select options correctly
...
The Select component options are a prop that initializes the state variable `filteredOptions`.
The issue was, that if the prop is updated, the state variable doesn't seem to be updated as well.
This fixes that by manually updating the state variable whenever the prop updates.
2024-09-03 17:06:06 +02:00
Pavel Laptev
cc60ed1ea0
Added ProjectNotFound screen + small layout updates
2024-09-03 11:45:33 +02:00
estib
34e102f336
Only discard the files changes inside the lane
...
When using the file context menu inside a given lane to discard the changes, only the changes to that file inside the lane should be discarded.
Any other changes to that same file that live in other lanes are kept
2024-09-03 11:34:19 +02:00
Pavel Laptev
6530284a80
fix: hovering animation ( #4816 )
2024-09-03 00:26:30 +02:00
Mattias Granlund
5f9c2e5832
Rename gitbutler/integration -> gitbutler/workspace
2024-09-02 20:53:19 +03:00
estib
636b065279
Ability to relocate project, if missing
...
Optionally, the path of a project can be manually updated if moved
2024-09-02 17:42:07 +02:00
estib
c784ff7194
Use the user error codes directly
...
Don't reimplement the user error handling scheme, and just extend what's there.
2024-09-02 16:45:00 +02:00
estib
df57f8bc28
Augment the project page errors with codes
...
Add the error code to the project page error for a better, more granular error handling
2024-09-02 16:39:45 +02:00
estib
105ad7d0fa
Resolve linting errors
2024-09-02 15:18:31 +02:00
estib
8192b4e5fa
Reuse the RemoveProjectButton component
...
Adapt the component so that the modal is optionally bypassed
2024-09-02 15:04:38 +02:00
estib
be89f303d2
Can remove repository if it's missing
2024-09-02 14:44:03 +02:00
Pavel Laptev
444b03ff38
style(sidebar): Update padding and color for PR tags in SidebarEntry ( #4811 )
...
* style(sidebar): Update padding and color for PR tags in SidebarEntry
* Tooltip update
2024-09-02 12:51:30 +02:00
Pavel Laptev
5821d92b77
Replase checkbox with toggle + copy update ( #4810 )
2024-09-02 08:49:27 +02:00
Pavel Laptev
c820a33e41
Tooltip-refactoring-+-new-component ( #4804 )
...
* tooltip component + custom svelte transitions
* update some tooltips
* replace old toogle
* replace old tooltip hook
* remove old tooltip hook
* lint fixes
* design tokens update
2024-09-01 20:30:36 +02:00
Mattias Granlund
98c3f5d310
Fix copiedFromRemoteId bug
...
- correctly shows commits as rebased when changeId is missing
- setting relatedTo is sufficient, no need to touch `get status()`
2024-09-01 15:33:35 +03:00
ndom91
de310a203d
fix: isDeleting branch behaviour in BranchPreviewHeader
2024-09-01 14:18:04 +03:00
ndom91
5e5c8cb289
fix: rename loadingDelete => isDeleting
2024-09-01 14:18:04 +03:00
ndom91
fc31c5e262
fix: set branch delete modal action btn to loading=true when appropriate
2024-09-01 14:18:04 +03:00
Nico Domino
c2a662edf3
fix: extract Board empty state into own component ( #4796 )
2024-08-30 11:48:55 +00:00
Pavel Laptev
fe3c73ccfd
FileListItem fix ( #4799 )
...
* show lock icons and lock tooltip
* replace state with derived
* allow to drag files
2024-08-30 13:11:23 +02:00
Kiril Videlov
2c7773a6cd
Merge pull request #4793 from Byron/git2-to-gix
...
performance improvements and bug fixes
2024-08-30 12:53:26 +02:00
Kiril Videlov
af6fdc36a4
add api for updating change references
2024-08-30 12:38:50 +02:00
Pavel Laptev
425136da20
Edit mode updates ( #4792 )
...
* Add `Scrollbar` and `ScrollableContainer` to the UI lib
* event fixes
* replace app components with UI
* Move `ContentWrapper` to the UI side
* update file status badge colors
* move scrollbar components back to to app
because of the user settings
* dummy commit card added to the edit mode
* add the commit line
* edit modal UI tweaks
* remove unused code
* lint fixes
* lint fixes
2024-08-30 11:21:11 +02:00
Sebastian Thiel
4d495cb3bc
Adjust integration check to also recognize by matching tree.
...
This is relevant when all commits are equal by tree, but seem changed
due to the added GitButler headers.
For added safety, we also compare by commit message, date and authors,
basically everything that isn't the headers.
2024-08-30 07:15:47 +02:00
Sebastian Thiel
36f23d529f
CLI with branch list-remotes to list remote branches
2024-08-30 07:15:46 +02:00
Filipe Louro
92349391f3
Refactor RepoInfo type to use domain instead of source and resource
2024-08-29 18:24:45 +03:00
Filipe Louro
90bf797ad0
Add resource to tests to make checks happy
2024-08-29 18:24:45 +03:00
Filipe Louro
43264e28f2
Run prettier
2024-08-29 18:24:45 +03:00
Filipe Louro
bec6ddcefa
Make if statement more strict
2024-08-29 18:24:45 +03:00
Filipe Louro
3cc2edda7a
Set gitHostFactory for gitlab self hosted instances
2024-08-29 18:24:45 +03:00
Nico Domino
0f48b53108
feat: add <form /> to Modal implementation ( #4780 )
2024-08-29 11:34:47 +02:00
Caleb Owens
7b5cef41b9
Fix snapshot details transformer
2024-08-28 16:38:21 +02:00
Pavel Laptev
95d11a2965
Fix files selection ( #4764 )
...
* allow select multiple if the lane is applied
* missing commit Id added
* fix selection with `shift`
* disable draggable icon for unapplied commits
* replace `isPreview` with existing `isUnapplied`
* do not allow mutliple selection for remote commits
* refactor(utils): small update
* revert previous commit
* review changes
2024-08-28 11:27:48 +02:00
Caleb Owens
47358dd7a8
Have sidebar in edit mode
2024-08-28 10:41:47 +02:00
Caleb Owens
25409fd6f9
Merge pull request #4777 from gitbutlerapp/UI-updates-Edit-mode
...
UI updates: Edit mode
2024-08-28 10:19:40 +02:00
Kiril Videlov
b6c57eedf9
Merge pull request #4745 from Comnir/4472-fix-conflicting-branches-list-message
...
Fix conflicting-branches list message
2024-08-28 10:09:55 +02:00
Pavel Laptev
cb52363774
Sokitview updates
2024-08-27 23:37:05 +02:00
Kiril Videlov
12d48df0f7
Merge pull request #4774 from gitbutlerapp/remove-unused-feature-flag
...
remove unused feature flag
2024-08-27 20:57:26 +02:00
Nico Domino
30231c2f46
fix: dont hide "discard file" contextMenu option from binary files ( #4770 )
2024-08-27 20:50:47 +02:00
Kiril Videlov
74e7b1eeb5
remove unused feature flag
2024-08-27 20:46:22 +02:00
Nico Domino
a1650b464a
fix: reenable tipsy hover on branch empty-state ( #4772 )
2024-08-27 15:28:04 +00:00
Mattias Granlund
864994514f
Update app updater button copy ( #4762 )
...
* Update app updater button copy
* copy update
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-08-27 16:36:28 +02:00
Pavel Laptev
f4594dcfb4
disable hovers for file list items
2024-08-27 14:55:48 +02:00
Kiril Videlov
06f50b4531
Merge branch 'master' into branch-stacking-first-stab
2024-08-27 14:13:08 +02:00
Caleb Owens
0b397d2368
Jiggle some code about
2024-08-27 13:05:28 +02:00
Caleb Owens
3fb5077c4a
Somethign somethign matchy matchy design
2024-08-27 13:05:27 +02:00
Caleb Owens
d2d3afbf2b
Added unstaged changes event
2024-08-27 13:05:07 +02:00
Kiril Videlov
4b5a8d14ef
add commands for pushing change references
2024-08-26 21:38:40 +02:00
Kiril Videlov
cef701796d
update the create reference method to take change id
2024-08-26 20:49:01 +02:00
Nico Domino
b287516cc7
feat: use PR template when available ( #4736 )
2024-08-26 17:08:37 +02:00
Mattias Granlund
2f684d620b
Suppress up-to-date if not invoked manually
2024-08-26 15:32:52 +01:00
Pavel Laptev
99dcf812c4
Add zoom functionality with keyboard shortcuts and update menu actions for the View item ( #4753 )
...
* feat: Add zoom functionality with keyboard shortcuts and menu actions
feat: Implement global settings menu action navigation to settings page
feat: Implement theme switching functionality with keyboard shortcut and menu action
* code review fixes
2024-08-26 15:24:44 +02:00
Kiril Videlov
2ddb032ebf
show relevant commit refs if feature is toggled
2024-08-23 21:03:44 +02:00
Kiril Videlov
33e7d7b269
adds the ability to create branch refs from the UI
2024-08-23 18:07:24 +02:00
Caleb Owens
fdcbae3250
Merge pull request #4746 from gitbutlerapp/UI-lib-updates-#5
...
UI lib updates #5
2024-08-23 16:37:39 +02:00
Pavel Laptev
2b5b5c00aa
remove unused code
2024-08-23 15:49:49 +02:00
Comnir
da0c623e06
Add back some imports...
2024-08-23 16:43:56 +03:00
Pavel Laptev
964f700f04
update FileListItem and FileIcon components
2024-08-23 15:42:00 +02:00
Caleb Owens
74a5c1a2ae
Merge pull request #4742 from gitbutlerapp/Exit-edit-mode-without-saving
...
Exit edit mode without saving
2024-08-23 15:33:53 +02:00
Comnir
ca8bf2e400
Fix conflicting-branches list message
...
- Currently no branches are listed
- The branches list returned by update_base_branch contains string, whereas when the message is constructed it's assumed the objects in the list have a 'name' property
2024-08-23 16:20:33 +03:00
Kiril Videlov
7137fce76e
add ui feature flag for branch stacking
2024-08-23 13:46:17 +02:00
Caleb Owens
dd84ad168c
Fix wdio and tsconfig errors
2024-08-23 12:56:24 +02:00
Caleb Owens
04a63f1712
Exit edit mode without saving
2024-08-23 12:47:17 +02:00
Caleb Owens
ec7a38f538
Merge pull request #4717 from gitbutlerapp/Rebase-revolution
...
Rebase revolution
2024-08-22 18:28:49 +02:00
Caleb Owens
c987629262
Add project specific setting and refactor
2024-08-22 17:57:03 +02:00
Pavel Laptev
21eeb5f5c9
minor UI lib updates ( #4740 )
...
* button icons change
* Shorter copy
* checkbox updated to Svelte 5
- added `Checkbox` story
* Fix checkbox and badge props
* change story name
* segement color transition update
* illustrations update
* update SVG illustration colors
* style: Update button CSS variables for different button styles.
2024-08-22 15:39:09 +02:00
Caleb Owens
0603fd7457
Sure up behaviour with blank commits and reordering
2024-08-22 15:15:23 +02:00
Mattias Granlund
9c100fca49
Visually distinguish draft prs in branch list
2024-08-22 13:46:33 +01:00
Nico Domino
51139b4d73
fix: zoom shortcut codes for international keyboard users ( #4735 )
2024-08-22 10:45:34 +01:00
Mattias Granlund
191dc073e8
Improve app drag areas
...
- drag from lane gutters (but not over scrollbar)
- drag from empty space in new branch dropzone
- drag from empty space
2024-08-22 00:23:52 +01:00
Mattias Granlund
c968a1049c
Merge pull request #4671 from Comnir/delete-project-when-backing-from-adding-project
...
fix: clicking 'Cancel' on new project page does nothing
2024-08-21 14:36:50 +01:00
Caleb Owens
ace6facb24
Getting behaviour locked in
2024-08-21 14:45:41 +02:00
Pavel Laptev
d56973a56e
Update AppUpdater.svelte
...
- update copy
- show the `tick` icon if the app is "UPTODATE"
- fix the background for the loading scale
- don't show the slide animation if the app is "UPTODATE" or "ERROR"
2024-08-21 12:40:08 +01:00
Mattias Granlund
132336c1da
Add AppUpdater component test
2024-08-21 12:40:08 +01:00
Mattias Granlund
caae223b1f
Fix checks monitor test
...
- these tests can't be run concurrently apparently
2024-08-21 12:40:08 +01:00
Mattias Granlund
ed6ecf183f
Add test to ensure continous update polling
2024-08-21 12:40:08 +01:00
Mattias Granlund
4a2e947c46
Simplify and test updater service
...
- reverts to old UI
- moves more business logic into .ts file
- add tests for a few scenarios
2024-08-21 12:40:08 +01:00
Mattias Granlund
086d0cb0fb
Fix branch re-ordering
...
- lets svelte re-order visually rather than manipulating the dom
2024-08-21 11:31:25 +01:00
Nico Domino
3ce2b5b338
fix: avatars from Google accounts via Auth0 ( #4725 )
2024-08-21 11:06:52 +02:00
Mattias Granlund
4a015e8b0d
Merge branch 'master' into delete-project-when-backing-from-adding-project
2024-08-20 12:36:48 +01:00
Caleb Owens
65fb462d64
Rebase revolution
...
Co-authored-by: Scott <schacon@gmail.com>
2024-08-19 18:10:28 +02:00
