Commit Graph

4662 Commits

Author SHA1 Message Date
Josh Junon
783b8c588b revert cargo dependabot updates back to weekly and use groups instead 2024-01-19 18:03:10 +01:00
Qix
a4fa1cb844
Merge pull request #2326 from gitbutlerapp/virtual-branch-1
change dependabot checks for rust to submit PRs monthly instead of weekly
2024-01-19 17:58:33 +01:00
Josh Junon
bc00ec8701 change dependabot checks for rust to submit PRs monthly instead of weekly 2024-01-19 17:58:05 +01:00
Qix
92908ca018
Merge pull request #2325 from gitbutlerapp/add-test-attribute-and-allow-unused-imports
pass —all-targets to cargo test in crate check
2024-01-19 17:53:58 +01:00
Josh Junon
80ccc8d453 pass —all-targets to cargo test in crate check 2024-01-19 17:53:28 +01:00
Qix
c262b0d9cb
Merge pull request #2324 from gitbutlerapp/add-test-attribute-and-allow-unused-imports
use more advanced filters to better cull unrelated files and clean up filters
2024-01-19 17:51:20 +01:00
Josh Junon
d2589601f3 use more advanced filters to better cull unrelated files and clean up filters 2024-01-19 17:50:52 +01:00
Josh Junon
a9a8276d7e add matrix-based CI config for core libs 2024-01-19 17:25:49 +01:00
Pavel Laptev
2d96466f9f
Merge pull request #2322 from gitbutlerapp/minor-css-fixes
Minor css fixes
2024-01-19 14:15:33 +01:00
Pavel Laptev
f1910d47d6 minor css fixes 2024-01-19 14:13:27 +01:00
Pavel Laptev
68b8156604 minor css fixes 2024-01-19 14:12:23 +01:00
Mattias Granlund
965a51e1e8 Refactor branch lane layout
- whole lane scrollable rather than individual sections
- new upstream commit section
- fixed header at the top
- fixes scroll lock issue with nested scroll containers
- known issue with grey padding on drag
2024-01-19 13:58:37 +01:00
Nikita Galaiko
18294abc20
Merge pull request #2320 from gitbutlerapp/add-tests-for-branch-selection
Add tests for branch selection
2024-01-19 11:13:59 +01:00
Nikita Galaiko
9670c863c0 always explicitly mark selected_for_changes 2024-01-19 11:07:22 +01:00
Nikita Galaiko
53e30ebee8
Merge pull request #2319 from gitbutlerapp/speed-up-is_remote-check
speed up is_remote check
2024-01-19 08:40:29 +01:00
Nikita Galaiko
9898e7bf43 speed up is_remote check by assuming parents are remote 2024-01-19 08:08:59 +01:00
Pavel Laptev
d65f776781
Merge pull request #2317 from gitbutlerapp/some-css-updated
minor css update
2024-01-19 01:37:20 +01:00
Pavel Laptev
676d9dbed7 minor css update 2024-01-19 01:34:47 +01:00
Pavel Laptev
76e2b94e3c
Merge pull request #2316 from gitbutlerapp/some-css-updated
minor styles tweak
2024-01-19 01:31:16 +01:00
Pavel Laptev
2d61eab2e0 Dragndrop caption fontsize updated 2024-01-19 01:28:30 +01:00
Pavel Laptev
3ee42e8d3b minor styles tweak 2024-01-19 01:25:48 +01:00
Pavel Laptev
9356201ea6
Merge pull request #2315 from gitbutlerapp/app-icons-updated
app icons updated
2024-01-19 01:15:45 +01:00
Pavel Laptev
d978bb6aa4 updated icons 2024-01-19 01:09:54 +01:00
Pavel Laptev
96cb115553 app icons updated 2024-01-19 01:03:24 +01:00
Pavel Laptev
0072499a18
Merge pull request #2314 from gitbutlerapp/empty-states-updated
empty states updated, added missing text class
2024-01-19 00:49:51 +01:00
Pavel Laptev
550583fc38 empty states updated, added missing text class 2024-01-19 00:48:10 +01:00
Qix
d7edafb8d4
Merge pull request #2313 from gitbutlerapp/add-test-attribute-and-allow-unused-imports
harden git backends against various configs
2024-01-18 18:15:56 +01:00
Josh Junon
5af679b20f add a few more config types to the workflows run 2024-01-18 17:44:12 +01:00
Josh Junon
4f03b290c4 harden git backends against various configs 2024-01-18 17:38:34 +01:00
Qix
8cd7994d42
Merge pull request #2255 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.4
chore(deps): bump ssh-key from 0.6.3 to 0.6.4
2024-01-18 17:32:51 +01:00
Qix
a2b0cf7ad4
Merge pull request #2253 from gitbutlerapp/dependabot/cargo/futures-0.3.30
chore(deps): bump futures from 0.3.29 to 0.3.30
2024-01-18 17:32:34 +01:00
Qix
74390dc6c7
Merge pull request #2254 from gitbutlerapp/dependabot/cargo/git2-hooks-0.3.1
chore(deps): bump git2-hooks from 0.3.0 to 0.3.1
2024-01-18 17:32:22 +01:00
Qix
40cdc3a990
Merge pull request #2192 from gitbutlerapp/dependabot/npm_and_yarn/codemirror/state-6.4.0
chore(deps-dev): bump @codemirror/state from 6.3.1 to 6.4.0
2024-01-18 17:31:18 +01:00
Qix
aac17f7ddd
Merge pull request #2150 from gitbutlerapp/dependabot/npm_and_yarn/nanoid-5.0.4
chore(deps-dev): bump nanoid from 5.0.3 to 5.0.4
2024-01-18 17:30:46 +01:00
Qix
468ea895b2
Merge pull request #2311 from gitbutlerapp/virtual-branch-1-1
fix readme it’s -> its
2024-01-18 17:24:43 +01:00
Josh Junon
c308727927 fix readme it’s -> its 2024-01-18 17:24:17 +01:00
Qix
f1852893ad
Merge pull request #2310 from gitbutlerapp/virtual-branch-1
add core libs to push changes workflow
2024-01-18 17:23:21 +01:00
Josh Junon
6471696108 add core libs to push changes workflow 2024-01-18 17:22:50 +01:00
Qix
51ff3bb8a1
Merge pull request #2309 from gitbutlerapp/add-gitbutler-integration-tests
add integration tests for core git abstraction library
2024-01-18 17:20:48 +01:00
Josh Junon
897fd8b217 add integration tests for core git abstraction library 2024-01-18 17:20:00 +01:00
Mattias Granlund
cc44e2c8ff Add initial value for branches observable 2024-01-18 16:01:36 +01:00
Mattias Granlund
dd73f2397f Fix board reactivity when switching projects
- you would see old branch data until list_virtual_branches returned
2024-01-18 15:57:05 +01:00
Kiril Videlov
1e50bbd708 update tests 2024-01-18 15:31:53 +01:00
Kiril Videlov
7b36315149 use the new change type to determine add/del/modified instead of hunk header 2024-01-18 15:31:53 +01:00
Kiril Videlov
27347f66fb serialize enum with lowercase 2024-01-18 15:31:53 +01:00
Kiril Videlov
8d564a6b45 skip types that we dont need for frontend 2024-01-18 15:31:53 +01:00
Kiril Videlov
b9b72fe7e2 🔨 chore: refactor diff printing to include change type information 2024-01-18 15:31:53 +01:00
Mattias Granlund
9e79bebb67 Show js error on problem loading repo page 2024-01-18 14:26:11 +01:00
Mattias Granlund
b5f3bb3609 feat: add tooltip to ahead/behind 2024-01-18 14:01:52 +01:00
Nikita Galaiko
ed6030486c
Merge pull request #2281 from gitbutlerapp/rebase-and-merge-function
Rebase and merge function
2024-01-18 13:03:32 +01:00