gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 08:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,017 Commits 156 Branches 1,064 Tags 61 MiB
d5b35ab463
Commit Graph

5017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Laptev
91e0bdd19e Merged origin/master into Lane style updates 2024-01-23 17:40:14 +01:00
Pavel Laptev
d8fb0f7f4f
Merge pull request #2409 from gitbutlerapp/update-branch-status-colors 
status tag colors and copy updated
 2024-01-23 17:40:04 +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
ea23149f5f merged from upstream 2024-01-23 16:39:14 +01:00
Pavel Laptev
db309df701 lane style updates 2024-01-23 16:39:08 +01:00
Pavel Laptev
49fc30853b lane style updates 2024-01-23 16:38:46 +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
0254190eaf
Merge pull request #2393 from gitbutlerapp/fix-api-call-timeout-3 
Fix api call timeout
 2024-01-23 11:33:59 +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
Nikita Galaiko
83d6d8dd3e
Merge pull request #2377 from gitbutlerapp/refactor-target-and-branch-writers 
Refactor target and branch writers
 2024-01-23 10:10:17 +01:00
Kiril Videlov
3c9408a253 🔧 fix: remove unnecessary TODO comment in hunk_with_context function 2024-01-22 20:48:21 +01:00
Kiril Videlov
6548bdfa21 always add old line number when building hunk context 2024-01-22 20:06:18 +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
Qix
9dccbaa28c
Merge pull request #2383 from gitbutlerapp/add-refspec-parsing 
add refspec parser/formatter class
 2024-01-22 17:08:52 +01:00
Josh Junon
8b42a69fc8 add refspec parser/formatter class 2024-01-22 16:48:42 +01:00
dependabot[bot]
4079e6d87e
chore(deps-dev): bump the npm-patch-updates group with 2 updates 
Bumps the npm-patch-updates group with 2 updates: [@types/crypto-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/crypto-js) and [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).


Updates `@types/crypto-js` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/crypto-js)

Updates `vite` from 4.5.1 to 4.5.2
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite)

---
updated-dependencies:
- dependency-name: "@types/crypto-js"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-patch-updates
- dependency-name: vite
  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-22 15:38:11 +00:00
dependabot[bot]
5f8d6fea95
chore(deps): bump tauri-plugin-single-instance 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `65ea3d9` to `cd7549f`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](65ea3d9adf...cd7549f22e)

---
updated-dependencies:
- dependency-name: tauri-plugin-single-instance
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 15:26:54 +00:00
dependabot[bot]
dbd4d47a43
chore(deps): bump tauri-plugin-window-state from 65ea3d9 to cd7549f 
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `65ea3d9` to `cd7549f`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](65ea3d9adf...cd7549f22e)

---
updated-dependencies:
- dependency-name: tauri-plugin-window-state
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 15:26:29 +00:00
dependabot[bot]
5f39a4cf51
chore(deps): bump the rust-patch-updates group with 2 updates 
Bumps the rust-patch-updates group with 2 updates: [refinery](https://github.com/rust-db/refinery) and [regex](https://github.com/rust-lang/regex).


Updates `refinery` from 0.8.11 to 0.8.12
- [Release notes](https://github.com/rust-db/refinery/releases)
- [Changelog](https://github.com/rust-db/refinery/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-db/refinery/commits)

Updates `regex` from 1.10.2 to 1.10.3
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.10.2...1.10.3)

---
updated-dependencies:
- dependency-name: refinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 15:26:00 +00:00
Kiril Videlov
8ac1367e78 make some elements non-selectable 2024-01-22 16:17:46 +01:00
Nikita Galaiko
4fda8370a4 make sure nothing is flashed when idle 2024-01-22 15:37:42 +01:00
Kiril Videlov
e2d1777a19 🎨 style: update text in new branch creation UI 2024-01-22 14:17:34 +01:00
Nikita Galaiko
c143bc4a1c
Merge pull request #2375 from gitbutlerapp/refactor-file-diffs 
Refactor file diffs
 2024-01-22 13:35:38 +01:00
Nikita Galaiko
143b8f6c3e remove unused variable 2024-01-22 13:13:54 +01:00
Nikita Galaiko
54e3801978
Merge pull request #2374 from gitbutlerapp/add-test-for-applying-first-branch 
Add test for applying first branch
 2024-01-22 11:04:59 +01:00
Mattias Granlund
21cb5d62f8
Merge pull request #2373 from gitbutlerapp/blah-blah-blah 
Remove "target" button in readonly mode
 2024-01-22 10:57:11 +01:00
Nikita Galaiko
0d723554e6 handle applying branch that should become the target 2024-01-22 10:54:28 +01:00
Mattias Granlund
e6d9691396 Remote "target" button in readonly mode 2024-01-22 10:48:57 +01:00
Pavel Laptev
58616373ff
Merge pull request #2372 from gitbutlerapp/update-board-styles 
styles updated
 2024-01-21 22:07:29 +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
6eb490e07b
Merge pull request #2370 from gitbutlerapp/new-branch-empty-state-fixed-1 
updated “Up to date screen"
 2024-01-21 21:08:25 +01:00
Pavel Laptev
2b9318da15 updated “Up to date screen" 2024-01-21 20:50:44 +01:00
Pavel Laptev
f3f476fbb5
Merge pull request #2369 from gitbutlerapp/new-branch-empty-state-fixed-1 
New branch empty state fixed and minor CSS fixes
 2024-01-20 16:49:45 +01:00
Pavel Laptev
9e119e4e47 minor css fixes 2024-01-20 16:29:40 +01:00