Nikita Galaiko
|
a614f79f1d
|
Merge pull request #1747 from gitbutlerapp/dependabot/cargo/tracing-appender-0.2.3
Bump tracing-appender from 0.2.2 to 0.2.3
|
2023-11-28 14:00:05 +01:00 |
|
Nikita Galaiko
|
cc0739f6aa
|
fix losing work on base branch update
|
2023-11-28 13:59:17 +01:00 |
|
Kiril Videlov
|
9e37883aaa
|
fix: update fetch order to first sync to cloud and then fetch from target
|
2023-11-28 13:56:56 +01:00 |
|
Kiril Videlov
|
3be483085a
|
refactor: add readonly prop to BranchHeader component
|
2023-11-28 13:54:00 +01:00 |
|
PavelLaptev
|
a4f0f92e10
|
merged upstream
|
2023-11-28 13:42:18 +01:00 |
|
PavelLaptev
|
e31cee245a
|
Css fixes
|
2023-11-28 13:42:03 +01:00 |
|
Kiril Videlov
|
4e466572c1
|
chore: update branch display layout and add tooltip for merge conflict information
|
2023-11-28 12:59:15 +01:00 |
|
Mattias Granlund
|
14d2e43294
|
Make file tree items selectable
|
2023-11-28 10:51:55 +00:00 |
|
Mattias Granlund
|
5240596ab0
|
🔨 chore: fix conditional statement for file lock tooltip in header component
|
2023-11-28 10:44:07 +00:00 |
|
Mattias Granlund
|
160c860425
|
Add modified lines and file status to file card
|
2023-11-28 09:58:24 +00:00 |
|
Mattias Granlund
|
5ba99206b9
|
Add loading status tooltip with spinner icon
|
2023-11-28 09:58:04 +00:00 |
|
Mattias Granlund
|
a54ed979f3
|
Remove concept of sessions from front end
|
2023-11-28 10:09:22 +01:00 |
|
Nikita Galaiko
|
cbb54ac72a
|
Merge pull request #1742 from gitbutlerapp/gb-674-2
GB-674 (2)
|
2023-11-28 08:02:10 +01:00 |
|
PavelLaptev
|
666da83180
|
segment control css update
|
2023-11-28 01:40:45 +01:00 |
|
Mattias Granlund
|
48db234f2a
|
Improve behaviour of file selection
|
2023-11-28 00:13:08 +00:00 |
|
Mattias Granlund
|
174e295f3a
|
Improve no changes branch state
|
2023-11-28 00:13:08 +00:00 |
|
PavelLaptev
|
2d51fdcf1d
|
css fixes
|
2023-11-28 00:55:23 +01:00 |
|
Pavel Laptev
|
352a626817
|
Merge branch 'master' into css-changes
|
2023-11-28 00:50:06 +01:00 |
|
PavelLaptev
|
0ebac9075d
|
css fixes
|
2023-11-28 00:45:20 +01:00 |
|
Mattias Granlund
|
fb32a06d31
|
Make file card resizable
|
2023-11-27 22:39:41 +00:00 |
|
Mattias Granlund
|
ab29fd4e84
|
Add tags for file card
|
2023-11-27 23:08:59 +01:00 |
|
Mattias Granlund
|
42883198d0
|
Improve file selection in branch card
|
2023-11-27 22:28:43 +01:00 |
|
Mattias Granlund
|
344c24b702
|
Improve a bunch of stuff
|
2023-11-27 22:15:26 +01:00 |
|
Mattias Granlund
|
9e61bc05b0
|
Show file diff next to branch lane
|
2023-11-27 21:42:01 +01:00 |
|
Mattias Granlund
|
f2827b8978
|
fix: update dropdown component to include wrapper div for proper styling and positioning
|
2023-11-27 18:53:08 +00:00 |
|
Mattias Granlund
|
9471e8567a
|
Move branch lane to branch card
|
2023-11-27 18:38:33 +00:00 |
|
extrawurst
|
7350fc59d0
|
fix push code (#1714)
|
2023-11-27 18:25:50 +01:00 |
|
Mattias Granlund
|
ca106bc3e4
|
Update navigation bar and selected states
|
2023-11-27 17:23:51 +00:00 |
|
Kiril Videlov
|
bb1928de1b
|
fix lint issue
|
2023-11-27 18:18:44 +01:00 |
|
Kiril Videlov
|
fac45a2d6b
|
chore: update styling and conditional rendering in branch component
|
2023-11-27 18:18:44 +01:00 |
|
PavelLaptev
|
61b09582f1
|
merged upstream
|
2023-11-27 18:02:01 +01:00 |
|
Mattias Granlund
|
5d3f2e7084
|
chore: update styling of input field to improve visibility and add placeholder color
|
2023-11-27 16:59:13 +00:00 |
|
Mattias Granlund
|
88526d237a
|
Fix commit issue
- selecting what to commit is currently unavailable
|
2023-11-27 16:53:25 +00:00 |
|
PavelLaptev
|
22577c6d20
|
Update tokens
|
2023-11-27 17:47:39 +01:00 |
|
Mattias Granlund
|
efa80954f6
|
Refactor the commit box and dropdown button
|
2023-11-27 16:45:35 +00:00 |
|
dependabot[bot]
|
d54c22a9e1
|
Bump itertools from 0.11.0 to 0.12.0
Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.11.0 to 0.12.0.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.11.0...v0.12.0)
---
updated-dependencies:
- dependency-name: itertools
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-11-27 15:37:58 +00:00 |
|
dependabot[bot]
|
66ec459423
|
Bump tracing-appender from 0.2.2 to 0.2.3
Bumps [tracing-appender](https://github.com/tokio-rs/tracing) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-appender-0.2.2...tracing-appender-0.2.3)
---
updated-dependencies:
- dependency-name: tracing-appender
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-11-27 15:37:45 +00:00 |
|
Nikita Galaiko
|
646eedd06e
|
more refactor
|
2023-11-27 15:32:22 +01:00 |
|
Nikita Galaiko
|
c77355676d
|
fix current behaviour in tests
|
2023-11-27 15:32:14 +01:00 |
|
Kiril Videlov
|
d1b73fe9cf
|
chore: remove unused 'baseCurrent' property from Branch class and update its usage in applyBranch function
|
2023-11-27 14:28:43 +01:00 |
|
Kiril Videlov
|
927bc6c5c1
|
feat: rename activeBranches$ to stashedBranches$ in VirtualBranchService and update references in the component
|
2023-11-27 14:21:53 +01:00 |
|
Kiril Videlov
|
15e2c0eb2d
|
chore: update branch conflict handling and apply button behavior
|
2023-11-27 14:07:17 +01:00 |
|
Nikita Galaiko
|
88b78c083f
|
do not calculate non comitted files all the time
|
2023-11-27 14:00:54 +01:00 |
|
Nikita Galaiko
|
118628f0e7
|
more tests
|
2023-11-27 13:57:50 +01:00 |
|
Nikita Galaiko
|
9f0ad03d98
|
rm silimar tests
|
2023-11-27 13:09:00 +01:00 |
|
Nikita Galaiko
|
b1efad0f6f
|
minor refactoring
|
2023-11-27 13:08:23 +01:00 |
|
Nikita Galaiko
|
203d66b270
|
move update base branch tests to integration
|
2023-11-27 13:06:03 +01:00 |
|
Nikita Galaiko
|
4c2e1b8ab3
|
Merge pull request #1733 from gitbutlerapp/update-branch-state-and-write
Update branch state and write
|
2023-11-27 12:55:44 +01:00 |
|
Mattias Granlund
|
5d3381cae9
|
Fix project selector
|
2023-11-27 11:45:29 +00:00 |
|
Mattias Granlund
|
da3516c31a
|
Sync to cloud when clicking that button in the sidebar
|
2023-11-27 11:24:51 +00:00 |
|
Scott Chacon
|
dd8b7fd1b0
|
Merge pull request #1734 from gitbutlerapp/add-link-to-project-page
Add link to project page
|
2023-11-27 11:47:45 +01:00 |
|
Mattias Granlund
|
4a752ed086
|
Restyle button component and update all instances
|
2023-11-27 10:46:03 +00:00 |
|
Scott Chacon
|
1a1d7228ac
|
maybe formatted
|
2023-11-27 11:30:56 +01:00 |
|
Scott Chacon
|
6b950b3b16
|
add link to project page
|
2023-11-27 10:51:25 +01:00 |
|
Nikita Galaiko
|
f41631eb50
|
instead of flushing vbranches before flushing session, do it all the time
|
2023-11-27 10:20:16 +01:00 |
|
Mattias Granlund
|
0c5bac544d
|
Continue restyling branches
|
2023-11-27 00:56:53 +00:00 |
|
PavelLaptev
|
e7222250a1
|
input and textBox
|
2023-11-27 00:09:40 +01:00 |
|
PavelLaptev
|
c99a5f28d7
|
new icons
|
2023-11-26 21:14:45 +01:00 |
|
Mattias Granlund
|
dac321f3a0
|
Create components out of BranchLane stuff
|
2023-11-26 17:54:52 +00:00 |
|
Mattias Granlund
|
44a87b4001
|
Update branch lane header
|
2023-11-26 13:22:31 +00:00 |
|
PavelLaptev
|
9473d4b0fd
|
fixes
|
2023-11-26 13:34:22 +01:00 |
|
Mattias Granlund
|
69a69788fb
|
Create account link component and style it according to design
|
2023-11-26 11:54:15 +00:00 |
|
Mattias Granlund
|
032386e3cb
|
Fix casing inconsistency in css tokens
|
2023-11-26 11:52:32 +00:00 |
|
Mattias Granlund
|
b23e5c1178
|
style: update loading state and styling for merge button
|
2023-11-26 11:51:27 +00:00 |
|
Mattias Granlund
|
58e4869998
|
Fix focus related bug in segmented control
|
2023-11-26 11:05:08 +00:00 |
|
PavelLaptev
|
d2f8610fb2
|
new icons
|
2023-11-26 03:29:22 +01:00 |
|
PavelLaptev
|
b198c64cab
|
tokens update
|
2023-11-26 03:25:40 +01:00 |
|
Mattias Granlund
|
01efef77e0
|
Make segment controls equal width
|
2023-11-25 13:44:17 +00:00 |
|
Mattias Granlund
|
370b8f589b
|
Update IconButton to reflect design
|
2023-11-25 13:41:39 +00:00 |
|
Mattias Granlund
|
cf3600a3f7
|
Auto close project selector
|
2023-11-25 12:24:43 +00:00 |
|
Mattias Granlund
|
d9f6249a55
|
Add branch filtering to sidebar
|
2023-11-25 12:23:14 +00:00 |
|
PavelLaptev
|
3687cf2d40
|
- updated sidebar paddings. Changed 16 to 12 spacers
|
2023-11-25 02:27:48 +01:00 |
|
PavelLaptev
|
a547df9b76
|
dark theme update
|
2023-11-25 02:09:51 +01:00 |
|
PavelLaptev
|
d398fa3d66
|
added new color tokens for accent outlines
|
2023-11-25 01:57:10 +01:00 |
|
PavelLaptev
|
4f7b8d68c3
|
styles updates
|
2023-11-25 00:48:46 +01:00 |
|
Nikita Galaiko
|
b1686be9ca
|
Merge pull request #1712 from gitbutlerapp/refactor-refname-enum
Refactor refname enum
|
2023-11-24 17:17:28 +01:00 |
|
Nikita Galaiko
|
4373b4fe3b
|
chore: remove unused code related to Refname Tag and refactor Refname HEAD and STASH to Refname Other
|
2023-11-24 17:13:16 +01:00 |
|
PavelLaptev
|
aa39b2c336
|
new profile icon
|
2023-11-24 16:00:58 +01:00 |
|
PavelLaptev
|
1c79b0cc73
|
busy icon added
|
2023-11-24 15:06:26 +01:00 |
|
PavelLaptev
|
ec588fef56
|
new-icons
|
2023-11-24 15:00:24 +01:00 |
|
Mattias Granlund
|
a5371f9bb1
|
Improve app drag region
|
2023-11-24 12:59:19 +00:00 |
|
Mattias Granlund
|
94e2ce108a
|
Fix assignment bug in projects service
|
2023-11-24 12:51:14 +00:00 |
|
Nikita Galaiko
|
ccc7405aa7
|
Merge pull request #1706 from gitbutlerapp/refactor-menu-subscribe
Refactor menu subscribe
|
2023-11-24 12:20:21 +01:00 |
|
PavelLaptev
|
44a032f492
|
merged upstream
|
2023-11-24 12:16:26 +01:00 |
|
Nikita Galaiko
|
b5712d0b00
|
chore: refactor menu subscription and event handling in components
|
2023-11-24 12:15:42 +01:00 |
|
PavelLaptev
|
f3068781b8
|
code review fixes
|
2023-11-24 12:13:45 +01:00 |
|
Mattias Granlund
|
d477c26930
|
Fix issue with saving project settings
|
2023-11-24 09:19:38 +00:00 |
|
Nikita Galaiko
|
07a2d01e83
|
filter pushable references by type
|
2023-11-24 10:03:04 +01:00 |
|
Nikita Galaiko
|
c58298f48f
|
support stash ref
|
2023-11-24 09:56:42 +01:00 |
|
Nikita Galaiko
|
586a9fa336
|
Merge pull request #1703 from gitbutlerapp/support-tag-refnames
support tag refnames
|
2023-11-24 09:50:27 +01:00 |
|
Nikita Galaiko
|
60ddc66e84
|
Merge pull request #1702 from gitbutlerapp/drop-cranky
drop cranky
|
2023-11-24 09:38:57 +01:00 |
|
Nikita Galaiko
|
8defd6e42b
|
support tag refnames
|
2023-11-24 09:38:50 +01:00 |
|
Nikita Galaiko
|
ee53b09a61
|
replace cranky with new clippy
|
2023-11-24 09:03:04 +01:00 |
|
PavelLaptev
|
b80f4b48de
|
styles update
|
2023-11-24 00:53:23 +01:00 |
|
PavelLaptev
|
a62cd070c4
|
refresh icon style update
|
2023-11-23 22:26:31 +01:00 |
|
PavelLaptev
|
7f2a392396
|
some css fixes
|
2023-11-23 21:28:51 +01:00 |
|
Mattias Granlund
|
75746a4407
|
Don't show stashed branches if empty
|
2023-11-23 17:50:11 +00:00 |
|
Mattias Granlund
|
410e92d4e8
|
Allow collapsing of branch list as well
|
2023-11-23 17:44:03 +00:00 |
|
Mattias Granlund
|
08090c496e
|
Make resizing better for sidebar and lanes
|
2023-11-23 15:21:02 +00:00 |
|
Nikita Galaiko
|
b36fdc068a
|
refactor: update log message for project batch pushed to include current and total count
|
2023-11-23 15:04:53 +01:00 |
|