Commit Graph

5212 Commits

Author SHA1 Message Date
Pavel Laptev
fb78f18ad5 chore: refactor defaultBranchWidthRem initialization and remove unnecessary code 2024-02-11 22:17:26 +01:00
Pavel Laptev
232bb7be16 style: add hover effect to collapsed lane arrow icon 2024-02-11 22:17:00 +01:00
Pavel Laptev
5fa16a263a chore: clean up code formatting and remove commented out code 2024-02-11 22:13:27 +01:00
Pavel Laptev
3427a3e8c5 Merged origin/master into Collapsable lane 2024-02-11 22:09:15 +01:00
Kiril Videlov
d234649e47 feat: add support for fetching remote branch data and displaying commits in the branch view 2024-02-11 21:54:39 +01:00
Pavel Laptev
22c6b7813c chore: simplify code formatting and remove unnecessary code 2024-02-11 20:42:29 +01:00
Pavel Laptev
5e6d5c466b chore: refactor code formatting and remove unused imports and variables 2024-02-11 20:40:43 +01:00
Pavel Laptev
994a50d4aa merged from upstream 2024-02-11 13:10:00 +01:00
Pavel Laptev
373695379a
Merge pull request #2583 from gitbutlerapp/collapsable-lane-with-persistence
persist lane collapsed state in local storage
2024-02-11 13:09:17 +01:00
Kiril Videlov
1a9b532edf persist lane collapsed state in local storage 2024-02-11 13:05:26 +01:00
Pavel Laptev
9eaae9f1ab chore: remove unused hasNextSibling variable and console.log statements 2024-02-10 15:55:55 +01:00
Pavel Laptev
b7c1e8cd36 chore: update tag labels for integrated and virtual lanes, and remote tag to improve consistancy 2024-02-10 00:25:37 +01:00
Pavel Laptev
4c977840d6 style: update padding and remove commented out code in collapsed lane component 2024-02-09 23:49:44 +01:00
Pavel Laptev
c1e69998dc Merged origin/master into Collapsable lane 2024-02-09 23:18:26 +01:00
Pavel Laptev
e107f6b00c tag component update, collapsable branches frontend added 2024-02-09 23:18:10 +01:00
Kiril Videlov
a42bbd7ffd feat: adds support for omitting host certificate checks when authenticating with ssh 2024-02-09 17:51:58 +01:00
Pavel Laptev
c6bc57cb90 Added new icons, merge conflicts resolved 2024-02-09 12:17:47 +01:00
Pavel Laptev
9e95fdb304
Merge pull request #2579 from gitbutlerapp/refactor-tag-component-and-status-tag
Refactor Tag component and status-tag
2024-02-09 12:13:54 +01:00
Pavel Laptev
b84ca9e3de chore: remove unused CSS classes for status tags 2024-02-09 12:12:04 +01:00
Pavel Laptev
77646b66f7 refactor: update status tags and tooltips in UI
- Removed duplicate icons and unnecessary div elements
- Replaced div elements with custom Tag components for better consistency and readability
- Updated tooltips for each status tag to provide clearer information to the user
- Updated CSS selector to exclude elements with the "not-button" class from hover effect
2024-02-09 12:11:21 +01:00
Kiril Videlov
3251e15d40 feat: add gitbutler-git as a dependency and update git_head function to use gitbutler-git library for retrieving the symbolic head of a repository 2024-02-08 19:09:57 +01:00
Josh Junon
6730c421de
Merge pull request #2576 from gitbutlerapp/fix-git-repo-open-or-init
fix remote repo in gitbutler-git tests
2024-02-08 17:41:24 +01:00
Josh Junon
8e0ef27de8 fix remote repo in gitbutler-git tests 2024-02-08 17:03:37 +01:00
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
Josh Junon
813f543e08
Merge pull request #2571 from gitbutlerapp/add-head-method-to-repo-trait
Fix git head error handling and add symbolic head function
2024-02-08 15:01:34 +01:00
Josh Junon
8c1bfe0617 Fix git head error handling and add symbolic head function 2024-02-08 14:56:00 +01:00
Josh Junon
5960c1e6f5
Merge pull request #2570 from gitbutlerapp/add-head-method-to-repo-trait
add .head() method to repository trait
2024-02-08 13:57:05 +01:00
Josh Junon
3443414e53 add .head() method to repository trait 2024-02-08 13:51:45 +01:00
Pavel Laptev
bdea39de1f
Merge pull request #2569 from gitbutlerapp/improved-project-remove-ui
Improved project remove UI
2024-02-07 23:27:41 +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
a33a41c74f
Merge pull request #2566 from gitbutlerapp/tokens-and-tag-componen-updates
Tokens and tag componen updates
2024-02-07 15:54:45 +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
Qix
5ef325d1c6
Merge pull request #2564 from gitbutlerapp/dependabot/cargo/rust-updates-f14906a2e7
Bump the rust-updates group with 2 updates
2024-02-07 13:17:27 +01:00
dependabot[bot]
cef13d177c
Bump the rust-updates group with 2 updates
Bumps the rust-updates group with 2 updates: [git2](https://github.com/rust-lang/git2-rs) and [tempfile](https://github.com/Stebalien/tempfile).


Updates `git2` from 0.18.1 to 0.18.2
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/git2-0.18.1...git2-0.18.2)

Updates `tempfile` from 3.9.0 to 3.10.0
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-07 12:09:43 +00:00
Qix
4cf7c384b1
Merge pull request #2497 from gitbutlerapp/fix-unsafe-create-askpass-server
initial ssh tests and async git2 backend implementation
2024-02-07 13:05:39 +01:00
Qix
6a607777bf
Merge pull request #2563 from gitbutlerapp/dependabot/npm_and_yarn/npm-updates-e328db8859
Bump the npm-updates group with 2 updates
2024-02-07 12:55:54 +01:00
Josh Junon
b90c9235a3 initial ssh tests and async git2 backend implementation
allow certain git backends to temporarily disable IO tests
2024-02-07 12:55:23 +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
Qix
f2c3a571a7
Merge pull request #2562 from gitbutlerapp/update-dependency-update-schedule
update dependabot schedule and grouping
2024-02-07 12:43:46 +01:00
Josh Junon
1cc354321d update dependabot schedule and grouping 2024-02-07 12:42:21 +01:00
Kiril Videlov
c49d6f11e9 fix: error propagation when listing remote branches 2024-02-07 10:57:19 +01:00
Nikita Galaiko
16f53de3d7
Merge pull request #2552 from gitbutlerapp/gb-818-add-test-for-unapplying-ownership
GB-818 Add test for unapplying ownership
2024-02-07 08:10:26 +01:00