gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-30 04:58:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,025 Commits 157 Branches 1,072 Tags 61 MiB
1c4f8a0ed2
Commit Graph

354 Commits

Author SHA1 Message Date
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
Pavel Laptev
7b549f5cfb added condtional tag rendering to Project setup 2024-01-29 23:55:11 +01:00
Pavel Laptev
381f8b87fc Project setup and decorative view layout fixes, svg icon opacity issue fixed 2024-01-29 23:50:43 +01:00
Mattias Granlund
c7df449b1a Add help param to BranchIcon component 
- fixes position of tooltip
 2024-01-29 23:09:38 +01:00
Mattias Granlund
0ae3b2f3b2 Allow undefined param for front end tooltip 
- makes it easier to bind to properties that can be undefined
 2024-01-29 23:07:14 +01:00
Mattias Granlund
6c0da83d1e Fix a couple of small things 2024-01-29 22:24:42 +01:00
Kiril Videlov
cea360a0cd refactor: remove console.log statement from tooltip getter 2024-01-29 20:22:11 +01:00
Kiril Videlov
c17580e8e1 feat: add tooltip functionality to branch icons in the UI to provide additional information about the branch state 
chore: remove duplicate import of tooltip in a component
 2024-01-29 20:18:16 +01:00
Mattias Granlund
0315ff20a9 Add delete branch button for unapplied branches 
- reported missing by discord user
 2024-01-29 19:53:26 +01:00
Kiril Videlov
6232bf3267 fix: dragging of lanes on Linux / Windows 2024-01-29 19:35:58 +01:00
Kiril Videlov
f8d02dfe4e fix: commit card style attribute 2024-01-29 17:50:21 +01:00
dependabot[bot]
8bab1f6e07 Bump the npm-patch-updates group with 4 updates 
Bumps the npm-patch-updates group with 4 updates: [@codemirror/lang-html](https://github.com/codemirror/lang-html), [@codemirror/view](https://github.com/codemirror/view), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


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

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

Updates `@typescript-eslint/eslint-plugin` from 6.19.0 to 6.19.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/v6.19.1/packages/eslint-plugin)

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

---
updated-dependencies:
- dependency-name: "@codemirror/lang-html"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: "@typescript-eslint/parser"
  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-29 16:51:22 +01:00
dependabot[bot]
d5b77bd98f Bump the npm-minor-updates group with 2 updates 
Bumps the npm-minor-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.94.1 to 7.98.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.94.1...7.98.0)

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

---
updated-dependencies:
- dependency-name: "@sentry/sveltekit"
  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-01-29 16:50:34 +01:00
Mattias Granlund
7660b4c4f0 Separate dropzone from draggable 2024-01-29 16:23:12 +01:00
Mattias Granlund
de4cd8e5a4 Delete most standalone (and unused) icons 2024-01-29 15:59:19 +01:00
Mattias Granlund
8c26d6794a Delete unused code and move more things 
- part of ongoing project structure cleanup
 2024-01-29 15:59:19 +01:00
Mattias Granlund
fb2f8cca16 Moving the rest of components into $lib 
- the routing structure is now almost free from component files
 2024-01-29 15:21:35 +01:00
Mattias Granlund
9d762f295d Delete unused components 2024-01-29 14:47:04 +01:00
Mattias Granlund
1eb0ba432a Move more components into $lib 2024-01-29 14:47:04 +01:00
Mattias Granlund
8d878ee96c Move components into $lib 
- tidying up project structure
 2024-01-29 14:47:04 +01:00
Mattias Granlund
34ceebfcb9 Rename branch property readonly -> isUnapplied 2024-01-29 14:21:32 +01:00
Mattias Granlund
ecede7f6a6 fix: add error toast notification when loading remote branches fails 2024-01-29 13:57:47 +01:00
Pavel Laptev
b78cbda736 target branch color updated 2024-01-29 12:31:00 +01:00
Mattias Granlund
89b0384f48 chore: update label for stashed context menu item to "Unapplied" 2024-01-29 11:28:08 +01:00
Mattias Granlund
9d4a709012 Sort front end imports using eslint plugin 2024-01-29 09:44:08 +01:00
Mattias Granlund
80b48778f8 Enable eslint import/order plugin 2024-01-29 09:44:08 +01:00
Mattias Granlund
45c84564d4 Drop unused card expansions code 2024-01-29 09:44:08 +01:00
Pavel Laptev
e3daa34873 illustration updated 2024-01-28 21:25:19 +01:00
Mattias Granlund
eca69de970 Use 1 sec tooltip delay for ahead/behind 2024-01-28 21:24:50 +01:00
Mattias Granlund
e5c5d143a6 Remove plus/minus signs from ahead behind 
- also separates tooltip into two separate tooltips
 2024-01-28 21:24:50 +01:00
Kiril Videlov
7a05d6914c feat: adds configurable telemetry settings for error reporting and metrics tracking 2024-01-28 12:59:22 +01:00
Pavel Laptev
7880be56d2 hide empty containers 2024-01-28 03:19:51 +01:00
Pavel Laptev
c1d0746cc2 Tokens updates and commits footer layout fix 2024-01-28 02:57:23 +01:00
Kiril Videlov
86714636d5 chore: remove unnecessary console.log statements 2024-01-27 20:17:25 +01:00
Mattias Granlund
d9102716d8 Put stashed branches in the sidenav again 2024-01-27 14:39:04 +01:00
Mattias Granlund
a561a004f7 Fix diff indentation problem 
- we adjusted indentation in the past when we had no horizontal scroll
 2024-01-27 13:44:14 +01:00
Mattias Granlund
7ded6ae5b6 chore: fix filterByText function to correctly filter branches by search term 2024-01-27 13:30:30 +01:00
Mattias Granlund
9d7ebabb84 chore: remove user-select: none from board 2024-01-27 13:25:27 +01:00
Mattias Granlund
e6107aab30 chore: remove unused draggable file feature from file card component 2024-01-27 13:24:47 +01:00
Mattias Granlund
20c725819b feat: add distinctUntilChanged operator to prevent emitting duplicate values in getHeads function 2024-01-26 14:32:18 +01:00
Mattias Granlund
6b3e1ee027 Fix dragging file while file card open 2024-01-26 14:17:37 +01:00
Mattias Granlund
23e7cd7409 feat: add toggle button to stash/unstash branch changes in the UI 2024-01-26 11:58:59 +01:00
Mattias Granlund
85ce4a7b40 Set correct tooltip font-size 2024-01-26 11:23:34 +01:00
Mattias Granlund
83523e811a Nit pick some variable names in tooltip.ts 2024-01-25 23:26:34 +01:00
Mattias Granlund
79629e9ca6 Replace tooltip with use:directive implementation 
- tooltip placed in document root, absolutely positioned
- position retained during zoom
 2024-01-25 20:19:16 +01:00
Kiril Videlov
35fd485858 chore: remove unused code and styles for update banner component 2024-01-25 14:21:48 +01:00
Pavel Laptev
f9b1bffdf4 updated resize shift variable 2024-01-25 01:52:17 +01:00
Kiril Videlov
df81625c1f chore: add tooltips to provide additional information for unapplied and applied branch changes buttons 2024-01-24 22:47:45 +01:00
Kiril Videlov
3a1b79ad4f chore: update tooltips for stashed changes and virtual branch changes in the UI 2024-01-24 22:18:42 +01:00
Kiril Videlov
bc2674d9f3 chore: update branch selection buttons with tooltips to clarify their functionality 2024-01-24 22:18:21 +01:00
Qix
0195eacc73
Merge pull request #2382 from gitbutlerapp/dependabot/npm_and_yarn/npm-patch-updates-33a9f5d2c6 
chore(deps-dev): bump the npm-patch-updates group with 2 updates
 2024-01-24 18:41:43 +01:00
Mattias Granlund
eacb2db6c6 Use textbox components on settings page 2024-01-24 18:26:16 +01:00
Kiril Videlov
975729d409 chore: update terminology from "applied branches" to "workspace" 2024-01-24 17:50:36 +01:00
Pavel Laptev
04db6b7da1
Merge pull request #2428 from gitbutlerapp/lane-style-updates 
Lane style updates
 2024-01-24 16:53:11 +01:00
Mattias Granlund
8c72a6b7f3 Remove dead stashed branches code 2024-01-24 16:52:33 +01:00
Pavel Laptev
463a0db255 unused CSS removed 2024-01-24 16:51:20 +01:00
Pavel Laptev
0935f1db75 File card animation duration updated 2024-01-24 16:49:06 +01:00
Pavel Laptev
c4f9973373 lint fixes 2024-01-24 16:38:06 +01:00
Pavel Laptev
0db0f0342b lint fixes 2024-01-24 16:29:49 +01:00
Pavel Laptev
bfffc227e4 lint fixes 2024-01-24 16:24:43 +01:00
Pavel Laptev
9176b0e693 Merged origin/master into lane-style-updates 2024-01-24 16:20:25 +01:00
Pavel Laptev
e4ef5fb497 resizer updated, expander icon hover updated 2024-01-24 16:20:17 +01:00
Mattias Granlund
b4d56e191f Fix posthog events 
- broken due register call coming before init
 2024-01-24 15:30:04 +01:00
Pavel Laptev
73cad6b808 Update lane and board styles 2024-01-24 11:16:18 +01:00
Pavel Laptev
6999c94586 Merged origin/master into lane-style-updates 2024-01-24 11:08:01 +01:00
Pavel Laptev
8934384d83 Merged origin/master into lane-style-updates 2024-01-24 11:07:32 +01:00
Mattias Granlund
3e37ffc095 Go to board instead of base on startup 2024-01-24 10:55:24 +01:00
Mattias Granlund
0cacc62c34 Move PR creation logic to service 
- makes the UI component easier to manage
 2024-01-24 10:45:07 +01:00
Mattias Granlund
84807f3e9b Drop unused stashed preview file 2024-01-24 10:39:39 +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