gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-13 15:34:13 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,263 Commits 150 Branches 1,055 Tags 59 MiB
5b2e87c003
Commit Graph

3263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
5b2e87c003
Merge pull request #1448 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.2 
Bump ssh-key from 0.6.1 to 0.6.2
 2023-10-31 12:04:42 +01:00
Nikita Galaiko
181c83e792
Merge pull request #1449 from gitbutlerapp/dependabot/cargo/tokio-1.33.0 
Bump tokio from 1.32.0 to 1.33.0
 2023-10-31 12:04:35 +01:00
Nikita Galaiko
d1a04b281f
Merge pull request #1471 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-f595684 
chore(deps): bump tauri-plugin-single-instance from `44df772` to `f595684`
 2023-10-31 12:04:28 +01:00
Nikita Galaiko
0e596662b6
Merge pull request #1472 from gitbutlerapp/dependabot/cargo/serde_json-1.0.108 
chore(deps): bump serde_json from 1.0.105 to 1.0.108
 2023-10-31 12:04:22 +01:00
Nikita Galaiko
6c4e47f19f
Merge pull request #1473 from gitbutlerapp/add-drag-and-drop-support-for-commit-cards 
Add drag and drop support for commit cards
 2023-10-31 11:59:07 +01:00
Nikita Galaiko
7dcdd959ed fix cherry pick conflict resolution 2023-10-31 11:52:11 +01:00
Mattias Granlund
c5c5152bf2 Extract header and footer into their own components 2023-10-31 10:43:02 +01:00
Mattias Granlund
1d983516ed chore: fix formatting 2023-10-31 10:42:49 +01:00
dependabot[bot]
e92a87f65e chore(deps-dev): bump marked from 9.1.3 to 9.1.4 
Bumps [marked](https://github.com/markedjs/marked) from 9.1.3 to 9.1.4.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.1.3...v9.1.4)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:40:00 +01:00
Mattias Granlund
d41c2d1e7d Remove use of null from user store 2023-10-31 10:39:50 +01:00
dependabot[bot]
4c4327a3a0 chore(deps-dev): bump vite from 4.4.9 to 4.5.0 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.9 to 4.5.0.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.0/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:39:37 +01:00
dependabot[bot]
080f10f4eb chore(deps-dev): bump marked from 9.0.3 to 9.1.3 
Bumps [marked](https://github.com/markedjs/marked) from 9.0.3 to 9.1.3.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.0.3...v9.1.3)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:36:14 +01:00
dependabot[bot]
595aae95c5 chore(deps-dev): bump svelte from 4.2.1 to 4.2.2 
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/master/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.2/packages/svelte)

---
updated-dependencies:
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:36:06 +01:00
dependabot[bot]
4da0edaf63 chore(deps-dev): bump autoprefixer from 10.4.15 to 10.4.16 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.15 to 10.4.16.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.15...10.4.16)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:35:59 +01:00
dependabot[bot]
06498cdfbf chore(deps-dev): bump @codemirror/view from 6.18.0 to 6.21.4 
Bumps [@codemirror/view](https://github.com/codemirror/view) from 6.18.0 to 6.21.4.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.18.0...6.21.4)

---
updated-dependencies:
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:35:51 +01:00
Nikita Galaiko
8922c60ad9 gap between upstream commits 2023-10-31 09:55:17 +01:00
Nikita Galaiko
97d6be48f0 refactor cherry picking 2023-10-31 08:45:53 +01:00
Nikita Galaiko
b773901683 cherry pick ui 2023-10-31 08:45:46 +01:00
dependabot[bot]
8921e85561
chore(deps): bump serde_json from 1.0.105 to 1.0.108 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.105 to 1.0.108.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.105...v1.0.108)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 16:09:47 +00:00
dependabot[bot]
cb830f6152
chore(deps): bump tauri-plugin-single-instance 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `44df772` to `f595684`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](44df7726ae...f595684ba8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 16:07:22 +00:00
dependabot[bot]
7586d6a233 Bump eslint from 8.50.0 to 8.52.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.52.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.52.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 15:47:23 +01:00
dependabot[bot]
e7a88aead5 chore(deps-dev): bump @lezer/common from 1.0.4 to 1.1.0 
Bumps [@lezer/common](https://github.com/lezer-parser/common) from 1.0.4 to 1.1.0.
- [Changelog](https://github.com/lezer-parser/common/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lezer-parser/common/compare/1.0.4...1.1.0)

---
updated-dependencies:
- dependency-name: "@lezer/common"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:07:58 +01:00
dependabot[bot]
5a0d33cf95 chore(deps-dev): bump @typescript-eslint/parser from 6.7.3 to 6.9.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.7.3 to 6.9.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/v6.9.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:06:57 +01:00
dependabot[bot]
e3b379e684 Bump posthog-js from 1.81.2 to 1.84.2 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.81.2 to 1.84.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.81.2...v1.84.2)

---
updated-dependencies:
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:03:47 +01:00
dependabot[bot]
219f5e32bf chore(deps-dev): bump eslint-import-resolver-typescript 
Bumps [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases)
- [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-import-resolver-typescript/compare/v3.6.0...v3.6.1)

---
updated-dependencies:
- dependency-name: eslint-import-resolver-typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:03:33 +01:00
Nikita Galaiko
1fe44934e4
Merge pull request #1465 from gitbutlerapp/update-platform-matrix 
🔧 fix: update job matrix for GitHub Actions workflow to include macOS…
 2023-10-30 11:02:19 +02:00
Nikita Galaiko
8baa4194bf use hosted macOs, arm64 2023-10-30 09:53:07 +01:00
Nikita Galaiko
b896c34b70
Merge pull request #1464 from gitbutlerapp/handle-missing-default-target 
🔧 fix: handle case when default target is not set
 2023-10-30 10:11:08 +02:00
Nikita Galaiko
2a43aff7de 🔧 fix: handle case when default target is not set 2023-10-30 08:54:15 +01:00
Nikita Galaiko
a0a6b6090d
Merge pull request #1463 from gitbutlerapp/fix-project-fetch-error 
do not log auth error
 2023-10-30 09:52:04 +02:00
Nikita Galaiko
e24f00864a do not log auth error 2023-10-30 08:37:36 +01:00
dependabot[bot]
41707dfad5
Bump ssh-key from 0.6.1 to 0.6.2 
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.1 to 0.6.2.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.1...ssh-key/v0.6.2)

---
updated-dependencies:
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-28 19:52:24 +00:00
Kiril Videlov
c7a7887f19 chore: update tauri-plugin-context-menu dependency to version 0.5.0 with commit hash 4fd0410a48def 2023-10-28 21:51:30 +02:00
Kiril Videlov
5f1ef9149c chore: update tauri-plugin-context-menu dependency to use the gitbutlerapp repository instead of c2r0b repository 
This is a workaround for the lacking linux support, we want to at least be able to compile
 2023-10-28 21:51:30 +02:00
Kiril Videlov
19e933d713 feat: add filter functionality to pull requests listing in project view using the native context menu 2023-10-28 21:51:30 +02:00
Kiril Videlov
a9f1da75af chore: move expand/collapse to the left 2023-10-28 19:25:12 +02:00
Kiril Videlov
579807687c feat: add IconFilter component and its SVG markup 2023-10-28 19:24:03 +02:00
Kiril Videlov
3eba2c9bdb feat: add caching mechanism for pull requests list to improve performance and handle offline scenarios 2023-10-27 17:52:15 +03:00
Kiril Videlov
b0374e2f7a chore: remove duplicate RemoteBranches component 2023-10-25 22:24:38 +02:00
Kiril Videlov
8b5b37102e feat: add support for displaying and interacting with pull requests in the branch peek component 2023-10-25 22:24:38 +02:00
Nikita Galaiko
5f1a6a1d28
Merge pull request #1455 from gitbutlerapp/get-commits-not-on-target-1 
Get commits not on target 1
 2023-10-24 16:15:47 +02:00
Nikita Galaiko
2d64d29c47 refactor: avoid mutation 2023-10-24 14:51:24 +02:00
Nikita Galaiko
304ee291aa
Merge pull request #1454 from gitbutlerapp/add-merge-function-and-integrated-commits-test 
fix integrated commit detection
 2023-10-24 14:18:03 +02:00
Nikita Galaiko
f66c1e4db7 cranky fixes 2023-10-24 14:10:06 +02:00
Nikita Galaiko
687d73897a cargo fmt 2023-10-24 13:57:43 +02:00
Nikita Galaiko
52757a4ad5 better imitate a real remote merge 2023-10-24 13:57:22 +02:00
Nikita Galaiko
c0c8ac8133 fix integrated commit detection 2023-10-24 13:49:06 +02:00
Nikita Galaiko
5f4232adc0
Merge pull request #1453 from gitbutlerapp/fix-deduplication 
when choosing new remote branch name, ignore case
 2023-10-24 12:53:23 +02:00
Nikita Galaiko
7c56f41ab1 when choosing upstream branch name, ignore case 2023-10-24 12:46:59 +02:00
Nikita Galaiko
48b16b8881
Merge pull request #1443 from gitbutlerapp/add-cherry-pick-method 
feat: cherry pick onto virtual branch
 2023-10-24 08:45:46 +02:00