gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,895 Commits 151 Branches 1,064 Tags 60 MiB
fe218f0f0c
Commit Graph

4895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
fe218f0f0c
Merge pull request #2491 from gitbutlerapp/refactor-hunk-viewer-and-break-it-out-from-filecard- 
Refactor hunk viewer (and break it out from FileCard)
 2024-01-31 13:29:53 +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
Nikita Galaiko
ab8db66dbc
Merge pull request #2488 from gitbutlerapp/set-base-branch-go-back-to-integration 
Set base branch go back to integration
 2024-01-30 14:51:28 +01:00
Pavel Laptev
aa4ad828fa
Merge pull request #2489 from gitbutlerapp/update-new-branch-container-width 
Update new branch container width
 2024-01-30 14:29:11 +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
Nikita Galaiko
55a2641b32 fix going back to existing default target 2024-01-30 11:31:33 +01:00
Pavel Laptev
e04032d7d2
Merge pull request #2487 from gitbutlerapp/project-setup-and-decorative-view-layout-fixes 
Project setup and decorative view layout fixes
 2024-01-30 00:03:36 +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
Mattias Granlund
033b7f22b9 Add gitbutler, gitbutler-s3 and gravatar to browser csp 
- fixes broken profile pictures
- not sure it's worth the effort to proxy through backend
 2024-01-29 17:19:57 +01:00
Mattias Granlund
f8bce24af9 Reformat tauri conf files 2024-01-29 17:19:57 +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
11b0eacf0b
Merge pull request #2466 from gitbutlerapp/target-branch-color-updated 
target branch color updated
 2024-01-29 12:51:08 +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
Kiril Videlov
331dfe8efe Readme clarify language 2024-01-29 10:25:50 +01:00
Kiril Videlov
1297b4fe2a Updates to the Readme 2024-01-29 10:25:50 +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
76e6d3bf7e
Merge pull request #2463 from gitbutlerapp/illustrations-updated 
Illustrations updated
 2024-01-28 21:39:22 +01:00
Pavel Laptev
a403f78765 merged from upstream 2024-01-28 21:25:21 +01:00
Pavel Laptev
e3daa34873 illustration updated 2024-01-28 21:25:19 +01:00
Pavel Laptev
8156444428 illustration updated 2024-01-28 21:25:06 +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
5f4630648a
Merge pull request #2460 from gitbutlerapp/tokens-updates-and-smol-css-fixes 
Tokens updates and commits footer layout fix
 2024-01-28 03:28:13 +01:00
Pavel Laptev
7880be56d2 hide empty containers 2024-01-28 03:19:51 +01:00