gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 06:22:28 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,228 Commits 151 Branches 1,064 Tags 60 MiB
07ed7c8a88
Commit Graph

365 Commits

Author SHA1 Message Date
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