gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-17 22:11:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,616 Commits 151 Branches 1,064 Tags 60 MiB
7f1ee4cb9d
Commit Graph

584 Commits

Author SHA1 Message Date
Pavel Laptev
0ffbbee4e7 "Signed" commit icon update 2024-06-02 15:24:32 +02:00
Caleb Owens
91179111ef Rename "remote upstream" to "remote" 2024-06-02 15:16:11 +02:00
Pavel Laptev
d4b167fda0 remove console.log 2024-06-02 11:45:54 +02:00
Pavel Laptev
34a514c652 List item last-child double border fix 2024-06-02 11:29:02 +02:00
Pavel Laptev
18567d13db upstream line height fix 2024-06-02 11:21:43 +02:00
Pavel Laptev
28e8b60ed8 List item last-child style updated 2024-06-02 11:14:49 +02:00
Pavel Laptev
ae07c224ba Loading state appearance fix 2024-06-02 10:57:04 +02:00
Pavel Laptev
3adf248ba6 Fix history view animation 2024-06-02 10:50:46 +02:00
Kiril Videlov
bff8cf1ca5
Merge pull request #3898 from Byron/error-handling-pt2 
error handling ergonomics
 2024-06-01 17:04:02 +02:00
Pavel Laptev
6946d6ddeb
Refactor-Tailwind-remove (#3936) 
* remove teilwind CSS imports

* remove Teilwind package

* remove unused CSS

* update from master

* file format changes

* update reset file

* Drop unused Differ file

* update hunk line highlight color
 2024-06-01 16:27:36 +02:00
Sebastian Thiel
dedd721dc3
capitalize error message 
Let's not assume, nor force, that the backend provides error messages
in a format that we want to present. Hence we capitalize ourselves
for consistency.
 2024-06-01 15:56:02 +02:00
Sebastian Thiel
20d84247e9
Prune Code to only what's used by the UI 
Also adjust the `Code` documentation to clarify this - otherwise
we will have more and more variants and nobody actually cares.

The frontend code is adjusted as well, as its `Code` counterpart
contained unsused variants which are now removed.
 2024-06-01 14:32:27 +02:00
Kiril Videlov
39e157fac6
Merge pull request #3939 from gitbutlerapp/show-infobox-if-workspace-update-stashed-branches 
show infobox if workspace update stashed branches
 2024-06-01 14:04:34 +02:00
Mattias Granlund
a50fa6613b Scale branch icons when zooming 2024-06-01 13:59:23 +02:00
Mattias Granlund
24466c8f11 Fix inconsistencies in commit graph 
- terrible code, needs immediate refactoring
 2024-06-01 13:56:53 +02:00
Kiril Videlov
dc385b6a77 Shows infobox if update workspace stashes branches 
In case branches were stashed due to a conflict we want to communicate what happened. Hopefully soon we wont need any of that with the new conflict resolution flow
 2024-06-01 13:51:17 +02:00
Kiril Videlov
72799dacf1 feat: Add help text to Revert button on Snapshot Card. 2024-06-01 12:54:05 +02:00
Caleb Owens
76e3b3f164 removed tooltip and added a hover state to help indicate clickableness 2024-05-31 22:59:46 +02:00
Caleb Owens
3ac4a18c93 disable tooltip length limiter 2024-05-31 14:33:20 +02:00
Caleb Owens
07ed7c8a88 Remove non-advanced mode 2024-05-31 14:33:07 +02:00
Caleb Owens
9cde2babcb
Merge pull request #3818 from gitbutlerapp/customizable-ai-prompts 
Leeerrrooyyyy jeeennnkkkininnsss
 2024-05-31 22:02:31 +02:00
Caleb Owens
0b36e4bcc4 Fixed some stupid shit 2024-05-31 22:00:08 +02:00
Pavel Laptev
564830d8ff
remove console.log (#3934) 2024-05-31 16:56:45 +02:00
Pavel Laptev
e8b70859bd
Revert "Refactor: Tailwind remove (#3932)" (#3933) 
This reverts commit 89d97d2017.
 2024-05-31 16:20:17 +02:00
Pavel Laptev
89d97d2017
Refactor: Tailwind remove (#3932) 
* remove teilwind CSS imports

* remove Teilwind package

* remove unused CSS
 2024-05-31 16:05:47 +02:00
Caleb Owens
509b72409d Fix prompt selector 2024-05-31 15:38:35 +02:00
Pavel Laptev
2b131097ce copy updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
bd365fd08a UI: Custom AI prompts layouts updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
3991cea11f default prompts updated 
In order to correctly display code snippets, the code was wrapped in special triple backticks.
 2024-05-31 15:00:33 +02:00
Pavel Laptev
c69d3956df icon typo fix 2024-05-31 15:00:33 +02:00
Pavel Laptev
e2f37d884b fix removed --size-1 variable error 2024-05-31 15:00:33 +02:00
Pavel Laptev
690d96c818 markdown styles updated 2024-05-31 15:00:33 +02:00
Pavel Laptev
bcd89d5c4c TextArea: added autoresize 2024-05-31 15:00:33 +02:00
Caleb Owens
a936f89485 Go to a manual save step 2024-05-31 15:00:33 +02:00
Caleb Owens
53abdffb5c Better defaults if prompt becomes invalid 2024-05-31 15:00:33 +02:00
Caleb Owens
d80475e563 Introduce Customizable AI Prompts 2024-05-31 15:00:33 +02:00
Caleb Owens
78c4fedbbe Replace PromptMessage[] with Prompt type 2024-05-31 14:59:41 +02:00
Mattias Granlund
d0bf62cb37 Add upstream line from commit lines base 2024-05-30 22:09:10 +02:00
Mattias Granlund
f1fa43060b Fix criteria for showing shadow commit line column 2024-05-30 21:38:49 +02:00
Mattias Granlund
68a71570a2 Stop the pr card from refreshing all the time 
- a derived store is clutch for this
 2024-05-30 21:35:11 +02:00
Kiril Videlov
088eb23f8e feat: Show merge base of virtual branch in commit list 2024-05-30 18:41:40 +02:00
Mattias Granlund
60f289f92a Fix bug in commit lines 
- handle case where only some commits have been rebased
 2024-05-30 19:19:19 +02:00
Caleb Owens
d70b73b256 Improve copy for merge commit 2024-05-30 19:03:49 +02:00
Caleb Owens
8c887c73cc Components: Enhanced Commit List Display 
Updated the Remote Branch Preview component to display commits with proper styling and highlighting of first and last commit in a list.
 2024-05-30 18:43:54 +02:00
Kiril Videlov
83e4886a73 feat(Board.svelte): show history view on error 2024-05-30 18:20:38 +02:00
Caleb Owens
b7587ecafc
Merge pull request #3908 from gitbutlerapp/fix-branch-files-list 
Fix shift clicking files
 2024-05-30 18:12:31 +02:00
Caleb Owens
20f253c3c5 Fix shift clicking files 2024-05-30 18:06:34 +02:00
Mattias Granlund
d9c96e84db Fix bug in commit lines 
- we can rely on change id's when establishing commit relationships
 2024-05-30 17:47:05 +02:00
Caleb Owens
726ec5ade9 Don't allow moving hunks if commit is upstream 2024-05-30 17:37:20 +02:00
Caleb Owens
3ee9e2724d Improve maybe move selection 2024-05-30 17:32:05 +02:00
Caleb Owens
8e0352235c Be reactive 2024-05-30 16:40:54 +02:00
Caleb Owens
30cc5ba381 Fix the ending end of DnD 2024-05-30 16:23:56 +02:00
Caleb Owens
8103889c75 Fix the starting end of DnD 2024-05-30 15:59:29 +02:00
Caleb Owens
1d009d2a3b Sanitize file preview code 2024-05-30 14:32:57 +02:00
Kiril Videlov
3af46b3cae handle merge commits 2024-05-30 16:23:40 +02:00
Mattias Granlund
c2f79818c8 Show PR checks progress as error if any check has failed 2024-05-30 12:07:42 +02:00
Pritam Sangani
efc7c4bd64
Add full stop to end of error message to match style of other error messages 2024-05-29 21:46:37 +01:00
Pritam Sangani
e650e041f8
Fix small typo in error message 2024-05-29 21:42:37 +01:00
Caleb Owens
aab5684be2 Redirect to branch page if there is a conflict 2024-05-28 17:54:35 +02:00
Caleb Owens
ed75059ee7 Update message to indicate that we're adding a remote 2024-05-28 17:53:20 +02:00
Caleb Owens
a6446b5aa9 Use sha to find PRs (also use upstream sha for vbranch when available) 
Its preferable to use the upstream sha because that will always be in agreeance with the PR, whereas the local "head" may be different if you've rebased or moved forwards in time
 2024-05-28 16:44:14 +02:00
Caleb Owens
05d8480390 Add flow for adding a fork as a remote 2024-05-28 14:00:07 +02:00
Caleb Owens
9956e9f889 Introduce rust code for listing and adding remotes 2024-05-28 11:54:01 +02:00
Caleb Owens
6d1ed8474c rename fetch_from_target to fetch_from_remotes 2024-05-28 10:14:35 +02:00
Caleb Owens
1645073d92 Introduce comments to clarify context of component usage 2024-05-28 10:09:37 +02:00
dependabot[bot]
7aa532d6c2
Bump the npm-updates group with 4 updates 
Bumps the npm-updates group with 4 updates: [@playwright/test](https://github.com/microsoft/playwright), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [posthog-js](https://github.com/PostHog/posthog-js).


Updates `@playwright/test` from 1.44.0 to 1.44.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.44.0...v1.44.1)

Updates `@typescript-eslint/eslint-plugin` from 7.9.0 to 7.10.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.10.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.9.0 to 7.10.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.10.0/packages/parser)

Updates `posthog-js` from 1.131.4 to 1.135.2
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.131.4...v1.135.2)

---
updated-dependencies:
- dependency-name: "@playwright/test"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-27 15:18:55 +00:00
Caleb Owens
691f8b75bd Update styles 2024-05-27 11:44:02 +02:00
Caleb Owens
a0c29be88e Fix trunk not displaying 2024-05-27 11:42:43 +02:00
Caleb Owens
4fcc3149e5 Improve handling of PRs on the frontend 
This removes the need for "isBranchNameMatch" now that it is valid for multiple remotes to be present, there are no guarentees that a branche's name will be unique
 2024-05-24 16:54:27 +02:00
Pavel Laptev
3f291bd9db
remove console.log (#3870) 2024-05-27 02:42:34 +02:00
Pavel Laptev
e7fd4c4457
UI: Lane and commit messages design (#3868) 
* UI: Remove icons for commit groups

* UI: added paddings

* Added folding base row + styles tweek

* Commits section: update styles

* UI: commit card layout update

* UI: empty commit message style

* UI and refactor

- Update files list UI
- components rename
- show author for upstream commits

* UI updates

- File list history list UI
- Commit card UI

* UI: Commits footer empty state update
 2024-05-26 23:24:53 +02:00
Kiril Videlov
690a1ed589 feat: Update the title of the "Use a Git executable" option 
Mention that is the default for anybody who plays around with the different settings
 2024-05-26 09:54:41 +02:00
Pavel Laptev
198e72612c
Time units shorthand (#3862) 2024-05-25 18:51:05 +02:00
Pavel Laptev
9a42f8b2eb
Copy changes, added commit message (#3860) 2024-05-25 16:37:59 +02:00
Caleb Owens
4cae28668b
Merge branch 'master' into revert-3830-core-util-duration-updates 2024-05-24 14:20:55 +02:00
Pavel Laptev
493f64162a
UI: adde position to dropdown component (#3852) 2024-05-24 14:01:23 +02:00
Mattias Granlund
d9b37ee75b Fix bug always showing 0/n completed checks 2024-05-24 13:02:35 +02:00
Mattias Granlund
867323cfee Fix criteria for showing push button 2024-05-24 13:00:44 +02:00
Mattias Granlund
62755f348e Reduce outbound github requests 
- these changes lead to fewer change detections triggering
 2024-05-24 12:40:22 +02:00
Caleb Owens
b8a1dcb2f0
Revert "Replace integer timestamps with Duration" 2024-05-24 09:40:52 +01:00
Kiril Videlov
c1c07a4c5a Remove "Current" tag and show restore button on all snapshots 
Because snapshots are now created _before_ actions, the one on the top of the list is also undo-able
 2024-05-23 22:48:18 +02:00
Pavel Laptev
3e066d4944
"loading more snapshots" state (#3839) 2024-05-23 21:54:56 +02:00
Mattias Granlund
7a4c625781 Set branch/commit stores only once on init 
- initialse context stores with undefined
- simpler logic for reducing outbound requests/flicker
 2024-05-23 19:12:10 +02:00
Mattias Granlund
753f3a2813 Make better tooltip for commit line avatars 2024-05-23 19:06:53 +02:00
Mattias Granlund
afda601f69 Bugfix determining new upstream commits 2024-05-23 19:01:22 +02:00
Mattias Granlund
f4b3dde2e8 Fix upstream commit card rounded corners 2024-05-23 18:37:33 +02:00
Mattias Granlund
4b3ad4bf61 Nit pick a couple of things in the history service 2024-05-23 18:13:41 +02:00
Mattias Granlund
053c5b3c12 Fix bug in parent/child relationship 
- fixes missing remote -> local root in commit lines ui
 2024-05-23 16:14:01 +02:00
Caleb Owens
e5474d2efa Fix JS tests 2024-05-23 14:45:01 +02:00
Caleb Owens
c2a1f6a7e7 Fix various tests 2024-05-23 14:26:16 +02:00
Caleb Owens
4a7e5f48dd Merge origin/master into core-util-duration-updates 2024-05-23 14:04:54 +02:00
Caleb Owens
d55260c96a Use Duration rather than various integer times for time 2024-05-23 14:02:48 +02:00
Mattias Granlund
9213be55f8 Create shared unknown commits store 2024-05-23 12:24:17 +02:00
Mattias Granlund
021180d8f1 Rename function 2024-05-23 10:58:59 +02:00
Mattias Granlund
044f7ae96e Fix push button bug 2024-05-23 10:58:59 +02:00
Mattias Granlund
af4833f091 Fix a few bugs 2024-05-23 10:58:59 +02:00
Mattias Granlund
12284f33ca Fix a bunch of commit lines issues 2024-05-23 10:58:59 +02:00
Pavel Laptev
e64e787c64
Fix: close context menu on click outside (#3825) 2024-05-23 05:14:59 +02:00
Pavel Laptev
6c4c04c9dc
UI fixes (#3824) 
- content shift fix
- icons updated
- removed `#` from shorten SHA
 2024-05-23 05:01:12 +02:00
Pavel Laptev
14e05adae6
UX/UI: Move collapse lane into kebab menu (#3819) 
* UX/UI: Move `collapse lane ` into kebab menu

- a few `click` events replaced with `mousedown` in order to invoke actions without confirmation

* header style update

* Context menu item: fix disabled cursor
 2024-05-22 18:25:11 +02:00
Kiril Videlov
de79c024ed style: Add text style to BranchFooter component. 2024-05-22 14:44:23 +02:00
Kiril Videlov
8a88b26d4e
Merge pull request #3812 from gitbutlerapp/add-reload-functionality-folder-history 
reload after restoring a snapshot
 2024-05-22 12:16:50 +02:00
Kiril Videlov
d792d4fee9 reload after restoring a snapshot 2024-05-22 11:13:18 +02:00
Scott Chacon
cba5b7ca6d
Merge pull request #3788 from gitbutlerapp/show-local-branches 
show local branches
 2024-05-22 11:08:42 +02:00
Caleb Owens
a0d7ae1445 Rename function to better indicate functionality 2024-05-22 10:53:41 +02:00
Scott Chacon
8b7fe790e5 return all local branches as well as remote ones 
also deduplicate them in the branch listing
 2024-05-22 10:45:29 +02:00
lisiur
31d9576991 lint 2024-05-22 16:44:51 +08:00
lisiur
bcdd5f68fe lint 2024-05-22 16:37:18 +08:00
lisiur
b779f6fbbf Extract cleanUrl and add tests 2024-05-22 16:13:41 +08:00
LisiurDay
f52c5ae358
lint 2024-05-22 14:50:41 +08:00
lisiur
038dba6710 fix: Update cleanUrl method to handle ssh URLs 2024-05-22 14:43:25 +08:00
Pavel Laptev
647cbb3cac
Better days separation (#3806) 2024-05-22 00:51:47 +02:00
Pavel Laptev
ec8b171fc7
Project menu items update + new "Open in VS code" (#3804) 2024-05-21 23:57:38 +02:00
Caleb Owens
0085c0901d
Merge pull request #3802 from anaisbetts/disallow-unc-paths 
Disallow UNC paths
 2024-05-21 12:27:34 +01:00
Ani Betts
eece290edd
Stop users from adding project paths that won't work 2024-05-21 12:44:10 +02:00
Ani Betts
4e68e593e5
Stop trashing every file on Prettier 2024-05-21 12:37:39 +02:00
Caleb Owens
b061537952 Use ScrollableContainer's bottomReached event to load more 
Bit of a refactor over my async/await based gradual rendering.

It was still struggling if you had in the neigherbourhood of 9000 files, so this will only render as the user scrolls down.

There is still the issue of scrolling taking quite a long time, but it feels like the solution would need to be a floating commit button.
 2024-05-21 10:38:22 +01:00
Mattias Granlund
b1cf9b4e10 Fix shadow line height in commits section 2024-05-21 10:32:31 +02:00
Pavel Laptev
6e6272983b
History and minor UI fixes (#3797) 
* Convert Capital case to Uper case "History menu"

* UI updates: target branch styles

* Remove console.log

* CSS: space between "Trunk" and the timer

* UI: reversed chevron arrows fix

* remove commented console.log

* UX: toggle file preview in History

* UI: target branch set animation fix
 2024-05-21 01:07:22 +02:00
Pavel Laptev
8c78395ca3
History fixes (#3796) 
* History fixes

- fix footrer button
- added a method to listed if there are no snapshots to load
- style fixes

* formatting
 2024-05-20 19:28:03 +02:00
Kiril Videlov
e3cb98d1ee
Merge pull request #3790 from gitbutlerapp/update-ipc-code 
Update IPC imports and remove old logic
 2024-05-19 23:16:47 +02:00
Kiril Videlov
330b48003b make GitGuardian happy 2024-05-19 19:01:43 +02:00
Kiril Videlov
89295f8933 bump playwright version 2024-05-19 17:30:37 +02:00
Kiril Videlov
60fcfde2fb add vitest exclude for node_modules 2024-05-19 16:53:36 +02:00
Caleb Owens
fa973fd8f1 Remove unused exports from ipc 2024-05-19 15:43:07 +01:00
Caleb Owens
87a10e2bd3 Update auth.ts to use absolute import 2024-05-19 15:43:07 +01:00
Caleb Owens
c1f295f6f4 Use correct invoke function 2024-05-19 15:43:07 +01:00
Kiril Videlov
9875dff1d7 Merge branch 'master' into ndom91/add-playwright-test 2024-05-19 16:28:47 +02:00
Kiril Videlov
07b863731f
Merge pull request #3785 from gitbutlerapp/fix-ollama-request-security 
Fix ollama request security
 2024-05-18 18:08:39 +02:00
Caleb Owens
6ae9b7ff6e Fix ollama request security 2024-05-18 16:51:20 +01:00
Kiril Videlov
92951b504e feat: Set default snapshot lines threshold to 20 when undefined 2024-05-18 16:49:20 +02:00
Caleb Owens
c1840b5b75 Minor tweaks to CSS and use real branch name 2024-05-18 00:16:58 +01:00
Mattias Granlund
425289e10a Unmount history component when hidden 
- history service resets as history component is unmounted
- restores functionality I changed in my previous commit
 2024-05-17 20:04:22 +02:00
Mattias Granlund
ec24ffe979 Fix bug leaving PR button visible 2024-05-17 20:03:41 +02:00
Mattias Granlund
c699ad4dfa Small refactor of history component 2024-05-17 18:51:47 +02:00
Kiril Videlov
f7e11b696c feat: Add readonly prop for HunkContextMenu and HunkViewer 
Add readonly prop to HunkContextMenu and HunkViewer components for handling
readonly functionality.
 2024-05-17 12:56:42 +02:00
Pavel Laptev
072cbd65e7
Removed old history component (#3774) 2024-05-17 09:28:45 +02:00
Pavel Laptev
1be1218a71
History View UI (#3773) 
* Separated History logic layout into components

* Layout update, components split and cover new data

* Added file preview

* handle event trigger

* empty states added

* Temp store for snapshot files + threshold section

* formatting

* added a gap between elements in footer

* CSS: padding fix
 2024-05-17 01:21:19 +02:00
Vid Luther
db0daf56f5 Remove AISettings.svelte 
Remove AISettings.svelte as it has been replaced with src/routes/ai/+page.svelte
 2024-05-16 10:11:32 -05:00
Vid Luther
25015edfb9 feat: update GPT4Turbo model name 
Change GPT4Turbo enum from 'gpt-4-turbo-preview' to 'gpt-4-turbo'
to reflect the transition of the model from preview to general
availability. This update ensures our application references the
correct model version in line with OpenAI's latest offerings.
 2024-05-16 09:02:37 -05:00
Vid Luther
a1b885b218
Merge branch 'gitbutlerapp:master' into add-gpt4o-model-support 2024-05-16 08:59:07 -05:00
Vid Luther
f0ff3433d9 feat: add GPT 4 Omni model to AI settings 
Add GPT 4 Omni model to the AISettings component, the
OpenAIModelName enumeration, and the +page.svelte file. This enables
users to select the new model in settings.
 2024-05-16 08:54:26 -05:00
Mattias Granlund
1e4da9a00e Fix commit card widths 2024-05-16 15:32:30 +02:00
Mattias Granlund
5cdf0b830e Fix rendering of upstream commits when remote commits exist 2024-05-16 15:32:30 +02:00
Mattias Granlund
364cacd775 Consider a branch "not pushed" if there are upstream commits 2024-05-16 15:32:30 +02:00
Mattias Granlund
61a0f817c0 Use custom tooltip in avatar component 2024-05-16 15:32:30 +02:00
Caleb Owens
27535ca409
Merge pull request #3741 from estib-vega/master 
feat: Add support for Ollama
 2024-05-16 07:00:21 +01:00
Mattias Granlund
31f1cb8607 Refactor commits section of branch lanes 
Fix remote lane line issue
Drop unused file
Fix criteria for showing push button
Fix alignment of avatar for local commit
Fix criteria for showing pus/rebase button
Show tooltip on shadow commit marker hover
Add missing type param to CommitCard
Fix lint
Remove extraneous parameter
Drop a couple of console.log() calls
 2024-05-16 01:19:38 +02:00
Mattias Granlund
deb1db188b Add parent/children props to commits 2024-05-16 01:19:38 +02:00
Scott Chacon
9e817b4d04
Merged origin/master into add-commit-id 2024-05-15 10:43:34 +02:00
Caleb Owens
6000ec6ae6 Allow multi-message prompt templates 2024-05-15 08:09:37 +01:00
Caleb Owens
a4a05b0c4c Fix sorting for commit messages 2024-05-15 07:33:23 +01:00
estib
6200b950c6 Ollama client: Add meta-prompt guardrails 
- Add some formatting meta-prompts to the chat commands for increased consistency
- Separate steps into private methods
 2024-05-14 21:03:14 +01:00
Caleb Owens
3ec7143201 Implement ollama client 2024-05-14 21:03:14 +01:00
Caleb Owens
27583248d8 Remove no-longer-required ts-expect-error 2024-05-14 21:03:14 +01:00
Caleb Owens
efca8a2db2 Updated enums 
- Removed duplicated ModelKind enum
- Fixed enum spelling
 2024-05-14 21:03:14 +01:00
Caleb Owens
032408a761 Update prompt to emphisise only responding with the commit message 2024-05-14 21:03:14 +01:00
Scott
520d95aef2 merge upstream 2024-05-14 14:07:09 +00:00
Kiril Videlov
e93ddfac34
snapshot of restores keeps more metadata 2024-05-14 16:04:02 +02:00
Kiril Videlov
8bae084518
snapshots for move hunk include branch name 2024-05-14 14:55:27 +02:00
Kiril Videlov
631bc86031
snapshots of (un)appy branches contains name 2024-05-14 14:35:47 +02:00
Scott Chacon
202c551bc7
remove signing setting 2024-05-14 13:15:11 +02:00
Scott Chacon
d944cad533 merge upstream 
temp
 2024-05-14 10:25:29 +02:00
Kiril Videlov
80148f50fe
add sha to undo commit snapshot 2024-05-13 16:37:37 +02:00
Kiril Videlov
8849c9845e
add sha to commit snapshot 2024-05-13 16:24:40 +02:00
Scott Chacon
4eaf7d2b1d
prettier 2024-05-13 14:19:59 +02:00
Kiril Videlov
62dadd96a8
remove unused index subscription 2024-05-13 14:18:56 +02:00
Kiril Videlov
06dfc95692
add message trailer for commit snapshots 2024-05-13 01:07:42 +02:00
Kiril Videlov
af95a898cb
Merge pull request #3756 from gitbutlerapp/dependabot/npm_and_yarn/npm-updates-495e94661d 
Bump the npm-updates group across 1 directory with 13 updates
 2024-05-13 00:23:17 +02:00
dependabot[bot]
91bc6f0a10
Bump the npm-updates group across 1 directory with 13 updates 
Bumps the npm-updates group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@tauri-apps/cli](https://github.com/tauri-apps/tauri) | `1.5.12` | `1.5.13` |
| [openai](https://github.com/openai/openai-node) | `4.38.5` | `4.45.0` |
| [@codemirror/lang-python](https://github.com/codemirror/lang-python) | `6.1.5` | `6.1.6` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.112.2` | `7.114.0` |
| [@tauri-apps/api](https://github.com/tauri-apps/tauri) | `1.5.4` | `1.5.5` |
| [@types/diff](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff) | `5.2.0` | `5.2.1` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.7.1` | `7.8.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.7.1` | `7.8.0` |
| [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) | `2.38.0` | `2.39.0` |
| [postcss-load-config](https://github.com/postcss/postcss-load-config) | `5.0.3` | `5.1.0` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.130.1` | `1.131.4` |
| [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) | `4.2.15` | `4.2.16` |
| [svelte-check](https://github.com/sveltejs/language-tools) | `3.7.0` | `3.7.1` |



Updates `@tauri-apps/cli` from 1.5.12 to 1.5.13
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.12...@tauri-apps/cli-v1.5.13)

Updates `openai` from 4.38.5 to 4.45.0
- [Release notes](https://github.com/openai/openai-node/releases)
- [Changelog](https://github.com/openai/openai-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openai/openai-node/compare/v4.38.5...v4.45.0)

Updates `@codemirror/lang-python` from 6.1.5 to 6.1.6
- [Changelog](https://github.com/codemirror/lang-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-python/compare/6.1.5...6.1.6)

Updates `@sentry/sveltekit` from 7.112.2 to 7.114.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.114.0/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.112.2...7.114.0)

Updates `@tauri-apps/api` from 1.5.4 to 1.5.5
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/api-v1.5.4...@tauri-apps/api-v1.5.5)

Updates `@types/diff` from 5.2.0 to 5.2.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff)

Updates `@typescript-eslint/eslint-plugin` from 7.7.1 to 7.8.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.8.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.7.1 to 7.8.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.8.0/packages/parser)

Updates `eslint-plugin-svelte` from 2.38.0 to 2.39.0
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.38.0...v2.39.0)

Updates `postcss-load-config` from 5.0.3 to 5.1.0
- [Release notes](https://github.com/postcss/postcss-load-config/releases)
- [Changelog](https://github.com/postcss/postcss-load-config/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-load-config/compare/v5.0.3...5.1.0)

Updates `posthog-js` from 1.130.1 to 1.131.4
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.130.1...v1.131.4)

Updates `svelte` from 4.2.15 to 4.2.16
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.16/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.16/packages/svelte)

Updates `svelte-check` from 3.7.0 to 3.7.1
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.7.0...svelte-check-3.7.1)

---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: openai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@codemirror/lang-python"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@tauri-apps/api"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@types/diff"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: postcss-load-config
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-12 22:11:09 +00:00
Kiril Videlov
e2aa78dac2
Merge pull request #3696 from imcotton/patch-1 
build: adopt to resolve.conditions: es2015
 2024-05-12 23:59:04 +02:00
Kiril Videlov
c75d31f7c9
Merge pull request #3755 from gitbutlerapp/update-octokit-rest-version 
fix octokit/rest type for new version
 2024-05-12 23:55:23 +02:00
Kiril Videlov
1e14f5095c
fix octokit/rest type for new version 
GitHub change their API in patch versions lol
 2024-05-12 23:53:58 +02:00
Pavel Laptev
28b5dd85d0
Refactor: remove wrong alt on file list items (#3754) 2024-05-12 23:34:36 +02:00
Kiril Videlov
262bbd8df7
on snapshot store branch name metadata 2024-05-12 19:49:51 +02:00
Kiril Videlov
217efbc932 remove unused project_flush_and_push 2024-05-11 20:52:05 +02:00
Scott Chacon
4d542330c5 merge stuff 2024-05-11 11:43:06 +02:00
Kiril Videlov
df5d72b908 add mock usage for getting snapshot diffs 2024-05-09 11:25:08 -07:00
Kiril Videlov
8b6333237e add more details to undo ui 2024-05-08 01:35:24 +02:00
Scott Chacon
ff11fcdb90 Add change-id property to commit 
Each commit has a change-id added to it's header field so we can more easily track patches by unique ids
 2024-05-07 10:28:29 +02:00
Kiril Videlov
01576361aa
Merge pull request #3716 from gitbutlerapp/list-snapshots-with-optional-sha-1 
snapshot list pagination
 2024-05-07 01:15:17 +02:00
Pavel Laptev
f83fa5f669
Refactor: Remove vertical orientation as a prop (#3717) 2024-05-07 00:51:34 +02:00
Kiril Videlov
1bc41a9146 snapshot list pagination 2024-05-07 00:46:22 +02:00
Caleb Owens
15cbe8bc01 Add cmd+R to reload the page 2024-05-06 16:57:20 +01:00
Kiril Videlov
0091bfa1eb
Merge pull request #3688 from gitbutlerapp/resolve-large-quantity-of-files-slow-start 
Optimize list_virtual_branches
 2024-05-06 16:43:30 +02:00
Scott Chacon
d79bf65e51
Merge pull request #3677 from gitbutlerapp/target-branch-selector-fix 
initial implementation of different push target
 2024-05-06 16:31:01 +02:00
ndom91
565140e832
fix: eslint ignore e2e dir for now 2024-05-06 15:50:24 +02:00
Kiril Videlov
42d8e6fd5d
show extra snapshot details in ui 2024-05-06 15:34:42 +02:00
Scott Chacon
c3ac916c32 link to cross-repo unified diff on github 2024-05-06 15:30:38 +02:00
Scott Chacon
ca634807b1
Merge branch 'master' into target-branch-selector-fix 2024-05-06 13:49:27 +02:00
ndom91
414e0d121e
Merge branch 'ndom91/add-playwright-test' of github.com:ndom91/gitbutler into ndom91/add-playwright-test 2024-05-06 13:49:03 +02:00
ndom91
96d62c9cb9
chore: eslint fix import order 2024-05-06 13:48:59 +02:00
Pavel Laptev
358292dc1c
Refactor CSS and code (#3703) 
- Modal trigger code refactor
- Unused CSS removed
 2024-05-06 13:19:51 +02:00
Nico Domino
512b5c2b8e
Discard changes to app/src/app.html 2024-05-06 13:06:34 +02:00
ndom91
a6968438a2
chore: prettier 2024-05-06 13:06:13 +02:00
ndom91
80f517b13b
chore: cleanup app/package.json 2024-05-06 13:01:22 +02:00
ndom91
72be19a3f2
chore: cleanup fixtures 2024-05-06 12:59:41 +02:00
ndom91
1081ca1c6d
chore: cleanup playwright utils 2024-05-06 12:41:00 +02:00
Josh Junon
cf74b12a3c
Merge pull request #3693 from gitbutlerapp/Help-window-menu 
"Help" window menu
 2024-05-06 12:37:14 +02:00
Cotton Hou
df7fa842b9 build: adopt to resolve.conditions: es2015 2024-05-06 15:53:43 +08:00
Caleb Owens
645726ab93 Render files in chunks of 100 
Rendering the files in chunks of 100 prevents the UI from completly locking up. It is a little slugish until it finishes rendering (for the same 2 seconds), but is a markable improvement none hte less
 2024-05-06 01:44:26 +01:00
Caleb Owens
85e3420f23 Drastically improve render performance 
When rendering 1900 odd files, flexbox can cause performance issues due to having to recalculate many times.

I've removed a selection of un-needed flex declarations which has improved perfomrance sugnificantly.
 2024-05-06 00:31:11 +01:00
Kiril Videlov
08eba701fb
add some details to the undo interface 2024-05-06 00:19:22 +02:00
Pavel Laptev
6d9848e3d7
lint fixes 2024-05-05 22:18:59 +02:00
Pavel Laptev
e38e68477b
lint fixes 2024-05-05 21:57:45 +02:00
Pavel Laptev
043917ad45
Help window menu added 2024-05-05 21:40:06 +02:00
ndom91
1c28117beb
fix: revert test back to passing 2024-05-05 20:22:01 +02:00
ndom91
90185976ca
fix(gha): use correct artifact dir 2024-05-05 20:05:03 +02:00
ndom91
2317f39754
chore(gha): test failing tests and uploading report 2024-05-05 19:52:29 +02:00
ndom91
23031d3906
fix(gha): bump timeout and always start dev server with pwt 2024-05-05 19:38:26 +02:00
ndom91
c3c12bedd1
fix(gha): install correct chromium versions in CI 2024-05-05 19:33:48 +02:00
ndom91
248f8df3a5
chore(test): cleanup playwright initial test 2024-05-05 19:04:07 +02:00
ndom91
5798371613
fix: root layout with 'master' changes 2024-05-05 19:03:55 +02:00
ndom91
1e3931e5e3
fix: cleanup playwright.config 2024-05-05 18:58:33 +02:00
ndom91
b875280a4e
fix: cleanup playwright.config for CI 2024-05-05 18:56:09 +02:00
Nico Domino
a0d6deb4a7
Merge branch 'master' into ndom91/add-playwright-test 2024-05-05 18:48:08 +02:00
ndom91
440ac0145a
feat: add test to check changed files 2024-05-05 18:44:55 +02:00
ndom91
25fea8e35a
chore: cleanup unnecessary deps 2024-05-05 18:33:40 +02:00
ndom91
3d7f20d4a7
fix: cleanup testing overrides 2024-05-05 18:25:16 +02:00
ndom91
1c265e1bae
fix: define pnpm 8 2024-05-05 18:24:56 +02:00
ndom91
0f9e5043a2
feat: more fixtures and mocks 2024-05-05 18:16:48 +02:00
ndom91
2a7a84e655
fix: cleanup repo 2024-05-05 18:16:39 +02:00
Pavel Laptev
4d5f77b7f4
Merge branch 'master' into target-branch-selector-fix 2024-05-04 23:30:54 +02:00
Pavel Laptev
09113fec2f fix layout on project setup 
- fix text when open `login page` in a browser
- remove `name` from Toggle. We didn't use it
- fields layout updated
 2024-05-04 23:26:08 +02:00
Pavel Laptev
88f840174f Branch configuration fixes 
- remove console.logs
- in the Select dropdown fix preselecting default values on reload
- replace `===` with `==` (our style guide)
- undisable `Update configuration` if one of the fields were changed
 2024-05-04 21:39:57 +02:00
ndom91
6244a67972
fix: cleanup wdio 2024-05-04 19:29:50 +02:00
ndom91
4c2d3a137b
fix: enable initial mockIPC 2024-05-04 19:28:29 +02:00
Kiril Videlov
d2a51e84e9
Merge pull request #3682 from gitbutlerapp/improve-advanced-commit-options 
Improve advanced commit options
 2024-05-04 01:47:21 -07:00
Pavel Laptev
c0cc85688f Updated branch switch on the Settings page 
- copy updated
- layout updated
- select component max-height fixed
 2024-05-04 00:41:15 +02:00
Pavel Laptev
fb6dd2429e CSS fix: truncate long base branch names 2024-05-03 22:39:36 +02:00
Caleb Owens
32a8992af6 Add some basic test cases for normalizeBranchName 2024-05-03 20:16:02 +01:00
Caleb Owens
63ee99b647 Update the normalizeBranchName function to match rust 
Before, uppercase letters and hashes were missing from the regex. I've now coppied the regex from the rust code so they are now identical
 2024-05-03 20:09:22 +01:00
Caleb Owens
fe30db9760 Change metric for "undoable" 
We have two types of commits "RemoteCommit" and "Commit". "RemoteCommit" are what we see in the "Upstream" section, and in branches. These commits can't be undone.

Commits of type "Commit" appear in the "Local" and "Remote" sections and are undoable
 2024-05-03 19:49:40 +01:00
Caleb Owens
601d6ba809 Grey out commit buttons when title isnt present 2024-05-03 19:41:45 +01:00
Caleb Owens
c4108dc22c Only show edit title option when commit is undoable 2024-05-03 19:32:30 +01:00
Caleb Owens
6982909689 Use stop propagation to prevent card closing 2024-05-03 19:14:24 +01:00
Caleb Owens
f8109368f3 Improve UI of advanced commit options 2024-05-03 19:10:28 +01:00
Scott Chacon
6c7e07f325 move my cloud stuff to pavels branchswitch thing 2024-05-03 13:48:16 +02:00
Scott Chacon
0442744c13
Merge branch 'master' into target-branch-selector-fix 2024-05-03 11:26:16 +02:00
Scott Chacon
5527d2b6e2 initial implementation of different push target 2024-05-03 11:20:47 +02:00
Kiril Videlov
c312e7a287
puts advanced commit ops behind a feature flag 2024-05-02 14:57:32 +02:00
ndom91
01e8a4d28d
chore: WIP 2024-05-02 14:55:41 +02:00
Pavel Laptev
5ba8243fd7
Experimental features toggle card fix (#3670) 2024-05-02 14:16:27 +02:00
Pavel Laptev
a73089718d
Text case fix (#3669) 
* Text case fix
 2024-05-02 13:58:34 +02:00
Kiril Videlov
3b7387a4b3
put base branch switching behind a feature flag 2024-05-02 11:58:31 +02:00
Kiril Videlov
3326ae6b81 feat: a place in the settings for feature flags 2024-05-02 11:51:06 +02:00
Scott Chacon
ac4188819a
Merge pull request #3661 from gitbutlerapp/base-branch-commit-card-fix 
Base branch commit cards should not be editable
 2024-05-02 11:36:37 +02:00
Pavel Laptev
d7d4d0fef9
Switch base branch move to project settings (#3662) 
* Remove scrollIntoView from select

- It cause the whole page scroll. For now I deleted this, but it's a nice feature, so planning to fix ti later

* Return `branch` in `setTargetBranch`

Because the result of this async function was `undefined`

* Updated `TextBox` and `SelectItem` styles

* Move base branch switcher to the `Setting` page
 2024-05-02 11:29:37 +02:00
Scott Chacon
5f1559aff6 Base branch commit cards should not be editable 2024-05-02 11:12:16 +02:00
Daniel Woodward
0dfdaa5f79
fix: .branch-switcher styling in dark mode 2024-05-01 22:15:44 +01:00