gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 00:21:35 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,931 Commits 157 Branches 1,064 Tags 61 MiB
1eb7c34fae
Commit Graph

4931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kiril Videlov
e2d1777a19 🎨 style: update text in new branch creation UI 2024-01-22 14:17:34 +01:00
Nikita Galaiko
c143bc4a1c
Merge pull request #2375 from gitbutlerapp/refactor-file-diffs 
Refactor file diffs
 2024-01-22 13:35:38 +01:00
Nikita Galaiko
143b8f6c3e remove unused variable 2024-01-22 13:13:54 +01:00
Nikita Galaiko
54e3801978
Merge pull request #2374 from gitbutlerapp/add-test-for-applying-first-branch 
Add test for applying first branch
 2024-01-22 11:04:59 +01:00
Mattias Granlund
21cb5d62f8
Merge pull request #2373 from gitbutlerapp/blah-blah-blah 
Remove "target" button in readonly mode
 2024-01-22 10:57:11 +01:00
Nikita Galaiko
0d723554e6 handle applying branch that should become the target 2024-01-22 10:54:28 +01:00
Mattias Granlund
e6d9691396 Remote "target" button in readonly mode 2024-01-22 10:48:57 +01:00
Pavel Laptev
58616373ff
Merge pull request #2372 from gitbutlerapp/update-board-styles 
styles updated
 2024-01-21 22:07:29 +01:00
Pavel Laptev
86f4a91da2 styles updated 2024-01-21 21:58:53 +01:00
Kiril Videlov
61ad099feb this is a revert to a previous working version 2024-01-21 21:28:43 +01:00
Pavel Laptev
6eb490e07b
Merge pull request #2370 from gitbutlerapp/new-branch-empty-state-fixed-1 
updated “Up to date screen"
 2024-01-21 21:08:25 +01:00
Pavel Laptev
2b9318da15 updated “Up to date screen" 2024-01-21 20:50:44 +01:00
Pavel Laptev
f3f476fbb5
Merge pull request #2369 from gitbutlerapp/new-branch-empty-state-fixed-1 
New branch empty state fixed and minor CSS fixes
 2024-01-20 16:49:45 +01:00
Pavel Laptev
9e119e4e47 minor css fixes 2024-01-20 16:29:40 +01:00
Pavel Laptev
bfa3ba69f0 css fixes 2024-01-20 16:29:06 +01:00
Pavel Laptev
a2247a9933
Merge pull request #2368 from gitbutlerapp/exclude-ignored-elements-from-clone 
Draggable fixes and tag component update
 2024-01-20 16:20:18 +01:00
Pavel Laptev
3407c52219 tag component - added new property “shrinkable” in order to make the text in the component shrinkable with ellipsis 2024-01-20 16:17:15 +01:00
Pavel Laptev
bc808248f3 added new data attr in order to exclude elements from the draggable preview 2024-01-20 16:02:38 +01:00
Pavel Laptev
ffc1c16de6
Merge pull request #2367 from gitbutlerapp/lane-styles-updates 
Status tag styles updated
 2024-01-20 03:42:59 +01:00
Pavel Laptev
6864652f6f merged from upstream 2024-01-20 03:41:09 +01:00
Pavel Laptev
ad3d05ddd2 Status tag updated 2024-01-20 03:41:03 +01:00
Pavel Laptev
e326cc0f6f Status tag updated 2024-01-20 03:39:35 +01:00
Pavel Laptev
1936f74c20
Merge pull request #2366 from gitbutlerapp/lane-styles-updates 
Lane styles updates
 2024-01-20 03:27:02 +01:00
Pavel Laptev
ff62088bac lane styles simplified, default cursor updated, Tag component cursor updated, Icon button updated. 2024-01-20 03:23:53 +01:00
Pavel Laptev
5f0f914175 merged from upstream 2024-01-20 01:06:54 +01:00
Pavel Laptev
09d4b99e27 added notClickable to buttons, dropzone fixes 2024-01-20 01:06:04 +01:00
Pavel Laptev
daf796cc7e added notClickable to buttons, dropzone fixes 2024-01-20 01:05:40 +01:00
Qix
5e3622c223
Merge pull request #2360 from gitbutlerapp/dependabot/cargo/rust-patch-updates-85f0ec1a7f 
chore(deps): bump the rust-patch-updates group with 3 updates
 2024-01-20 00:59:01 +01:00
Qix
da332056b3
Merge pull request #2364 from gitbutlerapp/update-dependency-ignore-rules 
fix dependabot major version ignore rules
 2024-01-20 00:58:51 +01:00
Josh Junon
29a6715544 fix dependabot major version ignore rules 2024-01-20 00:58:25 +01:00
Kiril Videlov
0439559a5c Improved hunk locking 
Adds a lockedBy property to hunks on the API, containing a commit id to whitch the hunk is considered locked
 2024-01-19 22:03:26 +01:00
dependabot[bot]
97a9b2f927
chore(deps): bump the rust-patch-updates group with 3 updates 
Bumps the rust-patch-updates group with 3 updates: [serde](https://github.com/serde-rs/serde), [serde_json](https://github.com/serde-rs/json) and [tauri-build](https://github.com/tauri-apps/tauri).


Updates `serde` from 1.0.193 to 1.0.195
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.193...v1.0.195)

Updates `serde_json` from 1.0.108 to 1.0.111
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.108...v1.0.111)

Updates `tauri-build` from 1.5.0 to 1.5.1
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v1.5...tauri-build-v1.5.1)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: tauri-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 18:13:46 +00:00
Qix
938033ebe7
Merge pull request #2358 from gitbutlerapp/dependabot/cargo/rust-minor-updates-511f1c274b 
chore(deps): bump the rust-minor-updates group with 4 updates
 2024-01-19 19:05:17 +01:00
Qix
441835c384
Merge pull request #2362 from gitbutlerapp/dependabot/npm_and_yarn/npm-patch-updates-35dfcdb2d1 
chore(deps-dev): bump the npm-patch-updates group with 10 updates
 2024-01-19 19:00:11 +01:00
dependabot[bot]
e2d0df225d
chore(deps-dev): bump the npm-patch-updates group with 10 updates 
Bumps the npm-patch-updates group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [@codemirror/lang-markdown](https://github.com/codemirror/lang-markdown) | `6.2.3` | `6.2.4` |
| [@codemirror/lang-vue](https://github.com/codemirror/lang-vue) | `0.1.2` | `0.1.3` |
| [@codemirror/lang-wast](https://github.com/codemirror/lang-wast) | `6.0.1` | `6.0.2` |
| [@types/diff](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff) | `5.0.3` | `5.0.9` |
| [autoprefixer](https://github.com/postcss/autoprefixer) | `10.4.16` | `10.4.17` |
| [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) | `2.29.0` | `2.29.1` |
| [postcss](https://github.com/postcss/postcss) | `8.4.31` | `8.4.33` |
| [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) | `0.5.6` | `0.5.11` |
| [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) | `4.2.2` | `4.2.9` |
| [svelte-check](https://github.com/sveltejs/language-tools) | `3.6.2` | `3.6.3` |


Updates `@codemirror/lang-markdown` from 6.2.3 to 6.2.4
- [Changelog](https://github.com/codemirror/lang-markdown/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-markdown/compare/6.2.3...6.2.4)

Updates `@codemirror/lang-vue` from 0.1.2 to 0.1.3
- [Changelog](https://github.com/codemirror/lang-vue/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-vue/compare/0.1.2...0.1.3)

Updates `@codemirror/lang-wast` from 6.0.1 to 6.0.2
- [Changelog](https://github.com/codemirror/lang-wast/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-wast/compare/6.0.1...6.0.2)

Updates `@types/diff` from 5.0.3 to 5.0.9
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff)

Updates `autoprefixer` from 10.4.16 to 10.4.17
- [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.16...10.4.17)

Updates `eslint-plugin-import` from 2.29.0 to 2.29.1
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...v2.29.1)

Updates `postcss` from 8.4.31 to 8.4.33
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.31...8.4.33)

Updates `prettier-plugin-tailwindcss` from 0.5.6 to 0.5.11
- [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.6...v0.5.11)

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

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

---
updated-dependencies:
- dependency-name: "@codemirror/lang-markdown"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@codemirror/lang-vue"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@codemirror/lang-wast"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@types/diff"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: prettier-plugin-tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 17:57:02 +00:00
Qix
7c45151f07
Merge pull request #2357 from gitbutlerapp/dependabot/npm_and_yarn/tauri-apps/cli-1.5.9 
chore(deps-dev): bump @tauri-apps/cli from 1.5.6 to 1.5.9
 2024-01-19 18:43:56 +01:00
Qix
49dcf7d990
Merge pull request #2359 from gitbutlerapp/virtual-branch-1 
ignore major updates entirely
 2024-01-19 18:42:47 +01:00
Josh Junon
c87f33e765 ignore major updates entirely 2024-01-19 18:42:12 +01:00
dependabot[bot]
12f364e1fb
chore(deps): bump the rust-minor-updates group with 4 updates 
Bumps the rust-minor-updates group with 4 updates: [uuid](https://github.com/uuid-rs/uuid), [bstr](https://github.com/BurntSushi/bstr), [regex](https://github.com/rust-lang/regex) and [url](https://github.com/servo/rust-url).


Updates `uuid` from 1.6.1 to 1.7.0
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.6.1...1.7.0)

Updates `bstr` from 1.8.0 to 1.9.0
- [Commits](https://github.com/BurntSushi/bstr/compare/1.8.0...1.9.0)

Updates `regex` from 1.9.5 to 1.10.2
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.9.5...1.10.2)

Updates `url` from 2.4.1 to 2.5.0
- [Release notes](https://github.com/servo/rust-url/releases)
- [Commits](https://github.com/servo/rust-url/compare/v2.4.1...v2.5.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
- dependency-name: url
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 17:41:07 +00:00
dependabot[bot]
a37ac1bd26
chore(deps-dev): bump @tauri-apps/cli from 1.5.6 to 1.5.9 
Bumps [@tauri-apps/cli](https://github.com/tauri-apps/tauri) from 1.5.6 to 1.5.9.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.6...@tauri-apps/cli-v1.5.9)

---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 17:40:11 +00:00
Qix
9d6f9a8234
Merge pull request #2349 from gitbutlerapp/dependabot/npm_and_yarn/codemirror/view-and-sentry/sveltekit-and-sveltejs/kit-and-typescript-eslint/parser-and-posthog-js-and-prettier-and-svelte-outclick-and-tailwindcss-and-tauri-plugin-context-menu-and-typescript-6.23.0 
chore(deps-dev): bump the minor group with 10 updates
 2024-01-19 18:38:51 +01:00
Qix
19ac32afe8
Merge pull request #2353 from gitbutlerapp/virtual-branch-1 
use a unified cache instead of restore keys
 2024-01-19 18:38:20 +01:00
Josh Junon
97b9bc9526 use a unified cache instead of restore keys 2024-01-19 18:37:53 +01:00
dependabot[bot]
2de5df540b
chore(deps-dev): bump the minor group with 10 updates 
Bumps the minor group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [@codemirror/view](https://github.com/codemirror/view) | `6.22.0` | `6.23.0` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.73.0` | `7.94.1` |
| [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) | `1.27.5` | `1.30.3` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `6.16.0` | `6.19.0` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.96.1` | `1.100.0` |
| [prettier](https://github.com/prettier/prettier) | `3.1.1` | `3.2.4` |
| [svelte-outclick](https://github.com/babakfp/svelte-outclick) | `3.6.2` | `3.7.0` |
| [tailwindcss](https://github.com/tailwindlabs/tailwindcss) | `3.3.3` | `3.4.1` |
| [tauri-plugin-context-menu](https://github.com/c2r0b/tauri-plugin-context-menu) | `0.5.0` | `0.7.0` |
| [typescript](https://github.com/Microsoft/TypeScript) | `5.2.2` | `5.3.3` |


Updates `@codemirror/view` from 6.22.0 to 6.23.0
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.22.0...6.23.0)

Updates `@sentry/sveltekit` from 7.73.0 to 7.94.1
- [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.73.0...7.94.1)

Updates `@sveltejs/kit` from 1.27.5 to 1.30.3
- [Release notes](https://github.com/sveltejs/kit/releases)
- [Changelog](https://github.com/sveltejs/kit/blob/main/packages/kit/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.30.3/packages/kit)

Updates `@typescript-eslint/parser` from 6.16.0 to 6.19.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.19.0/packages/parser)

Updates `posthog-js` from 1.96.1 to 1.100.0
- [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.96.1...v1.100.0)

Updates `prettier` from 3.1.1 to 3.2.4
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.1.1...3.2.4)

Updates `svelte-outclick` from 3.6.2 to 3.7.0
- [Commits](https://github.com/babakfp/svelte-outclick/commits)

Updates `tailwindcss` from 3.3.3 to 3.4.1
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.3.3...v3.4.1)

Updates `tauri-plugin-context-menu` from 0.5.0 to 0.7.0
- [Commits](https://github.com/c2r0b/tauri-plugin-context-menu/commits)

Updates `typescript` from 5.2.2 to 5.3.3
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.2.2...v5.3.3)

---
updated-dependencies:
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@sveltejs/kit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: svelte-outclick
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: tauri-plugin-context-menu
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 17:35:08 +00:00
Qix
63d5801796
Merge pull request #2347 from gitbutlerapp/update-npm-and-rust-groups 
use better names for groups
 2024-01-19 18:33:26 +01:00
Josh Junon
becffb1a29 use better names for groups 2024-01-19 18:32:24 +01:00
Qix
7b5bb3ca43
Merge pull request #2340 from gitbutlerapp/virtual-branch-1 
disable dependabot for majors
 2024-01-19 18:25:16 +01:00
Josh Junon
7f0dfe81ff disable dependabot for majors 2024-01-19 18:24:42 +01:00
Qix
bd60d6ce59
Merge pull request #2335 from gitbutlerapp/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-6.19.0 
chore(deps-dev): bump @typescript-eslint/eslint-plugin from 6.13.2 to 6.19.0
 2024-01-19 18:17:43 +01:00
Qix
cdd41c0e80
Merge pull request #2337 from gitbutlerapp/add-update-groups 
group npm dependencies by major/minor/patch
 2024-01-19 18:16:57 +01:00