gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-20 08:01:46 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,777 Commits 155 Branches 1,064 Tags 61 MiB
8934384d83
Commit Graph

214 Commits

Author SHA1 Message Date
Pavel Laptev
8934384d83 Merged origin/master into lane-style-updates 2024-01-24 11:07:32 +01:00
Pavel Laptev
c1364a1fe5 many trunk changes 2024-01-24 10:27:51 +01:00
Mattias Granlund
3e93e82765 fix: update check for branch link selection to use endsWith() instead of includes() 2024-01-24 10:18:18 +01:00
Mattias Granlund
717e5a6dcd Filter sidenav branches correctly 
- incorrect filtering included unapplied vbranches with upstream
 2024-01-24 00:18:18 +01:00
Pavel Laptev
56107652bb fixing branches height 2024-01-24 00:14:23 +01:00
Mattias Granlund
16ab8d71c8 fix: update check for new updates to not show banner if app is up to date 2024-01-23 22:09:29 +01:00
Mattias Granlund
a56ea36666 Keep unapplied branches in the board 
- disable draggables and drop zones when readonly
- dim header and add tag to distinguish from other statuses
 2024-01-23 21:47:21 +01:00
Mattias Granlund
8671249176 Fix short lane context menu clipping 2024-01-23 21:26:51 +01:00
Mattias Granlund
0d266467ad Make code selectable again 2024-01-23 21:25:17 +01:00
Pavel Laptev
91e0bdd19e Merged origin/master into Lane style updates 2024-01-23 17:40:14 +01:00
Pavel Laptev
06457badd6 status tag colors and copy updated 2024-01-23 17:38:10 +01:00
Pavel Laptev
027cee9f0e Merged origin/master into Lane style updates 2024-01-23 17:21:58 +01:00
Pavel Laptev
2aa4ff7169 workaround for full height containers 2024-01-23 17:21:21 +01:00
Mattias Granlund
2f874b2541 Grow file card to match lane width 2024-01-23 17:05:42 +01:00
Pavel Laptev
db309df701 lane style updates 2024-01-23 16:39:08 +01:00
Mattias Granlund
7f0434cbb1 Fix frontend branch name transformation 2024-01-23 16:12:31 +01:00
Mattias Granlund
94882fb83a Fix pr creation by awaiting push & reload 2024-01-23 16:09:40 +01:00
Mattias Granlund
e95f8319e0 fix: remove unnecessary check for hunk.locked in ContextMenuItem 2024-01-23 16:08:03 +01:00
Mattias Granlund
14cafcdc1e Move Sentry initialization 
- makes sense to have it in sentry.ts and called from root layout.ts
 2024-01-23 15:09:37 +01:00
Mattias Granlund
3915ff2530 chore: refactor PostHog initialization and capture branch push wait count for analytics 2024-01-23 14:49:30 +01:00
Mattias Granlund
2bab8d5cb5 Add try/catch to creating pr 2024-01-23 13:56:08 +01:00
Mattias Granlund
d798ef84c0 Fix idleness after PR creation 
- also drop unused dependencies
 2024-01-23 11:44:28 +01:00
Mattias Granlund
7b60d60072 Improve PR creation 
- skip pushing if no local commits
- retry pr creation without pushing again
 2024-01-23 11:13:42 +01:00
Mattias Granlund
51f727c950
Merge pull request #2389 from gitbutlerapp/simpify-app-updater-logic 
Simpify app updater logic
 2024-01-23 10:32:49 +01:00
Mattias Granlund
6a4b78a0be Simplify app updating logic 
- combines both install available and install status into one stream
 2024-01-23 10:30:58 +01:00
Kiril Videlov
1b149af40c 🐛 fix: disable draggable hunk if it is locked or readonly 2024-01-23 10:22:52 +01:00
Mattias Granlund
ed62435ecd
Merge pull request #2388 from gitbutlerapp/improve-select-drop-down-component 
Improve select drop down component
 2024-01-23 10:12:54 +01:00
Mattias Granlund
d0ac00be97 Improve select drop down component 
- selected option no longer disabled
- replace native select on project setup page
- initially selected item bound by value
- limit drop down height
- make drop down scrollable
 2024-01-23 10:10:53 +01:00
Kiril Videlov
1c2634c824 on hover show what a hunk is locked to 2024-01-22 18:06:40 +01:00
Kiril Videlov
7d69bf6112 add tauri drag regions 2024-01-22 17:27:30 +01:00
Kiril Videlov
8ac1367e78 make some elements non-selectable 2024-01-22 16:17:46 +01:00
Kiril Videlov
e2d1777a19 🎨 style: update text in new branch creation UI 2024-01-22 14:17:34 +01:00
Mattias Granlund
e6d9691396 Remote "target" button in readonly mode 2024-01-22 10:48:57 +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
2b9318da15 updated “Up to date screen" 2024-01-21 20:50:44 +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
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
ad3d05ddd2 Status tag updated 2024-01-20 03:41:03 +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
09d4b99e27 added notClickable to buttons, dropzone fixes 2024-01-20 01:06:04 +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]
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
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
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
85ebb018ff
Merge pull request #2331 from gitbutlerapp/dependabot/npm_and_yarn/postcss-load-config-5.0.2 
chore(deps-dev): bump postcss-load-config from 4.0.1 to 5.0.2
 2024-01-19 18:15:43 +01:00
dependabot[bot]
092b1fd7a7
chore(deps-dev): bump @typescript-eslint/eslint-plugin 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.13.2 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/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.19.0/packages/eslint-plugin)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 17:15:41 +00:00
Qix
00ab61b062
Merge pull request #2312 from gitbutlerapp/dependabot/npm_and_yarn/lezer/common-1.2.1 
chore(deps-dev): bump @lezer/common from 1.1.0 to 1.2.1
 2024-01-19 18:14:53 +01:00