gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-23 09:33:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,287 Commits 155 Branches 1,066 Tags 61 MiB
490febec5c
Commit Graph

405 Commits

Author SHA1 Message Date
Mattias Granlund
490febec5c Implement backend call for "remove series" 2024-10-04 12:43:26 +02:00
Mattias Granlund
3eaa991385 Fix the new series button at the top 2024-10-04 12:43:26 +02:00
Mattias Granlund
31f5bb38c9 Make push button sticky in stacking mode 2024-10-04 12:43:26 +02:00
Mattias Granlund
4f2291e37c Fix: state_unsafe_mutation workaround 
An alternative fix would be to initialise the loading store at first load in order to avoid changing it immediately on `start()`, that's what causes the error.
 2024-10-04 12:43:26 +02:00
Mattias Granlund
548263e538 Use correct branch names, prs etc for a patch series 
- create pr button not working entirely, something to do with ref not being pushed
 2024-10-04 12:43:26 +02:00
ndom91
2bba8cbae6 fix: stackingCommitCard and handle remoteRef:null in groupCommitsByRef 2024-10-04 12:43:26 +02:00
ndom91
979ed50510 feat: match stackingBranchHeader and statusIcon colors to top commit 2024-10-04 12:43:26 +02:00
ndom91
b46c397c60 feat: add StackingBranchHeader contextMenu and handlers for contextMenuItems as well as their Modals 2024-10-04 12:43:26 +02:00
ndom91
9ba5ecbf65 feat: add openExternalBranch iconButton 2024-10-04 12:43:26 +02:00
ndom91
2af2e34bc0 feat: finish implementing upstream commits accordion 2024-10-04 12:43:26 +02:00
Mattias Granlund
8bdeb3f635 Cleanup experimental stacking feature 
- initial "new stacking branch" card
- persist setting for show stacking details
- separates out individual branch / pr header
- stack files in separate folder
- implements upstream commits accordion
 2024-10-04 12:43:26 +02:00
estib
94fa0fed5d fix: Update the type of the drop down button 
Fix up the type of variable used to refernce the drop down button in the PR button component
 2024-10-03 11:58:01 +02:00
Pavel Laptev
47c0bad9ac
fix: diff example "added/deleted" lines (#5023) 2024-10-03 00:22:00 +02:00
Esteban Vega
c4fc0923ce
Merge pull request #5017 from gitbutlerapp/add-scroll-area-to-the-edit-mode 
Edit mode: Add a max height and scrollable container
 2024-10-02 13:28:19 +02:00
Pavel Laptev
3b280597fa layout update + remove "ActionView" component 2024-10-02 12:07:11 +02:00
Mattias Granlund
3008244201 Fix errors that appeared after svelte plugin upgrade 2024-10-02 11:26:15 +02:00
Mattias Granlund
332bbb3c1d Fix bind:this={} for Svelte5 components 
- needs `ReturnType` and `typeof` to work correctly
- svelte-check does not recognise this type bug yet
- vscode svelte plugin started complaining a week ago
 2024-10-02 11:25:31 +02:00
Pavel Laptev
3470a73999 header "files amount" badge added 2024-10-02 11:21:16 +02:00
estib
88b0f204bf Edit mode: Add a max height and scrollable container 
In order to be able to display large edit mode files list without having to scroll the whole page to the bottom, add a scrollable container to the commits file list
 2024-10-02 10:01:52 +02:00
estib
7ce815a7ca Markdown: Add BR and strong 
Add new-line and bold-text rendereres for the Markdown component
 2024-10-01 17:15:31 +02:00
estib
924706092b ai: Enable streaming 
Ability to stream the LLM responses into the UI.
 2024-09-28 13:17:37 +02:00
estib
0f05b435ba Result: Add async transformer 2024-09-28 13:15:44 +02:00
estib
3424f7781b ai: Add PR description method 
Add a method to the AI service that takes in some context about a PR and creates a description body out of it
 2024-09-26 15:25:41 +02:00
Pavel Laptev
4fd1712994
Small UI updates (#5006) 
* design tokens update

* update "update" icon

* increase button icons contrast

* Fix: button layout

* made "fast" transition variable even faster

* update "virtual-branch-small" icon

* bigger file icons, remove "fileName" property

- Larger file icons.
- The file path label in the "FileListItem" included the file name, but it should only contain the folder path.
- Since the "filePath" string already includes the file name, it's easier to split it within the "FileListItem" component, rather than passing the file name as a separate prop.
 2024-10-01 16:08:03 +02:00
estib
945f991ad3 Edit mode: Open the conflicted files in the IDE 
Add the ability to right-click a file in the list to open it in the selected IDE.
Also add a button that opens all the conflicted files automatically.
 2024-09-30 19:11:51 +02:00
estib
a169b41594 fix: Correctly detect conflicted files 
Correctly detect and display whether the commit file is conflicted in the edit mode page
 2024-09-30 18:38:20 +02:00
Pavel Laptev
85e32fd4e2
Custom font support for displaying diffs (#4991) 
* replace hardcoded "font-family"

* "Diff font" option in User Settings

* Update +page.svelte

* Update +page.svelte

* added "allow font ligatures" option

* copy update

* Update +page.svelte

* remove console.log

* Appearance settings: Reorder the settings 

Move down the font family the input into its dedicated section

* Graduate inline diffs to standard setting

The option to display inline integrated diffs in the hunk viewer is no longer an experimental option, but an 'stable' appearance setting option.

---------

Co-authored-by: estib <stron@me.com>
 2024-09-30 12:58:39 +02:00
Nico Domino
d10bbcf515
feat: new stacking ui commit lines (#4972) 
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-09-28 16:59:29 +02:00
estib
0f6a78e1b6 fix: Test for integrateUpstreamModal being undefined 
Don't try to read a property from the integration modal if it's undefined
 2024-09-28 11:00:33 +02:00
Navtoj Chahal
26b99e217e
Disable Hidden Input Interaction 2024-09-26 19:39:02 -07:00
Esteban Vega
598d60fbed
Merge pull request #4971 from gitbutlerapp/make-select-generic 2024-09-24 20:06:00 +02:00
Esteban Vega
60c33f135e
Merge pull request #4970 from gitbutlerapp/clean-up-update-base-button 
clean-up: Remove unnecessary function declaration
 2024-09-24 16:55:12 +02:00
Nico Domino
a7325e4d2d
fix: log and show toast (#4965) 2024-09-24 16:03:02 +02:00
estib
0f7b9f4d9c Make the Select component generic 
Auto-detect the type of the value the select options can have
 2024-09-24 15:43:46 +02:00
estib
9f6672b4e3 clean-up: Remove unnecessary function declaration 2024-09-24 14:19:50 +02:00
estib
adc6357a80 Use the exposed state of the integrate upstream modal 
Export the state of whether the modal is open or not.
Use it in the base branch page and the update base button.
 2024-09-24 13:37:58 +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
Caleb Owens
7c9401dd49
Merge pull request #4781 from gitbutlerapp/Fix-snapshot-details-transformer 
Fix snapshot details transformer
 2024-09-24 12:34:08 +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
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
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
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
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
Nico Domino
cdae30d1a9
fix: use pull request template form (#4946) 2024-09-18 10:01:34 +00: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