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
ndom91
565140e832
fix: eslint ignore e2e dir for now
2024-05-06 15:50:24 +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
ndom91
414e0d121e
Merge branch 'ndom91/add-playwright-test' of github.com:ndom91/gitbutler into ndom91/add-playwright-test
2024-05-06 13:49:03 +02:00
ndom91
96d62c9cb9
chore: eslint fix import order
2024-05-06 13:48:59 +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
Nico Domino
512b5c2b8e
Discard changes to app/src/app.html
2024-05-06 13:06:34 +02:00
ndom91
a6968438a2
chore: prettier
2024-05-06 13:06:13 +02:00
ndom91
80f517b13b
chore: cleanup app/package.json
2024-05-06 13:01:22 +02:00
ndom91
72be19a3f2
chore: cleanup fixtures
2024-05-06 12:59:41 +02:00
ndom91
1081ca1c6d
chore: cleanup playwright utils
2024-05-06 12:41:00 +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
Pavel Laptev
e38e68477b
lint fixes
2024-05-05 21:57:45 +02:00
Pavel Laptev
043917ad45
Help window menu added
2024-05-05 21:40:06 +02:00
ndom91
1c28117beb
fix: revert test back to passing
2024-05-05 20:22:01 +02:00
ndom91
90185976ca
fix(gha): use correct artifact dir
2024-05-05 20:05:03 +02:00
ndom91
2317f39754
chore(gha): test failing tests and uploading report
2024-05-05 19:52:29 +02:00
ndom91
23031d3906
fix(gha): bump timeout and always start dev server with pwt
2024-05-05 19:38:26 +02:00
ndom91
c3c12bedd1
fix(gha): install correct chromium versions in CI
2024-05-05 19:33:48 +02:00
ndom91
248f8df3a5
chore(test): cleanup playwright initial test
2024-05-05 19:04:07 +02:00
ndom91
5798371613
fix: root layout with 'master' changes
2024-05-05 19:03:55 +02:00
ndom91
1e3931e5e3
fix: cleanup playwright.config
2024-05-05 18:58:33 +02:00
ndom91
b875280a4e
fix: cleanup playwright.config for CI
2024-05-05 18:56:09 +02:00
Nico Domino
a0d6deb4a7
Merge branch 'master' into ndom91/add-playwright-test
2024-05-05 18:48:08 +02:00
ndom91
440ac0145a
feat: add test to check changed files
2024-05-05 18:44:55 +02:00
ndom91
25fea8e35a
chore: cleanup unnecessary deps
2024-05-05 18:33:40 +02:00
ndom91
3d7f20d4a7
fix: cleanup testing overrides
2024-05-05 18:25:16 +02:00
ndom91
1c265e1bae
fix: define pnpm 8
2024-05-05 18:24:56 +02:00
ndom91
0f9e5043a2
feat: more fixtures and mocks
2024-05-05 18:16:48 +02:00
ndom91
2a7a84e655
fix: cleanup repo
2024-05-05 18:16:39 +02:00
Pavel Laptev
4d5f77b7f4
Merge branch 'master' into target-branch-selector-fix
2024-05-04 23:30:54 +02:00
Pavel Laptev
09113fec2f
fix layout on project setup
...
- fix text when open `login page` in a browser
- remove `name` from Toggle. We didn't use it
- fields layout updated
2024-05-04 23:26:08 +02:00
Pavel Laptev
88f840174f
Branch configuration fixes
...
- remove console.logs
- in the Select dropdown fix preselecting default values on reload
- replace `===` with `==` (our style guide)
- undisable `Update configuration` if one of the fields were changed
2024-05-04 21:39:57 +02:00
ndom91
6244a67972
fix: cleanup wdio
2024-05-04 19:29:50 +02:00
ndom91
4c2d3a137b
fix: enable initial mockIPC
2024-05-04 19:28:29 +02:00
Kiril Videlov
d2a51e84e9
Merge pull request #3682 from gitbutlerapp/improve-advanced-commit-options
...
Improve advanced commit options
2024-05-04 01:47:21 -07:00
Pavel Laptev
c0cc85688f
Updated branch switch on the Settings page
...
- copy updated
- layout updated
- select component max-height fixed
2024-05-04 00:41:15 +02:00
Pavel Laptev
fb6dd2429e
CSS fix: truncate long base branch names
2024-05-03 22:39:36 +02:00
Caleb Owens
32a8992af6
Add some basic test cases for normalizeBranchName
2024-05-03 20:16:02 +01:00
Caleb Owens
63ee99b647
Update the normalizeBranchName function to match rust
...
Before, uppercase letters and hashes were missing from the regex. I've now coppied the regex from the rust code so they are now identical
2024-05-03 20:09:22 +01:00
Caleb Owens
fe30db9760
Change metric for "undoable"
...
We have two types of commits "RemoteCommit" and "Commit". "RemoteCommit" are what we see in the "Upstream" section, and in branches. These commits can't be undone.
Commits of type "Commit" appear in the "Local" and "Remote" sections and are undoable
2024-05-03 19:49:40 +01:00
Caleb Owens
601d6ba809
Grey out commit buttons when title isnt present
2024-05-03 19:41:45 +01:00
Caleb Owens
c4108dc22c
Only show edit title option when commit is undoable
2024-05-03 19:32:30 +01:00
Caleb Owens
6982909689
Use stop propagation to prevent card closing
2024-05-03 19:14:24 +01:00
Caleb Owens
f8109368f3
Improve UI of advanced commit options
2024-05-03 19:10:28 +01:00
Scott Chacon
6c7e07f325
move my cloud stuff to pavels branchswitch thing
2024-05-03 13:48:16 +02:00
Scott Chacon
0442744c13
Merge branch 'master' into target-branch-selector-fix
2024-05-03 11:26:16 +02:00
Scott Chacon
5527d2b6e2
initial implementation of different push target
2024-05-03 11:20:47 +02:00
Kiril Videlov
c312e7a287
puts advanced commit ops behind a feature flag
2024-05-02 14:57:32 +02:00
ndom91
01e8a4d28d
chore: WIP
2024-05-02 14:55:41 +02:00
Pavel Laptev
5ba8243fd7
Experimental features toggle card fix ( #3670 )
2024-05-02 14:16:27 +02:00
Pavel Laptev
a73089718d
Text case fix ( #3669 )
...
* Text case fix
2024-05-02 13:58:34 +02:00
Kiril Videlov
3b7387a4b3
put base branch switching behind a feature flag
2024-05-02 11:58:31 +02:00
Kiril Videlov
3326ae6b81
feat: a place in the settings for feature flags
2024-05-02 11:51:06 +02:00
Scott Chacon
ac4188819a
Merge pull request #3661 from gitbutlerapp/base-branch-commit-card-fix
...
Base branch commit cards should not be editable
2024-05-02 11:36:37 +02:00
Pavel Laptev
d7d4d0fef9
Switch base branch move to project settings ( #3662 )
...
* Remove scrollIntoView from select
- It cause the whole page scroll. For now I deleted this, but it's a nice feature, so planning to fix ti later
* Return `branch` in `setTargetBranch`
Because the result of this async function was `undefined`
* Updated `TextBox` and `SelectItem` styles
* Move base branch switcher to the `Setting` page
2024-05-02 11:29:37 +02:00
Scott Chacon
5f1559aff6
Base branch commit cards should not be editable
2024-05-02 11:12:16 +02:00
Daniel Woodward
0dfdaa5f79
fix: .branch-switcher
styling in dark mode
2024-05-01 22:15:44 +01:00
Pavel Laptev
b8f689397e
Fix: setting toggle ( #3650 )
2024-05-01 02:11:22 +02:00