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
Kiril Videlov
2035bcf1ce
Merge pull request #3767 from anaisbetts/dont-use-home-env
...
Don't use $HOME
2024-05-16 11:38:06 +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
Ani Betts
69cf9c8058
Don't use HOME env var
...
This environment variable doesn't exist on Windows
2024-05-15 17:39:23 +02:00
Ani Betts
1695ad5c53
Add dirs crate
2024-05-15 17:39:00 +02:00
Scott Chacon
4b683828cd
Merge pull request #3721 from gitbutlerapp/add-commit-id
...
Add change-id property to commit
2024-05-15 13:37:11 +00:00
Scott Chacon
5becf4e6a6
small fixes
2024-05-15 15:24:08 +02:00
Scott Chacon
b0c5c07a57
some change-id based tests
2024-05-15 15:21:19 +02:00
Scott Chacon
2ce4e5bfd0
remove a bunch of debugging
2024-05-15 14:48:26 +02:00
Scott Chacon
d267dbc77d
rust is not my favorite language
2024-05-15 13:40:27 +02:00
Scott Chacon
a23253e57d
who committed this?
2024-05-15 11:14:05 +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
Kiril Videlov
b2f8ab589e
Merge pull request #3764 from gitbutlerapp/update-restore-snapshot-functionality
...
snapshot of restores keeps more metadata
2024-05-14 16:57:07 +02: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
569b792b34
Merge pull request #3763 from gitbutlerapp/move-hunk-branch-updates-implementation
...
snapshots for move hunk include branch name
2024-05-14 15:10:48 +02:00
Kiril Videlov
8bae084518
snapshots for move hunk include branch name
2024-05-14 14:55:27 +02:00
Kiril Videlov
2110c26680
Merge pull request #3762 from gitbutlerapp/apply-unapply-branch-functions-fix
...
snapshots of (un)appy branches contains name
2024-05-14 14:48:39 +02:00
Kiril Videlov
631bc86031
snapshots of (un)appy branches contains name
2024-05-14 14:35:47 +02:00
Scott Chacon
4cde9ce71d
windows doesn't have permissions like this
2024-05-14 13:43:49 +02:00
Scott Chacon
202c551bc7
remove signing setting
2024-05-14 13:15:11 +02:00
Scott Chacon
b5c9f934d5
supporting gpg.ssh.program
2024-05-14 11:57:23 +02:00
Scott Chacon
d944cad533
merge upstream
...
temp
2024-05-14 10:25:29 +02:00
Scott Chacon
f106bfa246
basic ssh signing too
2024-05-14 10:08:22 +02:00
Kiril Videlov
158ed5c15d
Merge pull request #3760 from gitbutlerapp/update-snapshot-commit-creation-impl
...
update-snapshot-commit-creation-impl
2024-05-13 16:49:01 +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
b17ab37a01
actually run gpg if specified
2024-05-13 16:19:45 +02:00
Kiril Videlov
7c8b6beec6
Merge pull request #3759 from gitbutlerapp/project-subscribe-listen-ipc-delete
...
remove unused index subscription
2024-05-13 14:31:56 +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
b50ab35503
Merge pull request #3757 from gitbutlerapp/snapshot-commit-creation-update
...
add message trailer for commit snapshots
2024-05-13 01:24:38 +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
1f01503657
Merge pull request #3753 from gitbutlerapp/Virtual-branch
...
enable the new oplog snapshotting by default
2024-05-12 23:54:38 +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
Kiril Videlov
81e948774f
fix test
2024-05-12 23:42:04 +02:00
