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

332 Commits

Author SHA1 Message Date
Kiril Videlov
0fe1f93e89 fix: update branch card class and button logic to correctly handle active and selected branches 2024-02-08 16:50:38 +01:00
Kiril Videlov
e98bb4fc17 fix: conditional check for branches length in template 2024-02-08 16:19:17 +01:00
Pavel Laptev
b386643d49 lint fixes 2024-02-07 23:25:49 +01:00
Pavel Laptev
f80c6ba14e Formating fix 2024-02-07 23:25:07 +01:00
Pavel Laptev
0c11f68943 Improved project remove UX, updated text styles 2024-02-07 23:19:41 +01:00
Kiril Videlov
85407d14ec fix: add error message when remote branches are not available for virtual branch work 2024-02-07 16:08:35 +01:00
Pavel Laptev
0324ac7b96 eslint format fixes 2024-02-07 15:53:15 +01:00
Pavel Laptev
97cd4053a7 lint fixes 2024-02-07 15:42:14 +01:00
Pavel Laptev
448be7fb20 updated file preview paddings 2024-02-07 15:25:17 +01:00
Pavel Laptev
7af2386a1f File changes indication changed, updated style for the Tag component and added more color, Tag color name changed 2024-02-07 14:54:15 +01:00
Pavel Laptev
e8142667fd added new purple pallete to design tokens, added new propert reversedDirection to the Tag component 2024-02-07 13:59:02 +01:00
dependabot[bot]
e406b2bf9e
Bump the npm-updates group with 2 updates 
Bumps the npm-updates group with 2 updates: [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) and [posthog-js](https://github.com/PostHog/posthog-js).


Updates `@sentry/sveltekit` from 7.100.0 to 7.100.1
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.100.1/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.100.0...7.100.1)

Updates `posthog-js` from 1.105.0 to 1.105.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/commits)

---
updated-dependencies:
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-07 11:46:18 +00:00
Kiril Videlov
c49d6f11e9 fix: error propagation when listing remote branches 2024-02-07 10:57:19 +01:00
dependabot[bot]
01cee54312
Bump the npm-patch-updates group with 6 updates 
Bumps the npm-patch-updates group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@codemirror/lang-python](https://github.com/codemirror/lang-python) | `6.1.3` | `6.1.4` |
| [@codemirror/language](https://github.com/codemirror/language) | `6.10.0` | `6.10.1` |
| [nanoid](https://github.com/ai/nanoid) | `5.0.4` | `5.0.5` |
| [postcss](https://github.com/postcss/postcss) | `8.4.33` | `8.4.34` |
| [prettier](https://github.com/prettier/prettier) | `3.2.4` | `3.2.5` |
| [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) | `4.2.9` | `4.2.10` |


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

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

Updates `nanoid` from 5.0.4 to 5.0.5
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/5.0.4...5.0.5)

Updates `postcss` from 8.4.33 to 8.4.34
- [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.33...8.4.34)

Updates `prettier` from 3.2.4 to 3.2.5
- [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.2.4...3.2.5)

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

---
updated-dependencies:
- dependency-name: "@codemirror/lang-python"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@codemirror/language"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: nanoid
  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
  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
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-06 22:27:01 +00:00
dependabot[bot]
8759439738
Bump the npm-minor-updates group with 4 updates 
Bumps the npm-minor-updates group with 4 updates: [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [posthog-js](https://github.com/PostHog/posthog-js).


Updates `@sentry/sveltekit` from 7.98.0 to 7.100.0
- [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.98.0...7.100.0)

Updates `@typescript-eslint/eslint-plugin` from 6.19.1 to 6.21.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.21.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.19.1 to 6.21.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.21.0/packages/parser)

Updates `posthog-js` from 1.103.1 to 1.105.0
- [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.103.1...v1.105.0)

---
updated-dependencies:
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-updates
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-updates
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-06 22:19:05 +00:00
Mattias Granlund
eb1556f0d7 Show merge button for PRs without checks 
- for now the button will unfortunately only appear after five seconds when no checks are configured
- we need to find an API that tells us if checks are configured or not
- octokit.checks.listForRef gives [] result immediately after pr created, then changes
 2024-02-05 19:05:26 +01:00
Mattias Granlund
d3aca530fa Fetch base branch after merging pull request 2024-02-05 13:56:04 +01:00
Mattias Granlund
ecd37a38a8 Retry fetching checks after PR creation 2024-02-05 13:46:11 +01:00
Mattias Granlund
f45e29b474 Add dropdown for choice of merge, rebase and squash 2024-02-04 22:19:58 +01:00
Mattias Granlund
34b10fae7d
Show disabled "merged" button when PR merged 2024-02-04 21:19:07 +01:00
Mattias Granlund
a64ea2586c
Bugfix pr status when pr closed and remote branch deleted 
- manually refetch after completing merge
- change update terminology to fetch, reads more correct
 2024-02-04 20:58:57 +01:00
Mattias Granlund
1eb7c34fae
Add error handling for failure to load PR status 
- silently ignore if commit/sha not found (happens after merge)
 2024-02-04 20:28:00 +01:00
Mattias Granlund
cee31fe1bf Make PR status reloadable 
- also adds tooltip based on status
 2024-02-04 20:18:08 +01:00
Mattias Granlund
0c63a1b7cf Add github checks status to branch header 
- more work needed on when to request and how often to update
 2024-02-04 19:09:08 +01:00
Mattias Granlund
a34f766dac Remove resizer from FileCard component 
- resizing should be done in context of e.g. branch lane
- leaves branch previews with simpler max 50rem file previews
- no need for those pages to have resizers since we have no actual designs yet
 2024-02-04 13:41:34 +01:00
Mattias Granlund
6a56fa582c Show busy indicator when updating base branch 
- make update button its own component
- show busy while updating
- remove unnecessary log statement
 2024-02-04 12:38:25 +01:00
Mattias Granlund
26fdfdbc39 Pre-populate default when changing remote branch name 
- requested by r0derik on discord
 2024-02-04 10:38:25 +01:00
Mattias Granlund
ca89384ef5 Fix file status for remote files 
- the heuristics for A and D are correct when there is exactly one hunk
- more than one hunk means the file was modified
 2024-02-04 10:24:55 +01:00
Mattias Granlund
389959b756 Add option for creating draft pull request 
- as additional option for the push button
 2024-02-04 10:24:40 +01:00
Mattias Granlund
d68ae9e697 Fix typo in error message 2024-02-03 15:30:48 +01:00
Mattias Granlund
d900ad9649 Remove drag handle from branch preview headers 
- would be preferable to reuse header layout than copying it branch lanes
 2024-02-03 15:19:42 +01:00
Mattias Granlund
cdaaccae2c Add commit link to footer of opened commit card 2024-02-02 17:54:46 +01:00
Mattias Granlund
a7aad139c0 Use same route for viewing remote branchs and PRs 
- like in the board, show tag with link to pull request
- if remote branch does not exist then fall back to old page
- similar header to other branches
- explore commit diffs
 2024-02-02 17:54:46 +01:00
Mattias Granlund
78296f76b0 fix: delete branch instead of applying branch 2024-02-02 15:18:46 +01:00
Mattias Granlund
79e0cc7c2f Remove clowny console.log 2024-02-01 18:06:45 +01:00
Mattias Granlund
7b4ea0e45e Compute file status for remote files 
- based on the diff header
 2024-02-01 18:03:10 +01:00
Mattias Granlund
a85087436c Fix commit card styling 
- refactored a bit after losing the 10px gap between description and author
 2024-02-01 17:59:33 +01:00
Mattias Granlund
874005c1ff Enable file diff viewing for commits in trunk 2024-02-01 17:49:32 +01:00
Mattias Granlund
e5fe606ab0 Lock hunks when viewing remote files 
- readonly prop for hunks to disable cursor and dragging
- removes a console.log
- undo a previous change related to AnyFile
- fix gap between text selection blocks line numbers
 2024-02-01 16:02:28 +01:00
Mattias Granlund
90e7b0f192 Replace LocalFile | RemoteFile with AnyFile 2024-02-01 11:07:13 +01:00
Mattias Granlund
c813dddcd9 Rename File -> LocalFile 2024-02-01 11:07:13 +01:00
Mattias Granlund
f5428dcec7 Make it possible to view remote commits using existing components 
- we need a union type rather than using File | RemoteFile everywhere
 2024-02-01 11:07:13 +01:00
Mattias Granlund
2138a5cc03 Use same FileDiff in FileCard and CommitCard 2024-01-31 18:40:33 +01:00
Mattias Granlund
d838d39600 Extract FileDiff component from FileCard 2024-01-31 18:40:33 +01:00
Mattias Granlund
f5b86497b9 Fix clone with rotation bug (drag & drop) 2024-01-31 13:30:14 +01:00
Mattias Granlund
4de440e444 Refactor hunk viewer (and break it out from FileCard) 
- necessary for aligning commit diff viewer and branch diff viewer
 2024-01-31 13:22:28 +01:00
Mattias Granlund
3d5a692eee Refactor Icon component 
- remove last specific icon svelte component in favor of inline
- move Icon component to common components lib
 2024-01-31 13:13:07 +01:00
Pavel Laptev
27c5d704b3 lint fixes 2024-01-30 14:27:32 +01:00
Pavel Laptev
0a554057f8 New branch container width updated 2024-01-30 14:24:33 +01:00
Pavel Laptev
4c76c9d6fc lint fixes 2024-01-30 00:01:34 +01:00