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,549 Commits 151 Branches 1,064 Tags 60 MiB
23031d3906
Commit Graph

6549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
736395f41f
fix: playwright version in lockfile 2024-05-05 19:08:01 +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
402b74b3cb
fix(gha): install only chromium browser 2024-05-05 18:56:22 +02:00
ndom91
b875280a4e
fix: cleanup playwright.config for CI 2024-05-05 18:56:09 +02:00
ndom91
99eb8128d3
fix(gha): dlx playwright to install deps 2024-05-05 18:54:07 +02:00
ndom91
2b365160b3
fix: pnpm-lock 2024-05-05 18:53:13 +02:00
ndom91
dd79d9ec5a
Merge branch 'ndom91/add-playwright-test' of github.com:ndom91/gitbutler into ndom91/add-playwright-test 2024-05-05 18:51:21 +02:00
ndom91
2adf5f50dd
fix: cleanup GHA 2024-05-05 18:51:14 +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
548c1ded37
fix: revert pnpm-lock changes 2024-05-05 18:24:48 +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
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
ndom91
01e8a4d28d
chore: WIP 2024-05-02 14:55:41 +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
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