Kiril Videlov
3b7387a4b3
put base branch switching behind a feature flag
2024-05-02 11:58:31 +02:00
Kiril Videlov
3326ae6b81
feat: a place in the settings for feature flags
2024-05-02 11:51:06 +02:00
Scott Chacon
ac4188819a
Merge pull request #3661 from gitbutlerapp/base-branch-commit-card-fix
...
Base branch commit cards should not be editable
2024-05-02 11:36:37 +02:00
Pavel Laptev
d7d4d0fef9
Switch base branch move to project settings ( #3662 )
...
* Remove scrollIntoView from select
- It cause the whole page scroll. For now I deleted this, but it's a nice feature, so planning to fix ti later
* Return `branch` in `setTargetBranch`
Because the result of this async function was `undefined`
* Updated `TextBox` and `SelectItem` styles
* Move base branch switcher to the `Setting` page
2024-05-02 11:29:37 +02:00
Scott Chacon
5f1559aff6
Base branch commit cards should not be editable
2024-05-02 11:12:16 +02:00
Daniel Woodward
0dfdaa5f79
fix: .branch-switcher styling in dark mode
2024-05-01 22:15:44 +01:00
Pavel Laptev
b8f689397e
Fix: setting toggle ( #3650 )
2024-05-01 02:11:22 +02:00
Pavel Laptev
c9aba85bfa
Some design updates ( #3649 )
...
* CSS: badge size update
* close modal when remove the project
2024-05-01 01:10:22 +02:00
Mattias Granlund
4c3ac60dda
Fix annoying inconsistency in normalizeBranchName
...
Both the rust code and typescript code have a normalization function, but the rust code doesn't lowercase the name.
2024-04-30 19:00:18 +02:00
Mattias Granlund
1255dbc2fe
Show {completed}/{total} while running checks
2024-04-30 18:55:52 +02:00
Pavel Laptev
142ba34cdf
fix: close modal on brunch delete ( #3644 )
2024-04-30 18:52:39 +02:00
Mattias Granlund
088b919a2a
Drop unused global.d.ts
2024-04-30 18:41:46 +02:00
Mattias Granlund
cef0b17089
Fix bug where branch appeared remote when in fact virtual
2024-04-30 18:31:50 +02:00
Mattias Granlund
232ea70739
Merge pull request #3640 from gitbutlerapp/update-base-text-size
...
style: fix font size in text-base-body-10 class
2024-04-30 18:23:49 +02:00
Mattias Granlund
b89e83b5bd
style: fix font size in text-base-body-10 class
2024-04-30 18:16:14 +02:00
Pavel Laptev
0d80c7e6f2
Refactor: Modal component ( #3639 )
2024-04-30 16:05:58 +02:00
Josh Junon
3ff409708f
disable posthog recording on frontend
2024-04-30 11:38:50 +02:00
Scott Chacon
d8b2bc205c
Merge pull request #3634 from gitbutlerapp/Reset-Base-Branch
...
can change your base branch
2024-04-30 10:35:45 +02:00
Scott Chacon
2ef63bc1d9
what in gods name
2024-04-30 10:33:35 +02:00
Scott Chacon
5603dbba5f
Imma kill a motherfucker
2024-04-30 10:31:22 +02:00
Scott Chacon
eed862a56c
fix dumb bullshit
2024-04-30 10:29:04 +02:00
Scott Chacon
cd2d9f708e
can change your base branch
...
when no vbranches are applied, you can change your base branch
2024-04-30 10:22:29 +02:00
Scott Chacon
698791ba08
fixes bug with hidden uneditable commit messages
2024-04-29 17:34:44 +02:00
Scott Chacon
786a834559
Merge pull request #3626 from gitbutlerapp/sc-history-manipulation
...
operation tonkotsu 2
2024-04-29 16:17:57 +02:00
Kiril Videlov
4414d29bbf
separate opt-in for non-anonomous telemetry
2024-04-29 15:12:22 +02:00
Scott Chacon
6e0b37a342
frontend code for running various history manipulations
2024-04-29 15:06:13 +02:00
Kiril Videlov
732a196505
fix: dont initialize posthog / sentry analytics before onboarding complete
2024-04-29 14:25:45 +02:00
Kiril Videlov
88c5fa249b
updated ui structs for snapshots
2024-04-26 23:34:09 +02:00
Pavel Laptev
06240b3e78
CSS: Button and Tag fixes ( #3616 )
2024-04-26 16:08:13 +02:00
Pavel Laptev
720dbfc875
Small CSS Updates ( #3615 )
...
* badge changes
* fix branches dragging
2024-04-26 13:45:35 +02:00
Mattias Granlund
a91153aff3
Fix lock tooltip closure shadowing commit variable
2024-04-26 00:06:01 +02:00
Mattias Granlund
c5c2df1b93
Surface warning if hunk locked to multiple branches
...
- now returning `HunkLock` to front end
- detect if locked to more than one branch and warn user
2024-04-26 00:06:01 +02:00
Kiril Videlov
24a357e3c7
add some basic UI for the undo
...
activated with Cmd+shift+H
2024-04-25 19:23:13 +02:00
Mattias Granlund
ebc696ad26
Look up locked commit from remote commits as well
...
- also filters for unique commits, should really be done in the back end
2024-04-25 19:07:41 +02:00
Pavel Laptev
65f2dc1fa5
fix: didn't show error comes from Rust ( #3599 )
2024-04-24 17:20:15 +02:00
Mattias Granlund
c202d83b6b
Allow hunk locking to multiple commits
...
- adds `locked_to` field to `GitHunk` to avoid looking it up again
- sends array to ui instead of single commit id
2024-04-24 08:15:01 +01:00
Pavel Laptev
bc7d3c7309
Design tokens typos fix ( #3588 )
2024-04-23 16:37:58 +02:00
Pavel Laptev
683beffc1f
Design tokens typos fix ( #3587 )
2024-04-23 16:20:52 +02:00
Pavel Laptev
5c9ce25cd0
Infomessage improvments (#3577 )
...
* `InfoMessage` structure consistancy improved
- `title` property removed
- unnamed `slot` for content dropped
* Added `errorMessage` attr to the `ToastController`
2024-04-22 21:44:28 +02:00
Kiril Videlov
a96e8574be
feat: search by branch
...
This adds the ability to search branches by the author name. This is a port of #2852
2024-04-22 15:22:57 +02:00
Pavel Laptev
ca0a4cb92e
tokens refactor ( #3578 )
2024-04-22 12:12:27 +02:00
Pavel Laptev
b9f7278eb4
Folded branch copy update ( #3572 )
2024-04-21 13:39:44 +02:00
Pavel Laptev
628be51421
Indicate uncommited lanes ( #3570 )
...
* Indicate uncommited lanes
* Copy update and one prop name update
2024-04-21 12:18:11 +02:00
Pavel Laptev
863494d997
UI: fix lane horizontal scroll ( #3567 )
2024-04-20 04:18:12 +02:00
Pavel Laptev
8b2c120811
Style and layout fixes ( #3562 )
...
* Styles: small fixes
* "Remove" button style fix
* Git Auth form layout update: made shorter
* added styles for `code` strings
2024-04-20 00:02:55 +02:00
Pavel Laptev
fd622d4e7b
UX: break GitHub Auth into steps, layout update ( #3558 )
...
* UX: break GitHub Auth into steps, UX improve
* refactor: duplicated action removed
* remove unnessesery code
2024-04-19 15:02:19 +02:00
Pavel Laptev
f2e9f801dd
Remove unused CSS classes ( #3557 )
2024-04-19 13:13:35 +02:00
Josh Junon
db70eed3a8
Merge pull request #3545 from gitbutlerapp/fix-test-fetch-push
...
use more robust askpass frontend handling
2024-04-18 11:45:00 +02:00
Josh Junon
37bacc6ad1
use more robust askpass frontend handling
2024-04-18 11:42:12 +02:00
Caleb Owens
8c4ad945dd
Merge branch 'master' into always-await-promises
2024-04-17 13:23:31 +01:00
