gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,204 Commits 151 Branches 1,064 Tags 60 MiB
78c4fedbbe
Commit Graph

348 Commits

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