Commit Graph

593 Commits

Author SHA1 Message Date
Pavel Laptev
f3f4e55016 CSS fix: updated theme card radius and border-width 2024-02-23 23:39:17 +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
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
Mattias Granlund
ba922bf76d Show upstream commits only to butlers
- pending work on the merge function
2024-02-21 23:16:40 +02:00
Mattias Granlund
295f38aad9 Update upstream commtis UI
- just makes it look more like other components
2024-02-21 23:16:28 +02:00
Mattias Granlund
337dd42982 Use same function for opening all external urls
- gives us a better toast in case url fails to open
2024-02-21 22:33:18 +02:00
Mattias Granlund
00157968ed Show upstream commits if such exist
- component was lost in a refactor, bringing it back
- needs a new design, but landing to unblock users
2024-02-21 22:17:37 +02:00
Pranav2612000
3cc0c90cc5 feat: generate PR title and body from commit
If the branch contains only 1 commit, we use the first
line to generate the PR title and the remaining commit
body to generate the PR body

Co-Author: @eyalch
2024-02-21 22:13:32 +02:00
Mattias Granlund
6100f31f58 Show toast with richer content on GitHub errors
- move error handling from createPr call site to service
- showToast still uses global store, consider refactor
- toast content will be updated shortly
2024-02-21 13:01:00 +02:00
Caleb Owens
0fb074a7a1 Update to react to changes in pr URL 2024-02-20 16:16:43 +02:00
Caleb Owens
6a741c22cc Add the context menu to unapplied PRs 2024-02-20 16:16:43 +02:00
Caleb Owens
a247f08802 Add option to copy PR URL to clipboard 2024-02-20 16:16:43 +02:00
Caleb Owens
8b35614188 Add word wrap to commit body 2024-02-20 14:56:45 +01:00
Kiril Videlov
fb56cad857
Merge pull request #2750 from gitbutlerapp/Move-commit-to-vbranch-tests
move commit functionality
2024-02-20 14:55:40 +01:00
Kiril Videlov
5976477a29
Merge pull request #2829 from gitbutlerapp/fixex-project-auto-fetch
fixex-project-auto-fetch
2024-02-20 10:49:47 +01:00
Kiril Videlov
663dcf1115
fix: only fetch poject when navigation goes to a new project 2024-02-20 10:37:33 +01:00
Mattias Granlund
52560922cd Allow front end periods in branch names
Noticed a PR changing the branch name regex in the rust code, this pr fixes the same thing
in the typescript code.

https://github.com/gitbutlerapp/gitbutler/pull/2766/files
2024-02-20 10:56:45 +02:00
Pavel Laptev
1786a38cf3
Merge pull request #2810 from Caleb-T-Owens/Add-tooltip-to-show-full-commit-message
Add tooltip to show full commit message
2024-02-20 02:07:31 +01:00
Pavel Laptev
1bdc4eb322 ui: buttons align changed 2024-02-20 02:05:47 +01:00
Pavel Laptev
376cee414a lint fix: unused component removed 2024-02-20 01:52:58 +01:00
Pavel Laptev
dba7ebf89a ui: commit card styles update 2024-02-20 01:49:52 +01:00
Kiril Videlov
3bc56d6c1f
chore: replace app internal scheduled fetching with UI triggered fetching on per-project basis 2024-02-20 00:52:30 +01:00
Caleb Owens
7e2ef922dd Handle commit descriptions that start with just one new line rather than 2 2024-02-19 22:14:39 +00:00
Caleb Owens
5b340f1301 Update icon alignment, and author-name
Fix linting errors
2024-02-19 22:14:39 +00:00
Caleb Owens
adbebb93fd Updated styles and now pull title and body from commit methods
Update styles
Update title class
Updated styles
Refactor conditions
2024-02-19 22:14:39 +00:00
Caleb Owens
95b18f8806 More changes
With more lines
2024-02-19 22:14:39 +00:00
Caleb Owens
6c0603813b Add tooltip to show full commit message 2024-02-19 22:14:39 +00:00
Pavel Laptev
44cb3d5b42 small UI tweaks 2024-02-19 21:47:21 +01:00
Pavel Laptev
9a5fe102a7 NotOnGitButlerBranch refactor
- fixed screen flickering
- page layout updated
2024-02-19 21:43:51 +01:00
Pavel Laptev
7227d7acf6 small copy change
in order to make the button shorter
2024-02-19 21:42:27 +01:00
AbhishekThorat
48ea49f323 - Lint fix 2024-02-20 01:20:14 +05:30
AbhishekThorat
dea2b64b6f - Minor variable name change 2024-02-20 01:16:56 +05:30
Abhishek Thorat
7acfd2a8a9
Merge branch 'master' into support/remove-project-from-not-on-git-butler-branch 2024-02-20 01:01:13 +05:30
AbhishekThorat
411f85b783 - Fix project not found issue after deleting project from non-git-butler-branch screen 2024-02-19 23:47:48 +05:30
Kiril Videlov
fde55c81ac
Merge pull request #2816 from Meesayen/add-file-discard-menu-in-tree-view
chore: applied context menu to discard file to the tree view
2024-02-19 18:51:43 +01:00
AbhishekThorat
016d79928c - lint fix 2024-02-19 21:30:48 +05:30
AbhishekThorat
abf4f9d16e Merge branch 'master' of https://github.com/AbhishekThorat/gitbutler into support/remove-project-from-not-on-git-butler-branch 2024-02-19 21:27:51 +05:30
AbhishekThorat
19495250e0 - Add Remove this project ... button with not on git butler branch screen 2024-02-19 21:23:09 +05:30
Pavel Laptev
9c52e18d39 UI fix: replaced textarea element with TextArea component 2024-02-19 15:30:57 +01:00
Pavel Laptev
aa20f30f4d CSS fix: trancate long virtual branch names 2024-02-19 15:27:00 +01:00
Pavel Laptev
673e6c1a42 project setup card feature style fix 2024-02-19 15:26:22 +01:00
Meesayen
a8e1c7bc7d chore: applied context menu to discard file to the tree view 2024-02-19 14:59:27 +01:00
Meesayen
0fddf1bc5b chore: consider "contextmenu" event as a click outside event too 2024-02-19 15:46:16 +02:00
Nikita Galaiko
658a1ab1be connect ui to move_commit 2024-02-19 14:43:20 +01:00
AbhishekThorat
52607dfb75 - Add default branch check before deleting virtual branch directly 2024-02-19 15:35:10 +02:00
AbhishekThorat
fa8386552c fix - Avoid showing delete branch modal for empty virtual branch. 2024-02-19 15:35:10 +02:00
Meesayen
de7d869411 fix: hunk and file context menu now correctly dismiss 2024-02-19 15:27:09 +02:00
Meesayen
f36ba52b27 fix: the branch card's options menu is truncated by a recently added overflow:hidden 2024-02-19 15:14:59 +02:00
Dino Lindlau
16f834fc08 Add a custom renderer for links, same as in ToastControlelr 2024-02-19 13:08:18 +02:00
Pavel Laptev
21d11c84c5 refactor: TextBox component refactor, select component updated 2024-02-19 01:29:01 +01:00
Pavel Laptev
54a5e4eef9 UI: card style update 2024-02-19 01:27:40 +01:00
Pavel Laptev
ae0c24ffaa shadow design tokens update 2024-02-19 00:24:14 +01:00
Pavel Laptev
2959840c3f discard file copy update 2024-02-19 00:22:52 +01:00
Meesayen
d133f21b30 chore: fix linting issue 2024-02-18 20:53:35 +01:00
Federico Giovagnoli
bbdb24973c
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 20:51:37 +01:00
Pavel Laptev
564ea365f1 resizer position bug fixed 2024-02-18 20:12:36 +01:00
Kiril Videlov
4797efd663
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 15:48:17 +01:00
Pavel Laptev
bd01a2d88d small css fixes, color theme tweaking 2024-02-18 15:27:56 +01:00
Pavel Laptev
ccaa380b36 light color for intaractive states updated 2024-02-18 15:23:03 +01:00
Meesayen
8ba3ad3fe1 chore: fix linting issue 2024-02-18 14:22:50 +01:00
Federico Giovagnoli
10ae89202d
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 14:18:26 +01:00
Pavel Laptev
e2b42d5778 input focus bacground updated 2024-02-18 00:33:04 +01:00
Pavel Laptev
ad492d0c77 updated color theme, postcss files renamed to css, input classes refactoring 2024-02-18 00:23:14 +01:00
Pavel Laptev
a2a4df45de removed unused CSS, added role="button in order to handle button-like elements 2024-02-17 23:53:23 +01:00
Pavel Laptev
962addd140 comented css removed 2024-02-17 23:53:23 +01:00
Pavel Laptev
8681f1438d commit textarea border-radius fix 2024-02-17 23:53:23 +01:00
Kiril Videlov
64ee34e0a9 feat: update projectCurrentCommitMessage function to include branchId parameter and use it in relevant places 2024-02-17 21:25:00 +01:00
Kiril Videlov
029377be06 feat: when a commit is undone, the commit message box will be pre-filled with the last message 2024-02-17 20:32:24 +01:00
Kiril Videlov
2a48b7f072 feat: the commit message will no longer be lost during navigation 2024-02-17 20:32:24 +01:00
Kiril Videlov
f252d0c8f0 fix: dont automatically show large diffs 2024-02-17 19:54:02 +01:00
Caleb Owens
9af53324d3 Fix linting issues 2024-02-17 18:58:09 +01:00
Caleb Owens
088cf5a4bb Only show "Force push to remote" when pushing zero commits to a branch 2024-02-17 18:58:09 +01:00
Pavel Laptev
af907c2902 remove code duplication, readonly state for file list tree fixed 2024-02-17 18:22:21 +01:00
Caleb Owens
3a4fb738c8 Add loading state to PushButton when in "pr" state 2024-02-17 14:36:52 +01:00
Meesayen
f477d8d277 chore: disable discard button for binary files for now 2024-02-17 13:23:13 +01:00
Meesayen
7023e43806 chore: added confirmation moda & handled multi selection of files 2024-02-17 13:13:12 +01:00
Meesayen
548bd2c3c0 fix: missing branchController input in some components 2024-02-17 12:16:11 +01:00
Meesayen
25e26b28aa chore: lint fixes 2024-02-17 12:16:11 +01:00
Meesayen
bd7bf3b8a9 chore: DRYer approach 2024-02-17 12:16:11 +01:00
Meesayen
fd7c18d121 feat: ability to discard changes to an entire file 2024-02-17 12:16:11 +01:00
Pavel Laptev
7bcd2b8ae9 file list item: hover updated, added space between file list items 2024-02-17 00:42:56 +01:00
Pavel Laptev
a9797b22a7 removed :backdrop css variables
checkbox icon updated and removed  `:backdrop` css variables
2024-02-17 00:12:07 +01:00
Caleb Owens
b787c823af Split Credit prompt into two sentences 2024-02-16 22:57:25 +01:00
Caleb Owens
3a75baa89c Update the wording in the settings page to use opt-in terminology. 2024-02-16 22:57:25 +01:00
Caleb Owens
e7a00c7700 Remove the prompt in the commit box as it now targets users who opt in.
This seems counterproductive as they're already supporting by sharing the product
2024-02-16 22:57:25 +01:00
Caleb Owens
433e965a19 Adapt prompt in the commit box to use new setting name 2024-02-16 22:57:25 +01:00
Caleb Owens
7f71b96342 Updated to have allow changing annotation settings and removed copy around the notion of becoming a supporter to disable it (Though you should still become one!!) 2024-02-16 22:57:25 +01:00
Caleb Owens
f301d2d35b Update the default value for signCommits in frontend to false to match backend 2024-02-16 22:56:40 +01:00
Pavel Laptev
b2fc858560 comment typo 2024-02-16 17:47:34 +01:00
Pavel Laptev
d014d12395 - hide AuthorIcons
- `:backdrop` rule removed, because there was only one token uses this rule
- improved `opened` branch UI
2024-02-16 17:44:11 +01:00
Andreas Skielboe
18a65938f4 Fix branch name change when pressing Enter 2024-02-16 17:16:06 +01:00
Caleb Owens
3ea909a79e Fix boolean conversation type issue 2024-02-16 17:12:10 +01:00
Caleb Owens
0b45a1d6b8 Handle pushing when no force is needed, and don't show when there are no changes to push 2024-02-16 17:12:10 +01:00
Caleb Owens
4d20a7252c Correct code formatting 2024-02-16 17:12:10 +01:00
Caleb Owens
5740c16ee8 Show the push button when there are differences after undoing commits and the branch requires force pushing 2024-02-16 17:12:10 +01:00
Caleb Owens
f708c1568e Remove unneeded condition (the no commits case is handled by the CommitList element itself) 2024-02-16 17:12:10 +01:00
Andreas Skielboe
5de33a5ba3 ensure line number are draggable when not selectable 2024-02-16 16:54:57 +01:00
Andreas Skielboe
af02c7cb15 show grab curser on hunk line numbers 2024-02-16 15:51:52 +01:00
Andreas Skielboe
68d9de295e only show hunk line grab cursor if dragging is enabled 2024-02-16 15:51:52 +01:00
Kiril Videlov
913d4b0eeb feat: add a settings toggle for disabling auto-branch names even with ai generaton enabled 2024-02-16 14:46:20 +01:00
Andreas Skielboe
8377a303d5 file diff removed lines prefix should be - 2024-02-16 14:13:13 +01:00
Pavel Laptev
ddf0efb5b6 illustrations updated 2024-02-16 01:14:11 +01:00
Pavel Laptev
a882b949c3 updated all design tokens, added new css variables for interactive states --darken 2024-02-16 01:07:47 +01:00
Caleb Owens
8f0c695465 Ensure searches on PRs also includes the branch name 2024-02-15 23:57:12 +01:00
Caleb Owens
4570a82256 Disable spellcheck in most locations around the app (places where spellcheck="true" has been specified, I've left it as is) 2024-02-15 23:54:34 +01:00
Caleb Owens
78053bb3c1 Move to lowercase spellcheck to prevent a svelte check warning. 2024-02-15 23:54:34 +01:00
Caleb Owens
23744f0c70 Disable auto completions in branch filter field 2024-02-15 23:54:34 +01:00
Pavel Laptev
eb27c95f25 Styles fix: file list item width fixed on structure view 2024-02-15 21:59:52 +01:00
Juan P Barrios
974ecfee55 fix: vite-plugin-svelte error on empty scoped-style element 2024-02-15 21:28:21 +01:00
Juan P Barrios
83bb41e488 Simplify slice manipulation 2024-02-15 19:25:43 +01:00
Juan P Barrios
2cb9711c54 Fixes #2708
- Assumes all upstream branch names will start with 'refs/remotes/', then
- slices out the remote branch name without making any assumptions as to what it's named, and
- joins the rest of the split elements
2024-02-15 19:25:43 +01:00
Pavel Laptev
8ae99636d8 Double-clicking on the header was removed, this caused modal errors when closing 2024-02-15 14:35:13 +01:00
Pavel Laptev
f2986e6271 Fix: outdated checkbox design removed from ContextMenuItem 2024-02-15 14:24:16 +01:00
Kiril Videlov
99c2c443fe feat: Add information about AI commit message generation and usage of OpenAI's API in GitButler 2024-02-15 11:36:14 +01:00
Mattias Granlund
167b0b5a4d Capture push and pr success/failure in posthog
- just a start since we currently are not getting much data on this
2024-02-15 11:11:38 +01:00
Kiril Videlov
28d5aca9c2 dont add gitbutler as committer by default 2024-02-14 22:40:44 +01:00
Pavel Laptev
5768623be5 fix: append dialog element to body on mount to prevent overlapping with other elements' actions 2024-02-14 21:46:05 +01:00
Pavel Laptev
4a62c0f941 chore: update styling and structure of analytics settings page, added new component ClickableCard, Link style updated, InfoMessage component style updated 2024-02-14 20:44:50 +01:00
Pavel Laptev
49129fb15a chore: formatting fix 2024-02-14 13:11:44 +01:00
Pavel Laptev
d16010ac43 chore: if file view was open the resizer was behind the view 2024-02-14 13:10:46 +01:00
Pavel Laptev
cea8c74dcb fix: IconLink component styles updated, welcome screen styles updated, added conditional rendering for the user button 2024-02-14 13:05:44 +01:00
Mattias Granlund
d726a58318 Add missing import to fix openExternalUrl 2024-02-13 23:46:37 +02:00
Pavel Laptev
9b3e99fe83 fix: automatically close file on branch collapse. 2024-02-13 22:30:27 +01:00
Mattias Granlund
d94ba76302 Fix incorrect error message 2024-02-13 22:35:00 +02:00
Navid Salehi
259eda1ee5 Add tooltip for project setting icon button 2024-02-13 20:08:16 +01:00
Mattias Granlund
232ea42256 Show toast when failing to open external link
- toast contains url
- can be copied or clicked
2024-02-13 19:22:43 +01:00
Mattias Granlund
80dab85ae2 Show analytics settings title conditionally
- we don't want it in the analytics confirmation component
2024-02-13 19:09:10 +01:00
Mattias Granlund
a1cea76380 Add prompt for analytics consent
- shows on first use before adding project
2024-02-13 15:46:28 +01:00
Pavel Laptev
fb59709589 chore: fix formatting in switch repository message 2024-02-13 11:45:02 +01:00
Pavel Laptev
6d14f4dfd5 chore: update switch repository message and fix collapsed-lane double click event 2024-02-13 11:44:18 +01:00
Kiril Videlov
d605df4bd2 chore: add disabled state to buttons based on user authentication status 2024-02-12 23:04:57 +01:00
Kiril Videlov
1c4f8a0ed2 chore: add support for Python language parser 2024-02-12 18:35:08 +01:00
Kiril Videlov
a927901fd7 fix: display error message correctly in the UI 2024-02-12 17:16:24 +01:00
Pavel Laptev
5375a84163 chore: improve collapsible lane functionality and styling 2024-02-12 13:45:35 +01:00
Pavel Laptev
2b5a8978d4 style: update border style and color for a container and adjust text color and line height for span element 2024-02-11 23:03:41 +01:00
Kiril Videlov
920d0e96a8 fix: listing of remote branches no longer fetches commits and metadata 2024-02-11 22:52:52 +01:00
Pavel Laptev
fb78f18ad5 chore: refactor defaultBranchWidthRem initialization and remove unnecessary code 2024-02-11 22:17:26 +01:00
Pavel Laptev
232bb7be16 style: add hover effect to collapsed lane arrow icon 2024-02-11 22:17:00 +01:00
Pavel Laptev
5fa16a263a chore: clean up code formatting and remove commented out code 2024-02-11 22:13:27 +01:00
Pavel Laptev
3427a3e8c5 Merged origin/master into Collapsable lane 2024-02-11 22:09:15 +01:00
Kiril Videlov
d234649e47 feat: add support for fetching remote branch data and displaying commits in the branch view 2024-02-11 21:54:39 +01:00
Pavel Laptev
22c6b7813c chore: simplify code formatting and remove unnecessary code 2024-02-11 20:42:29 +01:00