Nikita Galaiko
f147f12db0
merge upstream
2024-02-27 10:21:12 +01:00
Nikita Galaiko
4b4f6e210f
prefer rebase when merging upstream into vbranch
2024-02-27 09:32:40 +01:00
Scott Chacon
04e087db81
The commit URL link in bitbucket is 'commits/', not 'commit/'. In gitlab, there is a '-'.
...
Interestingly, GitHub appears to support both 'commit/' and 'commits/' and GitLab will correct a missing '-'.
2024-02-26 23:46:28 +01:00
AbhishekThorat
9eb1660af2
- Add support to remove .git/gitbutler.json file while deleting project
2024-02-26 23:45:21 +01:00
Mattias Granlund
5c9fc86ff1
Dismiss app updater once per version
...
- sets `dismiss = false` when new version is available
2024-02-27 00:23:08 +02:00
Pavel Laptev
9ae5f2d727
Merge pull request #2917 from gitbutlerapp/Align-inner-paddings-in-lane-cards
...
Align inner paddings in lane cards
2024-02-26 21:53:26 +01:00
Pavel Laptev
0bc417f6cb
style: update padding in header component for better alignment and spacing
2024-02-26 21:50:52 +01:00
Pavel Laptev
8dbeadd5ea
style: update font size and class names for textbox and textarea elements
2024-02-26 21:39:45 +01:00
Pavel Laptev
929af8a03d
style: update padding and spacing in various components
...
The padding and spacing in various components have been updated to improve the visual layout and alignment. This includes changes to the commit box, text inputs, commit list, branch files, and other related elements. The padding values have been adjusted to ensure consistent spacing and improve overall readability and usability.
2024-02-26 21:39:28 +01:00
Pavel Laptev
78ebcfd0ba
add cursor pointer to Select comp
2024-02-26 20:46:47 +01:00
Pavel Laptev
31a85cd3c3
Merge pull request #2899 from Caleb-T-Owens/Use-Pointer-cursor-on-buttons
...
Add pointer cursor to buttons
2024-02-26 20:41:56 +01:00
Pavel Laptev
03852120e1
changed interactive elements cursor to pointer
2024-02-26 20:40:09 +01:00
Pavel Laptev
992a988fb7
Merge branch 'master' into pr/2899
2024-02-26 20:17:22 +01:00
Mattias Granlund
804041765e
Remove duplicate toasts based on id
...
- also renames ToastMessage interface to Toast
- release notes given static id to prevent duplicates
2024-02-26 17:16:16 +02:00
Kiril Videlov
093f003890
disallow adding of repositories with submodules due incomplete support
2024-02-26 14:17:56 +01:00
Mattias Granlund
72779bd481
Update delete project text in project settings
2024-02-26 14:50:41 +02:00
Mattias Granlund
cc155dd1c0
Fix incorrect error when adding new project
...
- base branch observable now starts with undefined
- simplifies fetch interval setup
- use correct string for catching auth error
2024-02-26 14:47:09 +02:00
Mattias Granlund
0862d766bf
Add back custom app updater
...
- native one doesn't work on all platforms
2024-02-26 13:03:23 +02:00
Pavel Laptev
889f8ac532
Merge pull request #2909 from gitbutlerapp/Update-project-settings-page
...
New projects setting page and components UI
2024-02-26 00:22:37 +01:00
Pavel Laptev
84f04532a8
New projects setting page and components UI
...
- settings page components updated with new settings components
- added new `eye` icons
- `SectionCard` component updated in order to handle radio-groups
- `TextArea` added label
- New util function in order to convert px to rem
- new component to handle fullscreen spener loading
-
2024-02-26 00:13:02 +01:00
Kiril Videlov
c83e39ec5c
update tests to reflect using the hunk context
2024-02-25 23:24:58 +01:00
Kiril Videlov
000ddeff91
chore: remove user-facing config for using diff contexts infavor of automatic migration
2024-02-25 23:24:58 +01:00
Kiril Videlov
08d22de40e
if a project has not virtual branches migrate it to using diffs with context
2024-02-25 23:24:58 +01:00
Kiril Videlov
9d53268a5d
use diff context lines internally if configured
2024-02-25 23:24:58 +01:00
Kiril Videlov
91885eac6b
adds a config for using diffs with context lines internallyl
2024-02-25 23:24:58 +01:00
Kiril Videlov
a2e945d0b9
perf: optimize patch application for virtual branches
2024-02-25 15:54:08 +01:00
Josh Junon
9604307fc0
Merge pull request #2905 from gitbutlerapp/remove-deprecated-extension
...
remove deprecated extension from vscode recommendations
2024-02-25 12:48:19 +01:00
Josh Junon
ce57a6bb54
remove deprecated extension from vscode recommendations
2024-02-25 12:47:40 +01:00
Kiril Videlov
e5bbf9298a
perf: apply string patches instead of binary
2024-02-24 17:30:51 +01:00
Kiril Videlov
ceb81c6589
feat: add option to hide large numbers of diffs to improve UI performance
2024-02-24 14:20:32 +01:00
Caleb Owens
2949c89f32
Add pointer cursor to buttons
2024-02-24 12:35:53 +00:00
Pavel Laptev
2a10996c47
Merge pull request #2893 from gitbutlerapp/small-CSS-fixes-Profile-page
...
small CSS fixes: Profile page
2024-02-23 23:47:57 +01:00
Pavel Laptev
d32b9deba7
UI fix: divider color updated
2024-02-23 23:46:14 +01:00
Pavel Laptev
c59d899e26
UX fix: added draggable areas on the empry sides in the content vew
2024-02-23 23:41:24 +01:00
Pavel Laptev
3f6e659c64
UI fix: switched the content background and the sidebar background colors
2024-02-23 23:40:13 +01:00
Pavel Laptev
f3f4e55016
CSS fix: updated theme card radius and border-width
2024-02-23 23:39:17 +01:00
Kiril Videlov
392cff5a42
feat: verify push results
...
adds a callback checking the push result status from the remote
2024-02-23 15:12:55 +01:00
Mattias Granlund
d1318cc28c
Show better error messages on push failure
...
- new style toast with link to documentation
- removes duplicate push function
2024-02-23 13:37:43 +02:00
Pavel Laptev
789181fdbe
Merge pull request #2874 from gitbutlerapp/new-Profile-Settings-layout
...
Profile page redesign
2024-02-22 20:55:40 +01:00
Pavel Laptev
07b9cb46a8
CSS fixes: pofile sidebar
2024-02-22 20:53:34 +01:00
Pavel Laptev
58a652a30f
- Appearance section design updated
...
- code review fixes
2024-02-22 19:44:46 +01:00
Pavel Laptev
96f7f8e3c6
Profile page redesign
...
- new icons
- icon size could be adjusted with `size` prop
- new focus color for focus states
- `Spacer` component updated
- new `Profile settings` page layout
2024-02-22 19:44:40 +01:00
Mattias Granlund
22c9d2eb05
Include error in commit failure report
2024-02-22 17:57:28 +02:00
Mattias Granlund
6fe2f324ab
Improve github service error handling
...
- fix copy pasted error message
- add error variation
2024-02-22 16:13:59 +02:00
Mattias Granlund
3ef6ab85a8
fix: only report failed pr creation once
2024-02-22 16:05:09 +02:00
Mattias Granlund
624df62430
Fix pr creation bug related to sentry
...
- startTransaction returns undefined if error reporting turned off
2024-02-22 13:42:55 +02:00
Mattias Granlund
c6c20030ba
Fix GitHub error mapping
...
- correctly parses the error response
2024-02-22 01:37:40 +02:00
Mattias Granlund
dd1c8866c3
Fix GitHub error mapping
...
- correctly parses the error response
2024-02-22 01:03:19 +02:00
Naman Garg
b305cdb86e
Close App on Linux
2024-02-21 23:50:50 +01:00
Pranav2612000
0084b1b0ec
fix: show better error message when loading a repository without commits
2024-02-21 22:22:41 +01:00
