Mattias Granlund
eb7f2674a5
Merge branch 'master' into refactor-project-setup-page
2023-11-30 16:48:48 +00:00
Mattias Granlund
f9415c937b
Make the project setup page great again 🤘
2023-11-30 17:47:12 +01:00
Kiril Videlov
225de46e6f
fix lint
2023-11-30 15:41:37 +01:00
Kiril Videlov
2046df3a43
fix: prevent default behavior only when drag handle id is not 'drag-handle'
2023-11-30 15:41:37 +01:00
Kiril Videlov
e9828a605e
fix: adjust drop position calculation in drag and drop functionality
2023-11-30 15:41:37 +01:00
Kiril Videlov
41d0494b73
feat: update user name field to be optional in User struct and User type to handle cases where name or given_name is not available
2023-11-30 13:40:23 +01:00
Mattias Granlund
6e64d3fbcc
Wait for prs to reload after creating pr
2023-11-30 10:07:48 +00:00
Mattias Granlund
7e6e26d4e1
🔨 chore: fix scrollable check in client script
2023-11-30 09:41:37 +00:00
Mattias Granlund
08f23df1b9
Make pr creation even more reliable
...
- do both pushing and pr creation in pr service
- no discontinuity in "loading"
- wait for branch to have upstream (10s timeout)
2023-11-30 08:42:12 +00:00
Mattias Granlund
8726e27e39
Make PR creation more reliable
...
- can't be exact atm as we can't "wait" for upstream data to be sent to front end
- will talk to Kiril about this
2023-11-29 23:23:43 +00:00
Mattias Granlund
593eb9e717
Split out commit list header and footer
2023-11-29 22:33:22 +00:00
Mattias Granlund
74aac963f7
Renaming a vairable to test push
2023-11-29 21:56:52 +00:00
Mattias Granlund
46909a3a25
🚀 feat: add state management for PR service and update createPullRequest method
2023-11-29 21:54:25 +00:00
Mattias Granlund
915426ea4e
Truncate long branch names in commit list item header
2023-11-29 20:32:13 +00:00
Kiril Videlov
4fd8c890c9
chore: increase z-index value for .popup element to prevent it from being overlapped by other elements
2023-11-29 20:31:50 +00:00
Mattias Granlund
1c2073b980
🔨 chore: remove badge count in applied branches component
2023-11-29 20:30:58 +00:00
Mattias Granlund
55f6130a95
Fix image copy when dragging a lane
2023-11-29 18:14:43 +00:00
Mattias Granlund
41634e1ae5
Fix duplicate PR bug
2023-11-29 17:51:50 +00:00
Mattias Granlund
3eafd5af42
Show number of applied branches in sidebar
...
- Pavel will think about this still
2023-11-29 17:51:38 +00:00
Mattias Granlund
8b22c518bc
Enforce use of drag handle with branches
2023-11-29 17:27:44 +00:00
Mattias Granlund
cdbeba18c7
🔧 fix: add default color to SVG icons for better styling consistency
2023-11-29 16:17:48 +00:00
Mattias Granlund
7ffbcf51b3
Refactor the project selection page
2023-11-29 15:54:28 +00:00
Mattias Granlund
6cd9f9b2d9
Make eslint fail lint on unused variables
2023-11-29 10:50:34 +00:00
Mattias Granlund
42ca5c5952
Fix lint warnings
2023-11-29 10:50:26 +00:00
Mattias Granlund
ad11d82ae9
Update styling for base branch view
2023-11-29 10:48:39 +00:00
Mattias Granlund
9f2d4f2359
Display PR body as markdown
2023-11-29 10:26:22 +00:00
Mattias Granlund
7d99ac6b52
✨ feat: add support for readonly mode in commit card
2023-11-29 10:18:48 +00:00
Mattias Granlund
24ecfabf57
Improve the PR preview page a bit
2023-11-29 10:17:23 +00:00
Mattias Granlund
8213e0628c
🔥 refactor: remove crossfade transition from commit boxes
2023-11-29 09:38:23 +00:00
Mattias Granlund
fb96d91164
Rename LocalCommits to CommitList
2023-11-29 09:30:28 +00:00
Mattias Granlund
4f35b90508
Drop unused remote/integrated commits code
2023-11-29 09:30:28 +00:00
Mattias Granlund
a372f3b5cf
🔧 fix: decrease timeout for tooltip to improve user experience
2023-11-29 09:25:06 +00:00
Mattias Granlund
65d1c0e629
🔨 chore: add readonly prop to Commit component to prevent actions when in readonly mode
2023-11-29 09:24:43 +00:00
Mattias Granlund
2548ced85c
Improve UI for stashed branch header
2023-11-29 09:19:23 +00:00
Mattias Granlund
e9bb16488f
🐛 fix: handle sync status properly when fetching and reloading data
2023-11-29 09:14:20 +00:00
Mattias Granlund
547fb02d13
🔨 chore: increase sleep time before creating PR to accommodate for GitHub's processing time
2023-11-29 09:14:12 +00:00
Mattias Granlund
f1c49b2d51
Goto board after apply/delete
2023-11-29 09:13:16 +00:00
Nikita Galaiko
83d1edcc71
fix warning condition
2023-11-29 09:54:11 +01:00
Mattias Granlund
57ef71fd0c
Fix the UI bug when dragging file card
2023-11-29 00:51:42 +00:00
Mattias Granlund
00dbf95444
Fix scrolling/resizing in files section of branch
2023-11-29 00:41:48 +00:00
Mattias Granlund
1fa737e40f
Await reload of prs before loading is set to false
2023-11-29 00:05:59 +00:00
PavelLaptev
5172ca2b07
Wip
2023-11-29 00:59:40 +01:00
PavelLaptev
96c1fb0064
Test undo
2023-11-29 00:46:57 +01:00
PavelLaptev
874e8f2e4b
Test
2023-11-29 00:46:18 +01:00
PavelLaptev
2caddf48c1
Test
2023-11-29 00:45:43 +01:00
PavelLaptev
4e5567391e
body background update, commit card update
2023-11-29 00:45:17 +01:00
PavelLaptev
6abcf57057
merged upstream
2023-11-29 00:38:42 +01:00
PavelLaptev
d3a8e9c3fb
very long commit message just to test how it works and if it
2023-11-29 00:38:29 +01:00
Mattias Granlund
5973ce4364
🔧 fix: update getGithubContext to only emit distinct values when baseBranch remoteUrl changes
2023-11-28 23:30:04 +00:00
PavelLaptev
b7c5dc3e56
merged upstream
2023-11-29 00:14:00 +01:00
PavelLaptev
d1d20c063e
Wip
2023-11-29 00:13:46 +01:00
Mattias Granlund
71cce6730e
🐛 fix: clear selected file ID when closing file modal
2023-11-28 23:01:13 +00:00
Mattias Granlund
8f1a8805a9
🔨 chore: update text alignment in branch card component
2023-11-28 23:00:54 +00:00
Mattias Granlund
66154ce440
🔨 chore: optimize PR loading by adding skipCache option and logging for debugging
2023-11-28 22:40:14 +00:00
PavelLaptev
898834a7ee
new tag color, tokens typo fix
2023-11-28 23:15:52 +01:00
PavelLaptev
8e9725e856
Changed cursor for the branch label
2023-11-28 22:48:52 +01:00
PavelLaptev
f13b33e6e3
new icon
2023-11-28 22:39:23 +01:00
Mattias Granlund
1216c5e647
🔧 fix: center align h1 and p elements in new-branch section
2023-11-28 21:31:03 +00:00
Mattias Granlund
adacf168be
Fix lint warnings
2023-11-28 21:30:14 +00:00
Mattias Granlund
fb3a1b4e49
🔧 fix: center align h1 in .no-changes class
2023-11-28 21:30:07 +00:00
Mattias Granlund
cc9a6a5b70
🔨 chore: update PrService to support injecting and retrieving additional Pull Requests
2023-11-28 21:10:48 +00:00
Mattias Granlund
2c08ae499a
🔧 fix: handle push failure gracefully and display error message
2023-11-28 20:59:03 +00:00
Mattias Granlund
e0d889dd85
✨ feat: add sleep function to delay PR creation after pushing branch
2023-11-28 19:42:31 +00:00
Mattias Granlund
66c2e6f3ab
✨ feat: add support for creating pull requests when pushing commits
2023-11-28 19:38:49 +00:00
Mattias Granlund
ace186e6cf
Testing create PR
2023-11-28 18:54:33 +00:00
Mattias Granlund
70938bdd4e
🔧 fix: try and fix create pr button
2023-11-28 18:54:16 +00:00
Mattias Granlund
93ce6917dd
Fix clowny mistake
2023-11-28 18:53:59 +00:00
Mattias Granlund
b88030c81b
🔨 chore: add conditional rendering for update button based on base branch status
2023-11-28 18:43:28 +00:00
Mattias Granlund
87b9b2f3c4
🔨 chore: add clickable behavior to error Tag component
2023-11-28 18:34:09 +00:00
Mattias Granlund
999f7db224
Move sync and update buttons
2023-11-28 18:28:35 +00:00
Mattias Granlund
151924ea8a
Make wide option for regular buttons
2023-11-28 18:15:06 +00:00
Mattias Granlund
3b0777fe4c
Change PR tag to say "PR"
2023-11-28 18:15:06 +00:00
Kiril Videlov
516f3700a1
chore: update Prettier configuration files to use JSON format instead of JavaScript module format
2023-11-28 18:52:02 +01:00
Mattias Granlund
2b89f67040
Add back hacky reset head commit button
...
- will be updated soon
2023-11-28 17:33:24 +00:00
Mattias Granlund
7e7eac663f
Show only "create pull request" for remote commits
2023-11-28 17:33:24 +00:00
Mattias Granlund
b6771b6018
Refactor and restyle commit boxes
2023-11-28 17:33:24 +00:00
Mattias Granlund
ea32af1022
Add a couple of icons
2023-11-28 16:14:53 +00:00
Kiril Videlov
86ccd3b4bd
fix: automatically generate branch name for virtual branches with one-liner changes
2023-11-28 16:21:52 +01:00
Kiril Videlov
124aacef4e
chore: update prettier configuration file paths and format
2023-11-28 15:53:31 +01:00
PavelLaptev
df6a31d9a4
Wip
2023-11-28 15:44:45 +01:00
PavelLaptev
7543609d62
Fixes
2023-11-28 15:42:59 +01:00
Mattias Granlund
652912a589
Make file tree files draggable
2023-11-28 14:30:13 +00:00
Mattias Granlund
1f7a03f59d
Add new button for push/pr action
2023-11-28 14:27:46 +00:00
Kiril Videlov
3117769556
chore: add draggable region to window and update class order for offline status indicator
2023-11-28 15:04:58 +01:00
Kiril Videlov
c077bd965a
chore: update file rendering logic and transition animation in Svelte component
2023-11-28 14:30:17 +01:00
PavelLaptev
83ba2188a4
merged upstream
2023-11-28 14:11:57 +01:00
PavelLaptev
7e44ea0df9
Fix
2023-11-28 14:11:46 +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
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
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
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
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
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
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
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
c6f9c35bbb
Merge pull request #1695 from gitbutlerapp/add-project-menu
...
Add project menu
2023-11-23 13:23:05 +01:00
Nikita Galaiko
8e0b0a6bad
refactor project menu
2023-11-23 12:58:15 +01:00
Mattias Granlund
acd41586d5
Remove border from purple button
2023-11-23 11:00:59 +00:00
Mattias Granlund
59b39a9c84
Remove unused pr and remote branches components
2023-11-23 11:00:40 +00:00
Mattias Granlund
bf58208b7e
Rewrite branches component styles from tailwind to regular css
2023-11-23 10:59:53 +00:00
Mattias Granlund
d5840959be
Revert "Add inter font through Google Fonts"
...
This reverts commit d98623fc43
.
2023-11-23 09:41:39 +00:00
Mattias Granlund
43a3a8b71e
Fix color on project dropdown component
2023-11-22 23:36:16 +00:00
Mattias Granlund
d98623fc43
Add inter font through Google Fonts
...
We should perhaps bundle this?
2023-11-22 23:07:22 +00:00
Mattias Granlund
fe5595b59f
Make project selector look like design
2023-11-22 23:06:49 +00:00
Mattias Granlund
63f50f5cf4
Increase tooltip timeout to 2.5s
2023-11-22 22:07:30 +00:00
Mattias Granlund
69bf23fd0b
Start both remote branches and prs with empty array
...
In the future we should figure out a way of keeping the stream undefined until either has emitted.
2023-11-22 22:07:09 +00:00
Mattias Granlund
db94da1184
Use correct style tag in some components
2023-11-22 22:06:59 +00:00
Mattias Granlund
4d6088880b
chore: update spacing and radius variables in CSS file
...
The spacing and radius variables in the CSS file were updated to use relative units (rem) instead of fixed pixel values. This allows for better responsiveness and flexibility in the design.
2023-11-22 21:52:33 +00:00
Mattias Granlund
cdb7d12fe6
Fix error
...
This section was meant to be included in the previous commit.
2023-11-22 21:02:10 +00:00
Mattias Granlund
5fd83e2461
Force collapse stashed branches when empty
2023-11-22 21:02:10 +00:00
Mattias Granlund
e1402b7178
Show correct number of stashed branches
2023-11-22 21:02:10 +00:00
Mattias Granlund
41a91a5823
Show time ago in loading indicator
2023-11-22 21:01:50 +00:00
Mattias Granlund
eb98425231
Allow modern javascript
...
Needed for e.g. [].slice()
2023-11-22 20:49:58 +00:00
Kiril Videlov
db46907fb0
feat: add menu action to navigate to project settings page; introduces the notion of 'current project'; the app now starts with the last current project
2023-11-22 19:13:03 +01:00
Mattias Granlund
2cefd8493c
Update sidebar header to match design
2023-11-22 17:36:54 +00:00
Mattias Granlund
ad4544674b
Rename "your branches" to "stashed branches"
2023-11-22 16:08:52 +00:00
Mattias Granlund
4c8c0d9bb2
Fix tooltip inconsistencies with design
2023-11-22 16:01:00 +00:00
Mattias Granlund
23eade8d53
Improve project selector styles
2023-11-22 15:42:34 +00:00
Mattias Granlund
e27c7ab289
chore: refactor tooltip component in Svelte
...
- Removed arrow middleware from floating actions.
- Updated the styles for the tooltip component
2023-11-22 15:25:41 +00:00
Mattias Granlund
e59cc2a39a
Rename store.ts -> service.ts
...
- reflects the class name
2023-11-22 15:18:49 +00:00
Mattias Granlund
ca6e8f6597
Rename folder
...
- renames remotecontributions -> branches
2023-11-22 15:18:49 +00:00
Mattias Granlund
511abc951c
chore: update font-weight for text classes
...
The font-weight property for the text classes has been updated to 500 to improve readability and consistency across the application.
2023-11-22 15:17:13 +00:00
Mattias Granlund
254c5084b7
Use login instead of name field for pr author
2023-11-22 14:02:57 +00:00
Mattias Granlund
829390ee73
Fix lint errors
2023-11-22 12:55:04 +00:00
Mattias Granlund
af9ea08dc6
Start implementing new sidebar
...
- big commit, but still work in progress
2023-11-22 12:55:04 +00:00
dependabot[bot]
0760d602e9
chore(deps-dev): bump nanoid from 5.0.1 to 5.0.3
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 5.0.1 to 5.0.3.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/5.0.1...5.0.3 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-21 13:28:00 +00:00
dependabot[bot]
60fc4981a7
chore(deps-dev): bump eslint from 8.53.0 to 8.54.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.53.0 to 8.54.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.53.0...v8.54.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-21 13:27:51 +00:00
dependabot[bot]
6446d7819e
chore(deps-dev): bump marked from 9.1.4 to 10.0.0
...
Bumps [marked](https://github.com/markedjs/marked ) from 9.1.4 to 10.0.0.
- [Release notes](https://github.com/markedjs/marked/releases )
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json )
- [Commits](https://github.com/markedjs/marked/compare/v9.1.4...v10.0.0 )
---
updated-dependencies:
- dependency-name: marked
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-21 13:27:43 +00:00
dependabot[bot]
6ff68603d2
chore(deps-dev): bump vitest from 0.34.3 to 0.34.6
...
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest ) from 0.34.3 to 0.34.6.
- [Release notes](https://github.com/vitest-dev/vitest/releases )
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.34.6/packages/vitest )
---
updated-dependencies:
- dependency-name: vitest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-21 11:03:31 +00:00
Mattias Granlund
c2e6c89819
Replace a few icons with new JSON version
...
Testing out icons provided in JSON format by pavel.
2023-11-20 13:42:08 +00:00
Mattias Granlund
fef8c0fce8
Align push button a bit better
2023-11-20 12:54:28 +00:00
Mattias Granlund
692e69941c
Make commit card truncate commit message correctly
2023-11-20 12:54:28 +00:00
Mattias Granlund
a364fc9341
Use reactive variables for page data
...
We need to use reactive variables for page data, otherwise they
do not trigger recalculation on navigation.
2023-11-20 10:32:04 +00:00
Mattias Granlund
74a28e166a
Move settings and change vbranch label
2023-11-17 14:33:38 +00:00
Mattias Granlund
bbcb5c12ca
Prevent default on update and refresh
2023-11-17 14:16:29 +00:00
Mattias Granlund
6fb83315a6
Moving a bit towards Pavel's unfinished nav design
2023-11-17 14:11:47 +00:00
Nikita Galaiko
12ca8f9abd
fix add project
2023-11-17 14:57:01 +01:00
Nikita Galaiko
643c78270d
Merge pull request #1630 from gitbutlerapp/remove-bookmark-related-code
...
Remove bookmark related code
2023-11-17 12:53:39 +01:00
Mattias Granlund
11957bfc42
Fixes glitches in user login management
...
We can't use a behaviour subject for the reset observable, it creates a race
condition between user$ and reset$ observables.
2023-11-17 11:42:36 +00:00
Nikita Galaiko
e874d6ce6f
chore: remove unused bookmark functionality and related code
2023-11-17 12:32:20 +01:00
Kiril Videlov
886669ce4d
delete dead code
2023-11-17 11:26:12 +01:00
Mattias Granlund
17eae088d5
Fix css for project selection page.
2023-11-17 09:31:13 +00:00
Mattias Granlund
09cce30cbe
Remove the flicker of base branch select
2023-11-16 16:01:10 +00:00
Mattias Granlund
176372758d
Upgrade prettier and use common path + config
2023-11-16 15:53:17 +00:00
Mattias Granlund
3bd4f26f09
Fix accidental logouts
...
This was introduced in the big observable refactor.
2023-11-16 15:14:10 +00:00
Mattias Granlund
92893d4b14
Remove console.log and fix lint error
2023-11-16 15:00:00 +00:00
Mattias Granlund
d37daed784
Subscribe to branches using new API
...
This completely removes the need for the delta service, and simplifies the vbranch service.
2023-11-16 14:54:31 +00:00
Kiril Videlov
d7306d4cd9
feat: add event emission for virtual branches after certain actions to keep UI in sync
2023-11-16 12:30:28 +01:00
Mattias Granlund
eda172ac19
Fixes broken project settings page
2023-11-16 11:27:02 +00:00
Mattias Granlund
d5f9216956
Fixes github login
2023-11-16 10:58:16 +00:00
Mattias Granlund
3e76504ded
A few more fixes to the observable streams
2023-11-16 10:49:08 +00:00
Mattias Granlund
52a028440f
Fix reactive variables to make project navigation work
2023-11-16 10:22:37 +00:00
dependabot[bot]
61eb145215
chore(deps-dev): bump eslint-plugin-import from 2.28.1 to 2.29.0
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.28.1 to 2.29.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-16 10:21:58 +00:00
dependabot[bot]
d74607321c
chore(deps-dev): bump eslint-plugin-svelte from 2.33.1 to 2.35.0
...
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte ) from 2.33.1 to 2.35.0.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases )
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.33.1...v2.35.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-16 10:21:51 +00:00
dependabot[bot]
35017d4233
chore(deps-dev): bump @types/diff-match-patch from 1.0.34 to 1.0.36
...
Bumps [@types/diff-match-patch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff-match-patch ) from 1.0.34 to 1.0.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff-match-patch )
---
updated-dependencies:
- dependency-name: "@types/diff-match-patch"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-16 10:21:43 +00:00
dependabot[bot]
01884b2541
chore(deps-dev): bump @sveltejs/kit from 1.27.3 to 1.27.5
...
Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit ) from 1.27.3 to 1.27.5.
- [Release notes](https://github.com/sveltejs/kit/releases )
- [Changelog](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.27.5/packages/kit )
---
updated-dependencies:
- dependency-name: "@sveltejs/kit"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-16 10:21:33 +00:00
Mattias Granlund
a8c2fb6884
Fixes user login that broke in previous commit
2023-11-16 10:06:01 +00:00
Mattias Granlund
e243b4d9ff
Replace most stores with observables
...
Heads up, this is a massive commit touching at least 50-60 files. We want to
remove square/svelte-store completely, and we're almost there.
In this commit we also drop the /old/ code.
2023-11-16 09:28:07 +00:00
Nikita Galaiko
6bf22e4e93
fix branch reorder
2023-11-15 11:55:30 +01:00
Nikita Galaiko
e24ebcdbab
set default path to homedir
2023-11-14 18:02:26 +01:00
Mattias Granlund
ed7410e186
Fixing some container and theme stuff for PR list/page
2023-11-13 19:01:37 +00:00
Mattias Granlund
ca21e879ac
Use observable suffix in pr component
2023-11-13 18:22:12 +00:00
Mattias Granlund
e62157646f
Add error handling to PR service
2023-11-13 15:44:20 +00:00
Mattias Granlund
3e162e645c
Add service for pull requests
2023-11-13 15:44:20 +00:00
Mattias Granlund
dbfff1e52f
Make remote contributions code a bit more succinct
2023-11-13 15:44:20 +00:00
Mattias Granlund
cceac88b85
Darken overlay backdrop color slightly
2023-11-13 10:55:51 +00:00
Kiril Videlov
bfa84c9d46
chore: remove unused imports and variables
2023-11-12 23:18:01 +01:00
Kiril Videlov
c01c7626ce
feat: add support for filtering pull requests by "Only Yours" in project pull request listing, based on the logged-in user's GitHub username
2023-11-12 23:07:30 +01:00
Kiril Videlov
8de3eaf9b2
feat: add function to generate remote contributions based on pull requests and remote branches
2023-11-12 22:47:53 +01:00
Mattias Granlund
e79d3e9ebe
Fix text input styles
2023-11-12 21:09:23 +00:00
Mattias Granlund
6d0d34fa65
Add first iteration of project switcher
...
- next to base refresh button
2023-11-12 20:45:50 +00:00
Mattias Granlund
6e2139b224
Improve stashed branch view
2023-11-12 20:45:50 +00:00
Kiril Videlov
1882b8e736
fix: remove unused imports and update conditional rendering in PullRequestPage component
2023-11-12 19:39:55 +01:00
Kiril Videlov
94ff6cb3b9
feat: update dependencies and refactor pullRequestsStore to use RxJS Observable
2023-11-12 19:39:55 +01:00
Mattias Granlund
b4c11c9e6a
Move some files into nav package
2023-11-12 16:03:02 +00:00
Mattias Granlund
5ed72f3883
Moving faster with the UI ( #1569 )
...
- using css vars directly in components for theming
- getting far with app bg, surfaces and cards
- lots of files touched to make app generally look better
2023-11-12 15:50:02 +00:00
Mattias Granlund
4d22f1339e
More UI edits for the board ( #1568 )
...
- adjusting colors, spacing, borders
2023-11-11 19:51:15 +00:00
Mattias Granlund
0b05eea9de
Fixes the style of the email button in the footer
2023-11-11 18:55:51 +00:00
Mattias Granlund
6ce3335170
Update the board UI with more padding
2023-11-11 18:46:15 +00:00
Mattias Granlund
a49d146d96
- active branch domain link
...
- settigns domain link
- remove project header
2023-11-11 18:27:49 +00:00
Mattias Granlund
9aa9ab14aa
Make default bg color a bit brighter
2023-11-11 18:27:28 +00:00
Mattias Granlund
6ceca226ec
Fixes weird commit card overflow
2023-11-11 18:02:07 +00:00
Mattias Granlund
8ebc746bd0
Fix some things related to project store
2023-11-11 17:20:44 +00:00
Mattias Granlund
e9563d9437
Refactor project store
...
- also changes how the base branch is displayed
2023-11-11 17:20:44 +00:00
Mattias Granlund
e1b63dfbc3
Show trunk as card
2023-11-11 17:20:44 +00:00
Mattias Granlund
a480ea0ecc
Make base branch into component
2023-11-11 17:20:44 +00:00
Mattias Granlund
4de1f8ad7f
Show loading stack on hovering spinner
2023-11-11 13:24:05 +00:00
Mattias Granlund
267d073f7a
Use Meta + Shift + S for manual sync to cloud
2023-11-11 10:49:32 +00:00
Mattias Granlund
66b05c0430
Show loading spinner during ipc/fetch
2023-11-11 10:24:42 +00:00
Nikita Galaiko
b11f9be1ba
refactor: remove unused activeZones set from draggable function
2023-11-10 12:29:29 +01:00
Nikita Galaiko
67cea3c292
Merge pull request #1551 from gitbutlerapp/gb-601-squash-commits-ui
...
GB-601: squash commits ui
2023-11-10 10:42:24 +01:00
Nikita Galaiko
35dce0b728
fix draggable commit apperance
2023-11-10 10:34:20 +01:00
Mattias Granlund
b6e039115f
Fix syntax highlighting backgrounds
2023-11-10 09:04:38 +00:00
Nikita Galaiko
dc2e8accfe
simplify draggable
2023-11-10 09:09:29 +01:00
Nikita Galaiko
c144a82e36
feat: squash commits
2023-11-10 09:05:20 +01:00
Mattias Granlund
308edbe1b9
Fix "open in vscode" context menu
2023-11-08 16:34:11 +00:00
Mattias Granlund
b101c1db58
Make pull request cache work with new store functionality
...
This makes it load early based on cached results, followed up
with results from the API.
2023-11-08 16:14:42 +00:00
Mattias Granlund
6809ada374
Bump the forked square/svelte-store library version
2023-11-08 16:11:20 +00:00
Nikita Galaiko
26acd86063
Merge pull request #1542 from gitbutlerapp/remove-git-remote-branches-data
...
Remove git remote branches data
2023-11-08 15:08:34 +01:00
Mattias Granlund
8f9f29e8d6
Drop unused file
2023-11-08 13:48:08 +00:00
Nikita Galaiko
b277992391
move virtual branches call into controller
2023-11-08 14:38:27 +01:00
Mattias Granlund
3c9a1a3170
Make remote branch peek into page
2023-11-08 10:47:47 +00:00
Mattias Granlund
35cc2a5870
Make pull request peek into page
2023-11-08 09:46:02 +00:00
dependabot[bot]
cf28889d79
chore(deps-dev): bump prettier-plugin-tailwindcss from 0.5.4 to 0.5.6 ( #1523 )
...
Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss ) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases )
- [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.4...v0.5.6 )
---
updated-dependencies:
- dependency-name: prettier-plugin-tailwindcss
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-08 09:09:45 +00:00
dependabot[bot]
64efd859b3
chore(deps-dev): bump @codemirror/state from 6.2.1 to 6.3.1 ( #1522 )
...
Bumps [@codemirror/state](https://github.com/codemirror/state ) from 6.2.1 to 6.3.1.
- [Changelog](https://github.com/codemirror/state/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/state/compare/6.2.1...6.3.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/state"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-08 09:09:34 +00:00
Mattias Granlund
e9cf8cfa7f
Remove vbranch peek ( #1531 )
...
Make virtual branch peek into a page
2023-11-07 16:56:32 +00:00
Kiril Videlov
53e97b9a77
feat: adds commit URL to CommitCard component to allow linking to the commit details page
2023-11-07 17:45:22 +01:00
Kiril Videlov
ed8606d5e1
feat: add logic to determine whether to show HTTPS warning banner or not based on project configuration and environment variables
2023-11-07 17:17:14 +01:00
Nikita Galaiko
90db1ae8c3
Merge pull request #1510 from gitbutlerapp/add-draggable-action
...
Add draggable action
2023-11-07 08:52:43 +01:00
Nikita Galaiko
5496cfb7b1
refactor to have flat function arguments
2023-11-07 08:51:17 +01:00
dependabot[bot]
c2e5b1bc5f
chore(deps-dev): bump @codemirror/view from 6.21.4 to 6.22.0
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.21.4 to 6.22.0.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.21.4...6.22.0 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-07 06:38:20 +00:00
dependabot[bot]
8314d525fc
chore(deps-dev): bump @sveltejs/kit from 1.24.1 to 1.27.3
...
Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit ) from 1.24.1 to 1.27.3.
- [Release notes](https://github.com/sveltejs/kit/releases )
- [Changelog](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.27.3/packages/kit )
---
updated-dependencies:
- dependency-name: "@sveltejs/kit"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-07 06:38:09 +00:00
dependabot[bot]
8fff608165
chore(deps-dev): bump eslint from 8.52.0 to 8.53.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.52.0 to 8.53.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.52.0...v8.53.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-07 06:38:00 +00:00
Kiril Videlov
20baf0a2f5
feat: remove BackButton component from Upstream page, add ProjectHeader component to Trunk and Board pages
2023-11-06 17:18:15 +01:00
Nikita Galaiko
1aeedbba4d
allow amending locked hunks
2023-11-06 15:56:21 +01:00
Nikita Galaiko
7389091c18
refactor dropzone and draggable functions to support dynamic updating of options
2023-11-06 15:50:58 +01:00
Nikita Galaiko
fe03c342f0
review fixes
2023-11-06 15:38:41 +01:00
Nikita Galaiko
e5ee060eaf
re-enable branch reorder
2023-11-06 14:15:17 +01:00
Nikita Galaiko
26800a81c6
purge branch re-order
2023-11-06 13:44:55 +01:00
Nikita Galaiko
f4f140afa5
new branch dropzone works again
2023-11-06 13:36:14 +01:00
Nikita Galaiko
6bcf1f90c6
fix dragable bug
2023-11-06 13:36:03 +01:00
Nikita Galaiko
7f6e391347
cherry picking works again
2023-11-06 13:13:16 +01:00
Nikita Galaiko
97cd2d4920
ammendable commit card
2023-11-06 12:53:47 +01:00
Nikita Galaiko
b31441b888
drag & amend works
2023-11-06 11:41:18 +01:00
Mattias Granlund
fff966a063
Fix event propagation for cherry picking
2023-11-03 15:01:40 +01:00
Nikita Galaiko
f00aa38677
Merge pull request #1508 from gitbutlerapp/add-test-for-dirty-function
...
GB-626
2023-11-03 14:47:38 +01:00
Nikita Galaiko
5581a476e9
refresh sessions on vbranch updates
2023-11-03 14:30:40 +01:00
Mattias Granlund
d2ba79a695
Prevent navigation on clicking refresh button
2023-11-03 13:28:48 +01:00
Mattias Granlund
58a74873fe
Fix button that takes you back to integration branch
2023-11-03 12:37:27 +01:00
Mattias Granlund
91dd37e570
Make base branch popout into page
2023-11-03 12:06:20 +01:00
Kiril Videlov
232a0dcf01
feat: add ProjectHeader component to display project title and GitHub icon, update SVG components to spread props for reusability
2023-11-02 17:34:15 +01:00
Mattias Granlund
7a787f53eb
chore: use correct BranchLane import name
2023-11-02 14:48:44 +01:00
Mattias Granlund
0513ccccdb
Fix settings UI by refactoring layout structure
2023-11-02 12:52:29 +01:00
Kiril Videlov
85022032fe
fix: mergeability check for remote branches is not suitable for eager execution because it's expensive and the results are not immediatelly needed
2023-11-02 12:08:03 +01:00
Mattias Granlund
4b51ebc565
Fix navigation after adding new project
2023-11-02 10:47:04 +01:00
Mattias Granlund
c5f53f003f
Add back tauri dragger to top left corner
2023-11-01 17:20:22 +01:00
Mattias Granlund
c9ba804674
Fix imports and drop unused page file
2023-11-01 17:16:55 +01:00
Mattias Granlund
83b3df7315
Create new page for board in nested layout
2023-11-01 17:16:55 +01:00
Mattias Granlund
a3dc701a8f
Create modules under $lib
2023-11-01 14:01:08 +01:00
Mattias Granlund
9c0e4bd427
Move sentry and posthog into analytics module
2023-11-01 14:01:08 +01:00
Mattias Granlund
72d59d1fa2
Rename lib/api -> lib/backend
2023-11-01 14:01:08 +01:00
Mattias Granlund
f2e609e791
Flatten the front end api folder
2023-11-01 14:01:08 +01:00
Mattias Granlund
f10a443606
Move svelte lib components into a flat directory
2023-11-01 11:47:00 +01:00
Mattias Granlund
84121b94f0
Move a few more files
2023-11-01 11:47:00 +01:00
Mattias Granlund
b8d163de89
Remove histoire since it's not useful
2023-11-01 11:47:00 +01:00
Mattias Granlund
5916d9ac82
Rearrange stuff in the [projectId] route
2023-11-01 11:47:00 +01:00
Mattias Granlund
01dd7972fb
Rename projects route to 'old'
2023-11-01 11:07:05 +01:00
Mattias Granlund
b597cc5310
Remove more unused Svelte code
2023-11-01 10:48:23 +01:00
Mattias Granlund
a75abcef6c
Remove unnecessary nesting of repo route
2023-11-01 10:37:46 +01:00
Mattias Granlund
986490fb37
Remove a bunch of unused front end code
2023-11-01 10:22:41 +01:00
Kiril Videlov
f594f2c762
chore: update modal title to clarify purpose of sharing data with GitButler team
2023-11-01 09:54:17 +01:00
Mattias Granlund
c48a0f40a3
Fix lint error
2023-10-31 17:21:08 +01:00
Mattias Granlund
cfd3b0d72b
Add email button that was lost
2023-10-31 17:21:08 +01:00
Mattias Granlund
7dc7a2259b
Remove header and footer in favor of left hand navigation
2023-10-31 16:55:41 +01:00
Nikita Galaiko
c54a8f283d
✨ feat: add support for caching and retrieving authenticated user information from GitHub API
...
The changes include:
- Added a new function `getAuthenticatedWithCache` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API and cache it using `lscache`
- Added a new function `getAuthenticated` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API
- Updated the `userStore` in `client/src/lib/stores/user.ts` to include a new property `github_username` to store the GitHub username of the authenticated user
- Updated the `gitHubOauthCheckStatus` function in `client/src/routes/auth/github.ts` to set the `github_username` property of the `userStore` with the authenticated user's username
- Updated the `openURL` function in `client/src/cmd/login.go` to check for the presence of `DESKTOP_SESSION` or `XDG_CURRENT_DESKTOP`
2023-10-31 13:25:21 +01:00
Nikita Galaiko
6c4e47f19f
Merge pull request #1473 from gitbutlerapp/add-drag-and-drop-support-for-commit-cards
...
Add drag and drop support for commit cards
2023-10-31 11:59:07 +01:00
Mattias Granlund
c5c5152bf2
Extract header and footer into their own components
2023-10-31 10:43:02 +01:00
Mattias Granlund
1d983516ed
chore: fix formatting
2023-10-31 10:42:49 +01:00
dependabot[bot]
e92a87f65e
chore(deps-dev): bump marked from 9.1.3 to 9.1.4
...
Bumps [marked](https://github.com/markedjs/marked ) from 9.1.3 to 9.1.4.
- [Release notes](https://github.com/markedjs/marked/releases )
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json )
- [Commits](https://github.com/markedjs/marked/compare/v9.1.3...v9.1.4 )
---
updated-dependencies:
- dependency-name: marked
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 10:40:00 +01:00
Mattias Granlund
d41c2d1e7d
Remove use of null from user store
2023-10-31 10:39:50 +01:00
dependabot[bot]
4c4327a3a0
chore(deps-dev): bump vite from 4.4.9 to 4.5.0
...
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) from 4.4.9 to 4.5.0.
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v4.5.0/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 10:39:37 +01:00
dependabot[bot]
080f10f4eb
chore(deps-dev): bump marked from 9.0.3 to 9.1.3
...
Bumps [marked](https://github.com/markedjs/marked ) from 9.0.3 to 9.1.3.
- [Release notes](https://github.com/markedjs/marked/releases )
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json )
- [Commits](https://github.com/markedjs/marked/compare/v9.0.3...v9.1.3 )
---
updated-dependencies:
- dependency-name: marked
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 10:36:14 +01:00
dependabot[bot]
595aae95c5
chore(deps-dev): bump svelte from 4.2.1 to 4.2.2
...
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte ) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/sveltejs/svelte/releases )
- [Changelog](https://github.com/sveltejs/svelte/blob/master/packages/svelte/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.2/packages/svelte )
---
updated-dependencies:
- dependency-name: svelte
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 10:36:06 +01:00
dependabot[bot]
4da0edaf63
chore(deps-dev): bump autoprefixer from 10.4.15 to 10.4.16
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 10.4.15 to 10.4.16.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.15...10.4.16 )
---
updated-dependencies:
- dependency-name: autoprefixer
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 10:35:59 +01:00
dependabot[bot]
06498cdfbf
chore(deps-dev): bump @codemirror/view from 6.18.0 to 6.21.4
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.18.0 to 6.21.4.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.18.0...6.21.4 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 10:35:51 +01:00
Nikita Galaiko
8922c60ad9
gap between upstream commits
2023-10-31 09:55:17 +01:00
Nikita Galaiko
b773901683
cherry pick ui
2023-10-31 08:45:46 +01:00
dependabot[bot]
7586d6a233
Bump eslint from 8.50.0 to 8.52.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.50.0 to 8.52.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.52.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 15:47:23 +01:00
dependabot[bot]
e7a88aead5
chore(deps-dev): bump @lezer/common from 1.0.4 to 1.1.0
...
Bumps [@lezer/common](https://github.com/lezer-parser/common ) from 1.0.4 to 1.1.0.
- [Changelog](https://github.com/lezer-parser/common/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/common/compare/1.0.4...1.1.0 )
---
updated-dependencies:
- dependency-name: "@lezer/common"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 13:07:58 +01:00
dependabot[bot]
5a0d33cf95
chore(deps-dev): bump @typescript-eslint/parser from 6.7.3 to 6.9.0
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 6.7.3 to 6.9.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases )
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md )
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.9.0/packages/parser )
---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 13:06:57 +01:00
dependabot[bot]
e3b379e684
Bump posthog-js from 1.81.2 to 1.84.2
...
Bumps [posthog-js](https://github.com/PostHog/posthog-js ) from 1.81.2 to 1.84.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases )
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.81.2...v1.84.2 )
---
updated-dependencies:
- dependency-name: posthog-js
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 13:03:47 +01:00
dependabot[bot]
219f5e32bf
chore(deps-dev): bump eslint-import-resolver-typescript
...
Bumps [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript ) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases )
- [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-import-resolver-typescript/compare/v3.6.0...v3.6.1 )
---
updated-dependencies:
- dependency-name: eslint-import-resolver-typescript
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 13:03:33 +01:00
Kiril Videlov
19e933d713
feat: add filter functionality to pull requests listing in project view using the native context menu
2023-10-28 21:51:30 +02:00
Kiril Videlov
a9f1da75af
chore: move expand/collapse to the left
2023-10-28 19:25:12 +02:00
Kiril Videlov
579807687c
feat: add IconFilter component and its SVG markup
2023-10-28 19:24:03 +02:00
Kiril Videlov
3eba2c9bdb
feat: add caching mechanism for pull requests list to improve performance and handle offline scenarios
2023-10-27 17:52:15 +03:00
Kiril Videlov
b0374e2f7a
chore: remove duplicate RemoteBranches component
2023-10-25 22:24:38 +02:00
Kiril Videlov
8b5b37102e
feat: add support for displaying and interacting with pull requests in the branch peek component
2023-10-25 22:24:38 +02:00
Nikita Galaiko
3d14551ed2
add validation error code
2023-10-23 09:37:54 +02:00
Nikita Galaiko
01180178fb
rm search from ui
2023-10-20 13:07:18 +02:00
Nikita Galaiko
9f9d1e4149
dark mode: fix upstream commit bg
2023-10-20 09:07:14 +02:00
Nikita Galaiko
e1fcc5546f
show force push when upstream commits present
2023-10-19 13:41:42 +02:00
Nikita Galaiko
f3decc57e0
return upstream name too
2023-10-19 10:29:33 +02:00
Nikita Galaiko
df098e8d57
fix local branch name serialization
2023-10-19 10:23:58 +02:00
Nikita Galaiko
36eea73e52
🔨 chore: update references to branch upstream and upstreamCommits in client code
...
The changes in this commit update the references to the `branch.upstream` property and `branch.upstreamCommits` array in the client code. The code now uses the `branch.upstream.name` property instead of `branch.upstream` and `branch.upstream.commits` instead of `branch.upstreamCommits`. This change ensures that the code is compatible with the updated data structure.
2023-10-19 09:30:31 +02:00
Kiril Videlov
0857b4483b
🔨 chore: add GitHub integration context to tray components
2023-10-18 14:50:37 +02:00
Kiril Videlov
1e23e77ffa
🔨 chore: move github context to page and inject into components
2023-10-18 14:50:37 +02:00
Kiril Videlov
3f74c66fb7
refactor: move remote branches out of tray and into their own component
2023-10-18 14:11:15 +02:00
Nikita Galaiko
e1a9ce1fba
use prebuilt svelte-store dependency
2023-10-16 11:03:24 +02:00
Kiril Videlov
31ab4c6fca
🎨 style: update commit reset button appearance and add tooltip
2023-10-16 09:36:10 +02:00
Kiril Videlov
a2b699700b
🔨 chore: update commit reset button tooltip to remove warning about force push
...
The tooltip breaks the layout here for some reason
2023-10-16 09:27:56 +02:00
Kiril Videlov
f608758eae
fix formatting
2023-10-13 15:20:32 +02:00
Kiril Videlov
8f7bcac403
✨ feat: add support for creating pull requests and pushing commits with the option to create a pull request
2023-10-13 15:20:32 +02:00
Mattias Granlund
5dc19be8fe
Fix the rewind functionality
...
- Shift+Cmd+R when viewing virtual branches to switch to rewind
- Same combo to switch back to virtual branches
- Not everything is great, but it's a start
2023-10-12 21:27:40 +02:00
Kiril Videlov
d338808518
🔨 chore: make placement configurable for floating actions component
2023-10-12 17:30:30 +02:00
Nikita Galaiko
90124acd1d
update integrated separator copy
2023-10-12 13:57:30 +02:00
Mattias Granlund
b1008356ab
Fix lang/punctuation in delete dialog
...
- should have done this in the last commit
2023-10-12 11:51:59 +02:00
Mattias Granlund
5501509671
Use right font-color for project name when deleting data
2023-10-12 11:23:53 +02:00
Nikita Galaiko
f65c5cad21
resetHeadCommit to handle single commit reset
2023-10-12 08:38:22 +02:00
Nikita Galaiko
17f83c5c0c
add a warning tooltip
2023-10-11 15:16:00 +02:00
Nikita Galaiko
ce3bd1521c
use force push when needed
2023-10-11 15:09:04 +02:00
Nikita Galaiko
b834a6ef01
say force push if it's going to happen
2023-10-11 14:46:00 +02:00
Nikita Galaiko
3b5005c865
ui for resetting remote commits
2023-10-11 14:41:33 +02:00
Nikita Galaiko
8d9145738b
fix integrated not remote commits display
2023-10-11 12:40:17 +02:00
Nikita Galaiko
dbf2b2cacb
add subtle button to reset head commit
2023-10-11 09:43:32 +02:00
Nikita Galaiko
116953fbf1
merged upstream
2023-10-11 08:38:46 +02:00
Kiril Videlov
698fb012e8
support for github device oauth flow
2023-10-10 19:18:44 +02:00
Nikita Galaiko
738d1bfceb
add a test button
2023-10-10 14:52:16 +02:00
Nikita Galaiko
69e9d08501
feat: update set_user function to return the updated user object
...
The `set_user` function in the client code has been updated to return the updated user object after setting it in the app. This change allows for better handling of the user object and enables further operations on it if needed. The updated function now returns a `Result<User, Error>` instead of `Result<(), Error>`.
2023-10-10 10:31:20 +02:00
Nikita Galaiko
ea94ff2c1a
more custom error types
2023-10-09 12:05:24 +02:00
Mattias Granlund
bd98ee0f36
Add a handler for unhandled rejections
...
- this change gives us better stack traces when reactive things break
2023-10-06 16:21:26 +02:00
Nikita Galaiko
73d5ebf823
extract projects controller
2023-10-05 15:44:34 +02:00
dependabot[bot]
885185e6e3
chore(deps-dev): bump svelte from 4.2.0 to 4.2.1
...
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte ) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sveltejs/svelte/releases )
- [Changelog](https://github.com/sveltejs/svelte/blob/master/packages/svelte/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.1/packages/svelte )
---
updated-dependencies:
- dependency-name: svelte
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-05 11:58:46 +02:00
dependabot[bot]
8fcaed68be
chore(deps-dev): bump nanoid from 4.0.2 to 5.0.1
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 4.0.2 to 5.0.1.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/4.0.2...5.0.1 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-05 11:54:52 +02:00
dependabot[bot]
94f4fb26db
chore(deps-dev): bump @types/diff-match-patch from 1.0.32 to 1.0.34
...
Bumps [@types/diff-match-patch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff-match-patch ) from 1.0.32 to 1.0.34.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff-match-patch )
---
updated-dependencies:
- dependency-name: "@types/diff-match-patch"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-05 11:54:41 +02:00
dependabot[bot]
3c0035370f
chore(deps-dev): bump svelte-check from 3.5.1 to 3.5.2
...
Bumps [svelte-check](https://github.com/sveltejs/language-tools ) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/sveltejs/language-tools/releases )
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.5.1...svelte-check-3.5.2 )
---
updated-dependencies:
- dependency-name: svelte-check
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-05 11:54:32 +02:00
dependabot[bot]
140f2b9bb4
chore(deps-dev): bump @sentry/sveltekit from 7.64.0 to 7.73.0
...
Bumps [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript ) from 7.64.0 to 7.73.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases )
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.64.0...7.73.0 )
---
updated-dependencies:
- dependency-name: "@sentry/sveltekit"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-05 11:54:05 +02:00
Mattias Granlund
3d74940111
Update Sentry DSN in Svelte code
...
- changes data source desktop -> js-app
2023-10-05 11:18:04 +02:00
Nikita Galaiko
7d245f6f59
chore: update versions of @tauri-apps/cli and related packages to 1.5.1
2023-10-05 10:31:51 +02:00
Mattias Granlund
175ee13c4e
Fix sveltekit error handler
...
- now prints the actual error to the console
2023-10-05 10:11:00 +02:00
Nikita Galaiko
1df251baca
chore: remove unused fileGroup function and related code
2023-10-04 16:44:30 +02:00
Nikita Galaiko
b86259b64c
chore: remove unused Statuses component and git_status API endpoint
2023-10-04 16:35:06 +02:00
Nikita Galaiko
67de8de1e9
ui: rm git activity
2023-10-04 16:15:46 +02:00
Scott Chacon
e72ef03bc8
Merge pull request #1284 from gitbutlerapp/update-branch-with-upstream
...
Change upstream branch name
2023-10-04 15:33:53 +02:00
Scott Chacon
ccf6136b9a
✨ feat: add Remote Name panel to display and update remote branch name in UI
2023-10-04 13:16:33 +02:00
Mattias Granlund
3c16b6cd76
Add error handling and loading indicator to base branch selection
...
- also puts base branch selection in its own component
2023-10-04 11:54:47 +02:00
Mattias Granlund
834d227370
Make store dependencies explicit parameters
...
This was feedback from Kiril a while back, that since all stores are
needed it would be clearer to have them as explicit parameters.
2023-10-03 21:59:04 +02:00
Nikita Galaiko
636c6538b3
refactor: update file content handling to use new FileContent type instead of Contents
2023-10-03 11:55:02 +02:00
Nikita Galaiko
95304c1968
refactor: use content that is either utf8, large or binary
2023-10-03 10:04:30 +02:00
Mattias Granlund
a6c6c90757
Safely append sessions to session store
...
- seen in the wild, but triggered by other error
2023-10-02 23:38:19 +02:00
dependabot[bot]
4e3cb65313
chore(deps-dev): bump posthog-js from 1.77.2 to 1.81.2
...
Bumps [posthog-js](https://github.com/PostHog/posthog-js ) from 1.77.2 to 1.81.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases )
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.77.2...v1.81.2 )
---
updated-dependencies:
- dependency-name: posthog-js
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 19:13:41 +02:00
dependabot[bot]
4ec90f25de
chore(deps-dev): bump @codemirror/lang-markdown from 6.2.0 to 6.2.1
...
Bumps [@codemirror/lang-markdown](https://github.com/codemirror/lang-markdown ) from 6.2.0 to 6.2.1.
- [Changelog](https://github.com/codemirror/lang-markdown/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/lang-markdown/compare/6.2.0...6.2.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/lang-markdown"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 19:10:05 +02:00
dependabot[bot]
58d6c32435
chore(deps-dev): bump eslint from 8.47.0 to 8.50.0
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.47.0 to 8.50.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.47.0...v8.50.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 19:09:41 +02:00
dependabot[bot]
5cfb6e1ba0
chore(deps-dev): bump postcss from 8.4.30 to 8.4.31
...
Bumps [postcss](https://github.com/postcss/postcss ) from 8.4.30 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31 )
---
updated-dependencies:
- dependency-name: postcss
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 19:07:39 +02:00
dependabot[bot]
bf371c6daf
chore(deps-dev): bump @types/marked from 5.0.1 to 5.0.2
...
Bumps [@types/marked](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/marked ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/marked )
---
updated-dependencies:
- dependency-name: "@types/marked"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 19:07:27 +02:00
Mattias Granlund
32da7d1200
Handle project errors nicely
...
- show better message if error unknown along with back button
- eliminate no undefined or zero session errors
2023-10-02 15:06:55 +02:00
Mattias Granlund
b64bb18eb3
Disable AI hunk summaries for binary files
2023-10-02 12:02:05 +02:00
Mattias Granlund
c5603d1685
Show custom message in FileCard for binary/large files
2023-10-02 12:02:05 +02:00
Mattias Granlund
2b976b2e6d
Separate front and back end in sentry
...
- front end now uses app-js
2023-10-01 19:41:55 +03:00
Mattias Granlund
a851210c0a
Destroy popup menues on component destruction
...
- because menus are rendered manually targeting the document body
2023-10-01 12:03:35 +03:00
Mattias Granlund
2d2d85d8ce
Change some package imports to direct imports
2023-10-01 11:55:29 +03:00
Mattias Granlund
b2a9d2efcf
Remove unnecessary console logging
...
- removing since nightly users have access to devtools
2023-10-01 11:50:51 +03:00
Mattias Granlund
6528fb7400
Fix lint warnings in ts code
2023-10-01 11:39:55 +03:00
Mattias Granlund
39835b7c27
Disable spell check in the commit message box
...
- plus a couple of other places
2023-10-01 01:47:50 +03:00
Mattias Granlund
5f25455d52
Do not shell open local links
...
- error spotted in sentry
2023-10-01 01:38:49 +03:00
Mattias Granlund
f4f59ee031
Nitpicking a couple of things
2023-09-30 23:19:03 +03:00
Mattias Granlund
98b5ed99a6
Express some store things more concisely
2023-09-30 23:19:03 +03:00
Mattias Granlund
3b63dff215
Refactor a few async stores to use start/stop signal
...
- sessions, deltas, fetches, heads
- auto open/unsubscribe for streams
2023-09-30 23:19:03 +03:00
Mattias Granlund
088ab5466b
Bump version of forked svelte-store
...
- contains added start/stop notifier for asyncWritable
2023-09-30 21:32:06 +03:00
Mattias Granlund
544a35eea2
Fix lint error
2023-09-29 01:01:36 +03:00
Mattias Granlund
f1a9add4f7
Missed these props in the last commit
2023-09-29 01:01:36 +03:00
Mattias Granlund
48cd2ea296
Use actual types for tray store props
2023-09-29 01:01:36 +03:00
Mattias Granlund
88877e84eb
Make some UI updates optimistic
...
- apply
- unapply
- delete branch
- update notes
2023-09-29 00:57:28 +03:00
Nikita Galaiko
80f43ffe32
chore: update build scripts to include separate build commands for nightly and development modes
2023-09-28 13:31:40 +02:00
Nikita Galaiko
3f35c564d2
chore: update dependencies
...
- Update "@types/lscache" to version "^1.3.2"
- Update "@typescript-eslint/eslint-plugin" to version "^6.7.2"
- Update "@typescript-eslint/parser" to version "^6.7.2"
- Update "marked" to version "^9.0.3"
- Update "postcss" to version "^8.4.30"
These updates include bug fixes and performance improvements.
2023-09-28 10:37:12 +02:00
Nikita Galaiko
919b334447
refactor: remove unnecessary prop 'isIntegrated' from CommitCard component in CommitList component
2023-09-28 10:32:31 +02:00
Nikita Galaiko
18ff457936
group integrated commits separately
2023-09-28 10:14:31 +02:00
Nikita Galaiko
53dd5a651d
chore: update context menu in code editor component
...
The context menu in the code editor component has been updated to include a new option to collapse sections. Additionally, the "Open in Visual Studio Code" option will now only be displayed if there is a specific line number associated with the item.
2023-09-28 09:05:40 +02:00
Nikita Galaiko
21ab6a78ae
chore: update lint and format scripts to use prettier and eslint without specifying plugin search directory
2023-09-27 10:24:51 +02:00
Nikita Galaiko
61544a003c
feat: add ability to unapply ownership for a hunk in the client
...
The changes in this commit add support for unapplying ownership for a hunk in the client. This allows users to discard changes made to a specific hunk and revert it back to its original state. The unapplyHunk method is added to the BranchController class, which sends a request to the server to unapply the ownership of the hunk. Upon successful unapplying, the virtual branch store is reloaded to reflect the changes.
2023-09-27 10:23:53 +02:00
Nikita Galaiko
ef1f41d5ee
fix: handle different formats of remoteUrl in BaseBranch class's repoBaseUrl method
2023-09-22 13:05:40 +02:00
Nikita Galaiko
9d99a4aad8
chore: use Partial<Record<..>> for better type checking
2023-09-21 13:39:47 +02:00
Scott Chacon
49dfcace64
Merge pull request #1228 from gitbutlerapp/add-merge-virtual-branch-function
...
Detect and merge upstream branch changes
2023-09-21 10:17:14 +02:00
Scott Chacon
661d111475
give branchCount a default
2023-09-21 10:09:12 +02:00
Nikita Galaiko
2e41cecbd3
fix: handle case when sessionFiles[file.path] is undefined in withFileContent function
2023-09-21 10:06:35 +02:00
Scott Chacon
43beb0f5d5
fix: update merge_virtual_branch_upstream function to accept optional keys_controller parameter
2023-09-21 10:05:23 +02:00
Scott Chacon
3130d5fd1a
merged upstream
2023-09-21 09:32:34 +02:00
Kiril Videlov
682a25d179
🐛 fix: handle case when lastSection is undefined in HunkSection class
2023-09-20 22:25:06 +02:00
Nikita Galaiko
5c98330cc0
remove old commit page
2023-09-20 12:33:03 +02:00
Scott Chacon
b2833e2549
feat: add merge_virtual_branch_upstream function to merge upstream changes into branch
...
The merge_virtual_branch_upstream function is added to merge the changes from the upstream branch into the current branch. This function checks if the project is in a conflicted state and if not, it proceeds with the merge. It finds the merge base between the upstream commit and the current branch's head commit, and then tries to merge the working directory tree with the remote tree. If the merge is successful, it commits the merge tree and updates the branch data.
2023-09-20 10:23:32 +02:00
Kiril Videlov
3da2290744
🔨 chore: update condition for generating branch name in virtual branch scenario
2023-09-19 23:22:07 +02:00
Scott Chacon
bdbfee4cfa
ui setting to sign commits
2023-09-19 16:08:42 +02:00
Nikita Galaiko
b5ebae4bed
do not use link for updater
2023-09-19 10:49:40 +02:00
Kiril Videlov
364bdf417e
✨ feat: add functionality to generate branch name based on file diffs and update branch name if it doesn't match the generated name
2023-09-18 23:56:09 +02:00
Kiril Videlov
4792907b50
🐛 fix: handle broken diffs in parseHunkHeader function and add test case for it
2023-09-18 23:09:28 +02:00
Nikita Galaiko
0caf0366e3
commit files fetching async
2023-09-18 15:04:09 +02:00
Nikita Galaiko
f5a525d840
make isMergeable asyncronous
2023-09-18 10:39:48 +02:00
Nikita Galaiko
4e568420c8
fetch isMergeable asyncronously
2023-09-18 10:00:56 +02:00
Nikita Galaiko
5e27f9b8e9
fix link without href
2023-09-18 08:37:29 +02:00
Kiril Videlov
188892ff00
chore: update language parser usage and add support for Ruby language
...
The code changes in this commit update the usage of language parsers in the codebase. Instead of using the `LanguageSupport` interface from `@codemirror/language`, the code now directly uses the `Parser` interface from `@lezer/common`. Additionally, support for the Ruby language has been added by importing the `ruby` mode from `@codemirror/legacy-modes/mode/ruby` and defining a parser for it using `StreamLanguage.define(ruby
2023-09-16 00:09:53 +02:00
dependabot[bot]
1b20e735f0
Bump marked from 7.0.4 to 9.0.0
...
Bumps [marked](https://github.com/markedjs/marked ) from 7.0.4 to 9.0.0.
- [Release notes](https://github.com/markedjs/marked/releases )
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json )
- [Commits](https://github.com/markedjs/marked/compare/v7.0.4...v9.0.0 )
---
updated-dependencies:
- dependency-name: marked
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-15 15:36:00 +02:00
dependabot[bot]
2341cb232f
Bump eslint-plugin-svelte from 2.33.0 to 2.33.1
...
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte ) from 2.33.0 to 2.33.1.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases )
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.33.0...v2.33.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-15 15:35:50 +02:00