Commit Graph

6219 Commits

Author SHA1 Message Date
Pavel Laptev
d2dde6cec5
scc: button fixes (#3453) 2024-04-08 11:26:30 +02:00
Pavel Laptev
e7377132bf
Design tokens updates (#3452)
* refactored design tokens

* color-mix CSS function replaced with oklch

OKLCH has more accurate and shorter way of making colors darker for hover effects
2024-04-08 09:06:17 +02:00
Mattias Granlund
603710329f Rename branchStoresCache.ts -> virtualBranch.ts
- split out `baseBranch.ts`, these should never have been in the same file
2024-04-07 15:03:18 +02:00
Caleb Owens
fa75c8f817
Merge pull request #3424 from gitbutlerapp/refactor-settings-into-multiple-files
Refactor settings into multiple real pages
2024-04-07 12:36:30 +01:00
Mattias Granlund
f4ba84753b Check for locked status correctly
- always check on boolean property instead of array length
2024-04-05 15:30:26 +02:00
Pavel Laptev
04fb7848ce
Smol CSS fixes (#3441)
* zindex remove: it crops the sidebar resizer thumb

* delete project button changed to the contrast one
2024-04-05 13:09:44 +02:00
Josh Junon
91c0800822
Merge pull request #3442 from gitbutlerapp/windows-unused-import
removed unused import on windows
2024-04-05 12:17:55 +02:00
Josh Junon
7a77d980bf
removed unused import on windows 2024-04-05 12:03:23 +02:00
Caleb Owens
2b780fdbde Removed overly specific type casts 2024-04-05 00:16:22 +01:00
Caleb Owens
d5f5f90e7a Fix import ordering in sidebar 2024-04-05 00:00:21 +01:00
Caleb Owens
d7ae34d612 Rename ProfileSIdebar to Sidebar 2024-04-04 23:56:36 +01:00
Caleb Owens
1b94b2fcdd Fix formatting 2024-04-04 23:06:02 +01:00
Caleb Owens
00910c8027 De-duplicate AnalyticsSettings 2024-04-04 23:06:02 +01:00
Caleb Owens
5ef5fa0143 Refactor settings into multiple real pages 2024-04-04 23:06:00 +01:00
Mattias Granlund
1c2db6f24f Allow amend while hunk/file locked
We have gone a bit back and forth here, but this should be the right way of handling locks wrt to dragging.

- uses dropzone accept call to dynamically block locked hunks/files
2024-04-04 21:06:30 +02:00
Mattias Granlund
96a3237ac1 Allow merging/rebasing from branch preview
- feels like you shouldn't need to apply a branch just to merge a pr
2024-04-04 19:14:05 +02:00
Mattias Granlund
e95fb62410 Flatten the AI service directory
- resolves cyclic dependency between the two packages
2024-04-04 19:06:28 +02:00
Mattias Granlund
54cba257dd Fix cyclical dependency in AI service 2024-04-04 18:19:26 +02:00
Mattias Granlund
295e14ee50 Improve wait conditions for PR checks
- continue waiting if there are check suites that haven't completed
2024-04-04 15:49:51 +02:00
Pavel Laptev
b36bc1ff4b
wiggle lock files if dragging (#3432)
* wiggle lock files if dragging

* lint fixes

* Expand lane only when clicking expand button

- previous behavior was click anywhere to expand

* wiggle lock files if dragging

* lint fixes

* minor comments change

---------

Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
2024-04-04 15:31:56 +02:00
Mattias Granlund
6b888c3e89 Expand lane only when clicking expand button
- previous behavior was click anywhere to expand
2024-04-04 15:19:57 +02:00
Mattias Granlund
5882d2ed32 Update two eslint npm packages
- dependabot doesn't suggest major upgrades
2024-04-04 14:57:28 +02:00
Josh Junon
b9c07265c2
Merge pull request #3344 from gitbutlerapp/separate-integration-tests
separate integration tests for 'changeset' crate
2024-04-04 14:07:46 +02:00
Josh Junon
e7c8d5823a
Merge pull request #3347 from gitbutlerapp/separate-integration-tests-git
separate integration tests for 'git' crate
2024-04-04 14:00:35 +02:00
Sebastian Thiel
4bd5495020
chore(changeset): don't build doc-tests
There are no doctests and it's unlikely there will be anytime soon
as this library isn't for publishing.
2024-04-04 13:53:08 +02:00
Sebastian Thiel
194f8b5235
chore(changeset): assure the crate isn't published.
The crate is only for use by GitButler.
2024-04-04 13:53:07 +02:00
Sebastian Thiel
ee88e1b9b0
chore: separate 'changeset' crate integration tests 2024-04-04 13:53:03 +02:00
Sebastian Thiel
884f8a742d
chore(git): don't build doc-tests, or unit-tests of binaries
There are no doctests and it's unlikely there will be anytime soon
as this library isn't for publishing.

The binaries did try to build unit-tests as well even though these
aren't quite feasible, so they are disabled now to reduce clutter.
2024-04-04 13:46:07 +02:00
Sebastian Thiel
2ee77704c7
chore(git): assure the crate isn't published.
The crate is only for use by `gitbutler`.
2024-04-04 13:46:00 +02:00
Sebastian Thiel
ed2daf5ffb
chore: separate 'git' crate integration tests 2024-04-04 13:45:58 +02:00
Josh Junon
28a4f841aa
Merge pull request #3429 from gitbutlerapp/fix-readme-assets
fix gitbutler-app -> gitbutler-tauri broken links
2024-04-04 12:55:52 +02:00
Josh Junon
a425c8c3b5
fix gitbutler-app -> gitbutler-tauri broken links 2024-04-04 12:55:08 +02:00
Josh Junon
22a732b21e
Merge pull request #3405 from gitbutlerapp/restructure-crates
Restructure crates
2024-04-04 12:53:03 +02:00
Josh Junon
4d78be2d95
fix clippy lints from toolchain update 2024-04-04 12:37:52 +02:00
Josh Junon
977d9096be
update toolchain 2024-04-04 12:20:31 +02:00
Josh Junon
59af2953cd
update config to refer to new crate structure 2024-04-04 12:09:12 +02:00
Josh Junon
5a9962bc5a
initial move of crates (no config changes) 2024-04-04 11:49:12 +02:00
Pavel Laptev
fa2a75508b
CSS fixes (#3427)
* fix: draggable scroll triggered too early
the triggerRange set to fixed number because it was getting triggered too soon on small screens.
* `shaky` animation renamed + deleted unused CSS
2024-04-04 01:54:09 +02:00
Mattias Granlund
06689a79ac Fix bug where extra files shown while dragging
The drag cloning selector can be used in different branches, so we can to restrict our dom query to only the parent container of the file being dragged.
2024-04-04 01:49:50 +02:00
Mattias Granlund
ea1a16cc1f Refactor FileSelection into a custom store
This just makes more sense.
2024-04-04 01:21:21 +02:00
Pavel Laptev
281f1c7476
Small layout fixes for files list (#3423) 2024-04-03 22:45:18 +02:00
Mattias Granlund
d021eb51a4 Refactor internal error page
- copies most things from `ProblemLoadingRepo`
- `maybeGetContext` function now necessary for project selector
- throw expected error in layout.ts if loading project fails
2024-04-03 22:10:54 +02:00
Mattias Granlund
ea9cf23997 Fix drag & drop object clone
- dimensions must be preserved
- old code related to file tree dropped
2024-04-03 17:52:26 +02:00
Mattias Granlund
07310ce67f Bugfix file selection
- file preview must close when no file selected
2024-04-03 17:52:26 +02:00
Mattias Granlund
c5738fee4b Allow hunk drag when locked, necessary for amending commit 2024-04-03 17:18:54 +02:00
Mattias Granlund
a0d30e8f43 Fix shift selecting files after rebasing Pavel's work
- works but will need more love
2024-04-03 17:18:54 +02:00
Pavel Laptev
6c8544acd8 disable dragging for locked files 2024-04-03 17:18:54 +02:00
Pavel Laptev
19cbb91961 added autoscroll on drag + style fixes 2024-04-03 17:18:54 +02:00
Pavel Laptev
f725f55ad1 add utility to select files 2024-04-03 17:18:54 +02:00
Pavel Laptev
a49ccc3eee added autoscroll on drag + style fixes 2024-04-03 17:18:54 +02:00