Commit Graph

6596 Commits

Author SHA1 Message Date
Kiril Videlov
c6b05d3ffb
Merge pull request #3655 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-5e3900e
Bump tauri-plugin-window-state from `773b498` to `5e3900e`
2024-05-01 10:51:13 -07:00
Kiril Videlov
31797d1f61
Merge pull request #3654 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-5e3900e
Bump tauri-plugin-single-instance from `773b498` to `5e3900e`
2024-05-01 10:51:07 -07:00
Kiril Videlov
026723eb87
Merge pull request #3653 from gitbutlerapp/dependabot/cargo/tauri-plugin-store-5e3900e
Bump tauri-plugin-store from `773b498` to `5e3900e`
2024-05-01 10:51:02 -07:00
Kiril Videlov
6c0f4c0946
Merge pull request #3652 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-5e3900e
Bump tauri-plugin-log from `773b498` to `5e3900e`
2024-05-01 10:50:58 -07:00
Kiril Videlov
80050fe230
Merge pull request #3651 from gitbutlerapp/dependabot/cargo/rust-updates-fd4bde4357
Bump the rust-updates group with 10 updates
2024-05-01 10:50:51 -07:00
dependabot[bot]
751db87188
Bump tauri-plugin-window-state from 773b498 to 5e3900e
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](773b498392...5e3900e682)

---
updated-dependencies:
- dependency-name: tauri-plugin-window-state
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:14:03 +00:00
dependabot[bot]
20a649a496
Bump tauri-plugin-single-instance from 773b498 to 5e3900e
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](773b498392...5e3900e682)

---
updated-dependencies:
- dependency-name: tauri-plugin-single-instance
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:13:29 +00:00
dependabot[bot]
88e54f4358
Bump tauri-plugin-store from 773b498 to 5e3900e
Bumps [tauri-plugin-store](https://github.com/tauri-apps/plugins-workspace) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](773b498392...5e3900e682)

---
updated-dependencies:
- dependency-name: tauri-plugin-store
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:13:01 +00:00
dependabot[bot]
3733772b60
Bump tauri-plugin-log from 773b498 to 5e3900e
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](773b498392...5e3900e682)

---
updated-dependencies:
- dependency-name: tauri-plugin-log
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:12:27 +00:00
dependabot[bot]
a1a3abc868
Bump the rust-updates group with 10 updates
Bumps the rust-updates group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde) | `1.0.197` | `1.0.199` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.58` | `1.0.59` |
| [anyhow](https://github.com/dtolnay/anyhow) | `1.0.81` | `1.0.82` |
| [async-trait](https://github.com/dtolnay/async-trait) | `0.1.79` | `0.1.80` |
| [chrono](https://github.com/chronotope/chrono) | `0.4.37` | `0.4.38` |
| [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.2` | `0.12.4` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.115` | `1.0.116` |
| [ssh-key](https://github.com/RustCrypto/SSH) | `0.6.5` | `0.6.6` |
| [tauri](https://github.com/tauri-apps/tauri) | `1.6.1` | `1.6.2` |
| [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.30.8` | `0.30.11` |


Updates `serde` from 1.0.197 to 1.0.199
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.197...v1.0.199)

Updates `thiserror` from 1.0.58 to 1.0.59
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.58...1.0.59)

Updates `anyhow` from 1.0.81 to 1.0.82
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.81...1.0.82)

Updates `async-trait` from 0.1.79 to 0.1.80
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.79...0.1.80)

Updates `chrono` from 0.4.37 to 0.4.38
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.37...v0.4.38)

Updates `reqwest` from 0.12.2 to 0.12.4
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.2...v0.12.4)

Updates `serde_json` from 1.0.115 to 1.0.116
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.115...v1.0.116)

Updates `ssh-key` from 0.6.5 to 0.6.6
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.5...ssh-key/v0.6.6)

Updates `tauri` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.6.1...tauri-v1.6.2)

Updates `sysinfo` from 0.30.8 to 0.30.11
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.30.8...v0.30.11)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: async-trait
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: reqwest
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tauri
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: sysinfo
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:11:55 +00:00
Pavel Laptev
b8f689397e
Fix: setting toggle (#3650) 2024-05-01 02:11:22 +02:00
Pavel Laptev
c9aba85bfa
Some design updates (#3649)
* CSS: badge size update

* close modal when remove the project
2024-05-01 01:10:22 +02:00
Kiril Videlov
382e265bb5
Merge pull request #3648 from gitbutlerapp/Virtual-branch
fix: removing an update all projects operation on read
2024-04-30 13:55:25 -07:00
GitButler
28ca280c0d fix: removing an update all projects operation on read
this is no longer needed and it is causing an issue on windows
2024-04-30 13:42:34 -07:00
Mattias Granlund
4c3ac60dda Fix annoying inconsistency in normalizeBranchName
Both the rust code and typescript code have a normalization function, but the rust code doesn't lowercase the name.
2024-04-30 19:00:18 +02:00
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
7f0564ddcc
Merge pull request #3641 from gitbutlerapp/Fix-bug-where-branch-appeared-remote-when-in-fact-virtual
Fix bug where branch appeared remote when in fact virtual
2024-04-30 18:38:07 +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
22e60ee00c
Merge pull request #3638 from gitbutlerapp/escape-windows-cmdlets
escape env vars and use raw args on windows in fork/exec git
2024-04-30 15:10:23 +02:00
Josh Junon
d71e4d3617
escape env vars and use raw args on windows in fork/exec git 2024-04-30 14:56:21 +02:00
Josh Junon
d0f1082c7f
Merge pull request #3637 from gitbutlerapp/fix-git-forkexec-ssh-command
also check GIT_SSH when looking for base ssh command
2024-04-30 12:21:54 +02:00
Josh Junon
8d942d6557
pull git ssh commands from surrounding environment as fallback 2024-04-30 12:09:05 +02:00
Josh Junon
f0a774eecf
Merge pull request #3636 from gitbutlerapp/fix-google-avatars
add google images CDN to img-src CSP
2024-04-30 12:01:43 +02:00
Josh Junon
de2622c2b6
also check GIT_SSH when looking for base ssh command (ref #3624) 2024-04-30 11:59:15 +02:00
Josh Junon
b350a85e5c
add google images CDN to img-src CSP (fixes #3516) 2024-04-30 11:48:00 +02:00
Josh Junon
77c5b87d07
Merge pull request #3635 from gitbutlerapp/disable-posthog-recording-on-frontend
disable posthog recording on frontend
2024-04-30 11:40:30 +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
Kiril Videlov
7002becf30
Merge pull request #3633 from gitbutlerapp/add-new-file-logging
fix: undo snapshots will disregard files larger than 32MB
2024-04-29 20:42:07 +02:00
Kiril Videlov
0d8b97b36c
fix: undo snapshots will disregard files larger than 32MB
Ensuring that a snapshot "undo" does not remove those files
2024-04-29 20:28:27 +02:00
Scott Chacon
a99fd6b066
Merge pull request #3630 from gitbutlerapp/show-uneditable-commit-messages
fixes bug with hidden uneditable commit messages
2024-04-29 17:46:23 +02:00
Scott Chacon
698791ba08 fixes bug with hidden uneditable commit messages 2024-04-29 17:34:44 +02:00
Kiril Videlov
27480c503e
Merge pull request #3629 from gitbutlerapp/remove-rust-posthog-integration
remove posthog from the rust code
2024-04-29 16:28:11 +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
00706b402b
remove posthog from the rust code
similar to https://github.com/gitbutlerapp/gitbutler/pull/3628
2024-04-29 16:12:14 +02:00
Kiril Videlov
47f37dff42
Merge pull request #3628 from gitbutlerapp/remove-sentry-integration
remove sentry from rust code
2024-04-29 16:09:22 +02:00
Kiril Videlov
6439f3333a
remove sentry rust dependencies 2024-04-29 15:54:13 +02:00
Kiril Videlov
83b40eabb6
remove sentry from rust code
Since the actually valuable bug reports are submitted by developers as github issues or on our Discord, sentry error reporting is not necessary
2024-04-29 15:46:29 +02:00
Scott Chacon
c5e7fe865c fix clippy issues
fix a few more clippy issues
2024-04-29 15:42:58 +02:00
Kiril Videlov
16398e75f6
Merge pull request #3627 from gitbutlerapp/fix-analytics-early-initialization
fix-analytics-early-initialization
2024-04-29 15:31:37 +02:00