Commit Graph

407 Commits

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