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
6,799 Commits 151 Branches 1,064 Tags 60 MiB
27535ca409
Commit Graph

211 Commits

Author SHA1 Message Date
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
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
Pavel Laptev
358292dc1c
Refactor CSS and code (#3703) 
- Modal trigger code refactor
- Unused CSS removed
 2024-05-06 13:19:51 +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