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
6,531 Commits 151 Branches 1,064 Tags 60 MiB
1255dbc2fe
Commit Graph

131 Commits

Author SHA1 Message Date
Mattias Granlund
1255dbc2fe Show {completed}/{total} while running checks 2024-04-30 18:55:52 +02:00
Pavel Laptev
142ba34cdf
fix: close modal on brunch delete (#3644) 2024-04-30 18:52:39 +02:00
Mattias Granlund
088b919a2a Drop unused global.d.ts 2024-04-30 18:41:46 +02:00
Mattias Granlund
cef0b17089 Fix bug where branch appeared remote when in fact virtual 2024-04-30 18:31:50 +02:00
Mattias Granlund
232ea70739
Merge pull request #3640 from gitbutlerapp/update-base-text-size 
style: fix font size in text-base-body-10 class
 2024-04-30 18:23:49 +02:00
Mattias Granlund
b89e83b5bd style: fix font size in text-base-body-10 class 2024-04-30 18:16:14 +02:00
Pavel Laptev
0d80c7e6f2
Refactor: Modal component (#3639) 2024-04-30 16:05:58 +02:00
Josh Junon
3ff409708f
disable posthog recording on frontend 2024-04-30 11:38:50 +02:00
dependabot[bot]
7c0665e457 Bump the npm-updates group with 9 updates 
Bumps the npm-updates group with 9 updates:

| Package | From | To |
| --- | --- | --- |
| [@tauri-apps/cli](https://github.com/tauri-apps/tauri) | `1.5.11` | `1.5.12` |
| [openai](https://github.com/openai/openai-node) | `4.38.2` | `4.38.5` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.111.0` | `7.112.2` |
| [@tauri-apps/api](https://github.com/tauri-apps/tauri) | `1.5.3` | `1.5.4` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.7.0` | `7.7.1` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.7.0` | `7.7.1` |
| [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) | `2.37.0` | `2.38.0` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.128.2` | `1.130.1` |
| [svelte-check](https://github.com/sveltejs/language-tools) | `3.6.9` | `3.7.0` |


Updates `@tauri-apps/cli` from 1.5.11 to 1.5.12
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.11...@tauri-apps/cli-v1.5.12)

Updates `openai` from 4.38.2 to 4.38.5
- [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.2...v4.38.5)

Updates `@sentry/sveltekit` from 7.111.0 to 7.112.2
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.111.0...7.112.2)

Updates `@tauri-apps/api` from 1.5.3 to 1.5.4
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/api-v1.5.3...@tauri-apps/api-v1.5.4)

Updates `@typescript-eslint/eslint-plugin` from 7.7.0 to 7.7.1
- [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.7.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.7.0 to 7.7.1
- [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.7.1/packages/parser)

Updates `eslint-plugin-svelte` from 2.37.0 to 2.38.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.37.0...v2.38.0)

Updates `posthog-js` from 1.128.2 to 1.130.1
- [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.128.2...v1.130.1)

Updates `svelte-check` from 3.6.9 to 3.7.0
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.6.9...svelte-check-3.7.0)

---
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-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: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  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: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-30 10:43:48 +02:00
Scott Chacon
d8b2bc205c
Merge pull request #3634 from gitbutlerapp/Reset-Base-Branch 
can change your base branch
 2024-04-30 10:35:45 +02:00
Scott Chacon
2ef63bc1d9 what in gods name 2024-04-30 10:33:35 +02:00
Scott Chacon
5603dbba5f Imma kill a motherfucker 2024-04-30 10:31:22 +02:00
Scott Chacon
eed862a56c fix dumb bullshit 2024-04-30 10:29:04 +02:00
Scott Chacon
cd2d9f708e can change your base branch 
when no vbranches are applied, you can change your base branch
 2024-04-30 10:22:29 +02:00
Scott Chacon
698791ba08 fixes bug with hidden uneditable commit messages 2024-04-29 17:34:44 +02:00
Scott Chacon
786a834559
Merge pull request #3626 from gitbutlerapp/sc-history-manipulation 
operation tonkotsu 2
 2024-04-29 16:17:57 +02:00
Kiril Videlov
4414d29bbf
separate opt-in for non-anonomous telemetry 2024-04-29 15:12:22 +02:00
Scott Chacon
6e0b37a342 frontend code for running various history manipulations 2024-04-29 15:06:13 +02:00
Kiril Videlov
732a196505
fix: dont initialize posthog / sentry analytics before onboarding complete 2024-04-29 14:25:45 +02:00
Kiril Videlov
88c5fa249b updated ui structs for snapshots 2024-04-26 23:34:09 +02:00
Pavel Laptev
06240b3e78
CSS: Button and Tag fixes (#3616) 2024-04-26 16:08:13 +02:00
Pavel Laptev
720dbfc875
Small CSS Updates (#3615) 
* badge changes

* fix branches dragging
 2024-04-26 13:45:35 +02:00
Mattias Granlund
a91153aff3 Fix lock tooltip closure shadowing commit variable 2024-04-26 00:06:01 +02:00
Mattias Granlund
c5c2df1b93 Surface warning if hunk locked to multiple branches 
- now returning `HunkLock` to front end
- detect if locked to more than one branch and warn user
 2024-04-26 00:06:01 +02:00
Kiril Videlov
24a357e3c7 add some basic UI for the undo 
activated with Cmd+shift+H
 2024-04-25 19:23:13 +02:00
Mattias Granlund
ebc696ad26 Look up locked commit from remote commits as well 
- also filters for unique commits, should really be done in the back end
 2024-04-25 19:07:41 +02:00
Pavel Laptev
65f2dc1fa5
fix: didn't show error comes from Rust (#3599) 2024-04-24 17:20:15 +02:00
Mattias Granlund
c202d83b6b Allow hunk locking to multiple commits 
- adds `locked_to` field to `GitHunk` to avoid looking it up again
- sends array to ui instead of single commit id
 2024-04-24 08:15:01 +01:00
Pavel Laptev
bc7d3c7309
Design tokens typos fix (#3588) 2024-04-23 16:37:58 +02:00
Pavel Laptev
683beffc1f
Design tokens typos fix (#3587) 2024-04-23 16:20:52 +02:00
dependabot[bot]
df0fc97731 Bump the npm-updates group with 8 updates 
Bumps the npm-updates group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [openai](https://github.com/openai/openai-node) | `4.33.1` | `4.38.2` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.110.1` | `7.111.0` |
| [@types/diff](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff) | `5.0.9` | `5.2.0` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.6.0` | `7.7.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.6.0` | `7.7.0` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.121.4` | `1.128.2` |
| [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) | `0.5.13` | `0.5.14` |
| [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) | `4.2.14` | `4.2.15` |


Updates `openai` from 4.33.1 to 4.38.2
- [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.33.1...v4.38.2)

Updates `@sentry/sveltekit` from 7.110.1 to 7.111.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.111.0/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.110.1...7.111.0)

Updates `@types/diff` from 5.0.9 to 5.2.0
- [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.6.0 to 7.7.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.7.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.6.0 to 7.7.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.7.0/packages/parser)

Updates `posthog-js` from 1.121.4 to 1.128.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.121.4...v1.128.2)

Updates `prettier-plugin-tailwindcss` from 0.5.13 to 0.5.14
- [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.13...v0.5.14)

Updates `svelte` from 4.2.14 to 4.2.15
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.15/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.15/packages/svelte)

---
updated-dependencies:
- dependency-name: openai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@types/diff"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  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
- dependency-name: prettier-plugin-tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-23 01:00:21 +02:00
Pavel Laptev
5c9ce25cd0
Infomessage improvments (#3577) 
* `InfoMessage` structure consistancy improved

- `title` property removed
- unnamed `slot` for content dropped

* Added `errorMessage` attr to the `ToastController`
 2024-04-22 21:44:28 +02:00
Kiril Videlov
a96e8574be feat: search by branch 
This adds the ability to search branches by the author name. This is a port of #2852
 2024-04-22 15:22:57 +02:00
Pavel Laptev
ca0a4cb92e
tokens refactor (#3578) 2024-04-22 12:12:27 +02:00
Pavel Laptev
b9f7278eb4
Folded branch copy update (#3572) 2024-04-21 13:39:44 +02:00
Pavel Laptev
628be51421
Indicate uncommited lanes (#3570) 
* Indicate uncommited lanes

* Copy update and one prop name update
 2024-04-21 12:18:11 +02:00
Pavel Laptev
863494d997
UI: fix lane horizontal scroll (#3567) 2024-04-20 04:18:12 +02:00
Pavel Laptev
8b2c120811
Style and layout fixes (#3562) 
* Styles: small fixes

* "Remove" button style fix

* Git Auth form layout update: made shorter

* added styles for `code` strings
 2024-04-20 00:02:55 +02:00
Pavel Laptev
fd622d4e7b
UX: break GitHub Auth into steps, layout update (#3558) 
* UX: break GitHub Auth into steps, UX improve

* refactor: duplicated action removed

* remove unnessesery code
 2024-04-19 15:02:19 +02:00
Pavel Laptev
f2e9f801dd
Remove unused CSS classes (#3557) 2024-04-19 13:13:35 +02:00
Josh Junon
3aea922afc
switch tokens to Josh 2024-04-18 14:05:45 +02:00
Josh Junon
db70eed3a8
Merge pull request #3545 from gitbutlerapp/fix-test-fetch-push 
use more robust askpass frontend handling
 2024-04-18 11:45:00 +02:00
Josh Junon
37bacc6ad1
use more robust askpass frontend handling 2024-04-18 11:42:12 +02:00
Caleb Owens
8c4ad945dd
Merge branch 'master' into always-await-promises 2024-04-17 13:23:31 +01:00
Kiril Videlov
b565ec20f0
update locked hunk tool tip message 2024-04-17 08:35:00 +02:00
Pavel Laptev
0b0fe13b5c
Icon button wide prop fix (#3535) 2024-04-17 00:00:54 +02:00
Caleb Owens
8e0b775d4b Update formatting 2024-04-16 21:02:23 +01:00
Caleb Owens
93de2484ed Merged origin/master into always await promises 2024-04-16 21:02:15 +01:00
Caleb Owens
dac89e41a9 Change over to "always" for return await 2024-04-16 20:11:53 +01:00
daniilS
e12e741c2e Fix typos in "conflict" in error message, comments, and a variable name 2024-04-16 15:40:14 +01:00