Commit Graph

5514 Commits

Author SHA1 Message Date
Kiril Videlov
cb128df06b feat: Add last commit timestamp and author to RemoteBranch struct and use it in CombinedBranch for display purposes. 2024-03-08 22:22:40 +01:00
Matías Fuentes
c69ca25cbd fix: added draggable="false" to file-icon and created a class in styles ".file-icon".
formated file
fix: width space on file icon
fix: format
2024-03-08 22:02:06 +01:00
Mattias Granlund
acb25f3d98 Fix new project redirect
- needs to be improved in the future
2024-03-08 21:21:41 +01:00
Mattias Granlund
efb8f77543 Integrated credential checker into settings and setup flow
- adds new [projectId]/setup route
2024-03-08 19:26:34 +01:00
Mattias Granlund
7e3049d179 Add git credential checker to project setup
This is meant to help with the most frequent support requests, problems
with pulling and pushing from a git remote.
2024-03-08 19:26:34 +01:00
Pavel Laptev
1c3f363461
Merge pull request #3077 from gitbutlerapp/Section-card-updates
section card updates
2024-03-08 11:45:42 +01:00
Pavel Laptev
ded41d7728 removed non existing attr 2024-03-08 11:44:20 +01:00
Pavel Laptev
0d3c33b821 section card updates
- added `clickable` and non `clickable` styles
- added hover state if it's clickable
- added `labelFor` where it was missing and removed where the card is not clickable
2024-03-08 11:03:22 +01:00
Mattias Granlund
6bbf7a8310 Fix settings page refactor regressions
- fixes click on some missing elements
- load ssh key in onMount
- happened with removal of clickable card
- fixes missed prop renames
2024-03-08 02:47:32 +01:00
Mattias Granlund
645e076a78 Use SectionCard instead of ClickableCard
- commit grew a bit in scope
- lots of refactoring to settings pages
- clickable card dropped
2024-03-08 00:19:11 +01:00
Mattias Granlund
0311052f24 Add back push success/failure telemetry
- accidentally dropped when removing duplicate function
2024-03-07 21:45:43 +01:00
Matías Fuentes
ccd8417626 fix: runned format command 2024-03-07 21:16:51 +01:00
Matías Fuentes
ac7adbedae fix: branches filter checkboxes and toggle behavior 2024-03-07 21:16:51 +01:00
Nikita Galaiko
c309d96919 remove unapply logic during branch verification 2024-03-07 19:14:32 +01:00
Nikita Galaiko
aeb076630d make sure set_base_branch preserves active status 2024-03-07 19:14:32 +01:00
Nikita Galaiko
a4768de8bb remove gitbutler/integration reference when user switches away from it 2024-03-07 19:14:32 +01:00
Nikita Galaiko
b0e63d7259 re-construct tree from scratch when going back to integration 2024-03-07 19:14:32 +01:00
Nikita Galaiko
e2ff8e7d20 do not allow dirty working directory when going back to default target 2024-03-07 19:14:32 +01:00
Nikita Galaiko
82ae6d454a make go back to integration more predictable 2024-03-07 19:14:32 +01:00
Kiril Videlov
f4843750e1 feat: adds a git_test_fetch command to check if fetch can be performed for a given remote 2024-03-07 19:04:17 +01:00
Kiril Videlov
bbee89c95b refactor(virtual_branches): Remove unused import 2024-03-07 18:56:02 +01:00
Kiril Videlov
6c0d19d716 adds remote name and branch name as parameters to the git_test_push command 2024-03-07 18:42:41 +01:00
Josh Junon
e6d5bc2e82
Merge pull request #3069 from gitbutlerapp/fix-windows-notify
Fix fs notify events on windows
2024-03-07 18:18:00 +01:00
Josh Junon
8979e35d9e
fix fs notify on windows 2024-03-07 18:05:24 +01:00
Josh Junon
7ea8bff2cb
Merge pull request #3067 from gitbutlerapp/remove-unused-imports
remove unused imports
2024-03-07 16:12:56 +01:00
Josh Junon
7ba6bd259a remove unused imports 2024-03-07 15:30:17 +01:00
Pavel Laptev
f4fc6b1b1d
Merge pull request #3066 from gitbutlerapp/Copy-update
Info message updates
2024-03-07 14:54:48 +01:00
Pavel Laptev
1df2d69445 fixed button color in InfoMessage 2024-03-07 14:52:47 +01:00
Pavel Laptev
8791b58cd8 feat: Added a new "test" icon 2024-03-07 14:44:12 +01:00
Pavel Laptev
4128a404b3 Info message updates
- added new `success` style
- added two propes `filled` and `outlined` with which you can modify the look and switch on or off these props separatly
2024-03-07 14:38:29 +01:00
Pavel Laptev
93abbf85c8
Merge pull request #3050 from gitbutlerapp/Copy-update
Update button text from "Authenticate" to "Authorize" in GitHub authentication workflow
2024-03-07 14:35:12 +01:00
Pavel Laptev
467f4a1379 Added Forget button
- added forget button to the card
- removed conditional `Forget` button from the `minimal` mode, because we don't use it
2024-03-07 00:23:09 +01:00
Mattias Granlund
45846117e2 Update merge button labels
- corrects language to say e.g. "rebase and squash" instead of "rebase"
2024-03-06 23:18:19 +02:00
Mattias Granlund
e092358453 Remove unnecessary css from app.html
- they were added a long time ago and have no effect
2024-03-06 23:16:00 +02:00
Mattias Granlund
74a906618e Fix problem with user-select: none in root element
- webkit bug related to draggable=true
- left descendants without ability to set user-select: text
- unclear why it only affected draggable lanes and not e.g. hunks
2024-03-06 23:16:00 +02:00
Kiril Videlov
66fc956a9a feat: test push command 2024-03-06 21:59:41 +01:00
Mattias Granlund
bcc2cd721f Change "discard file" to "discard changes" 2024-03-06 19:18:33 +02:00
Josh Junon
06c2231f24
Merge pull request #3055 from gitbutlerapp/Virtual-branch-4
refactor remaining low-hanging-fruit `TryFrom` implementations
2024-03-06 16:12:06 +01:00
Mattias Granlund
5c64a0ea90 Rename a couple of ts files from snake_case to camelCase 2024-03-06 16:47:57 +02:00
Josh Junon
df3944106f refactor remaining low-hanging-fruit TryFrom implementations 2024-03-06 15:47:08 +01:00
Josh Junon
83582e24e9
Merge pull request #3053 from gitbutlerapp/Virtual-branch-5
more refactors of TryFrom
2024-03-06 15:29:55 +01:00
Pavel Laptev
8dcf20cd15
Merge pull request #3052 from gitbutlerapp/Design-tokens-update
style: updated design tokens
2024-03-06 15:20:14 +01:00
Josh Junon
7905903c5d more refactors of TryFrom 2024-03-06 15:19:51 +01:00
Josh Junon
62081de9cf
Merge pull request #3051 from gitbutlerapp/Virtual-branch-4
remove several TryFrom cases for initializing type with path
2024-03-06 15:18:48 +01:00
Pavel Laptev
02d7a183b4 style: updated design tokens 2024-03-06 15:17:27 +01:00
Josh Junon
d72002c7f5 remove several TryFrom cases for initializing type with path 2024-03-06 14:44:08 +01:00
Josh Junon
d8b8c0f78d
Merge pull request #3049 from gitbutlerapp/Virtual-branch-4
first set of TryFrom impl removals
2024-03-06 14:35:44 +01:00
Pavel Laptev
72dd125056 feat: Update button text from "Authenticate" to "Authorize" in GitHub authentication workflow
Changed the button text from "Authenticate" to "Authorize" for better clarity.
2024-03-06 14:31:03 +01:00
Josh Junon
f8ad417c04 first set of TryFrom impl removals 2024-03-06 14:21:13 +01:00
Kiril Videlov
f2b13e5632 chore: add serde attribute to rename fields to camelCase in VirtualBranches struct 2024-03-06 13:51:04 +01:00