Commit Graph

707 Commits

Author SHA1 Message Date
Nico Domino
3ce2b5b338
fix: avatars from Google accounts via Auth0 (#4725) 2024-08-21 11:06:52 +02:00
Mattias Granlund
4a015e8b0d
Merge branch 'master' into delete-project-when-backing-from-adding-project 2024-08-20 12:36:48 +01:00
Caleb Owens
65fb462d64 Rebase revolution
Co-authored-by: Scott <schacon@gmail.com>
2024-08-19 18:10:28 +02:00
Caleb Owens
4a9114f4f3 Remove unused styles? 2024-08-19 13:31:38 +02:00
Caleb Owens
17d15719ce Update terminology 2024-08-19 13:25:46 +02:00
Caleb Owens
59f65983ac Put edit mode behind a feature falg 2024-08-19 13:16:26 +02:00
Caleb Owens
dbe8013de3 Record entering edit mode in oplog 2024-08-19 11:44:59 +02:00
Caleb Owens
7ab7731a31 Add edit mode actions
More edit mode
2024-08-19 11:03:51 +02:00
Pavel Laptev
daa285f41e
Login flow update and UI updated (#4716)
* UI: Fix disabled `WelcomeAction` state

* update stories structure

* update UI components structure

* fix path to icons.json

* fix path to `timeAgo` functions

* added `LinkButton` component and updated login functions

* copy change

* remove `console.log`

* lint: formatting fixes

* remove `console.log` from the `Modal` story

* casing change

* remove duplicated folders (casing issue)
2024-08-19 11:55:19 +02:00
Nico Domino
776a66b293
chore: migrate BranchLabel to runes (#4712) 2024-08-19 09:01:53 +00:00
Caleb Owens
575d8a0492
Merge pull request #4708 from gitbutlerapp/Use-gix-for-cloning
Use gix for cloning repositories
2024-08-19 10:44:44 +02:00
Pavel Laptev
4e23be18d8
CSS fixes: branch (#4715)
* fix with on drag

* fix draggable handle for collapsed lines

* remove left border for the folded line when dragging
2024-08-18 21:39:35 +02:00
Mattias Granlund
c9b5aa7c26 Refactor app updater a bit
- fixes things discovered in manual testing
- avoid $effect loops
2024-08-17 09:02:00 +01:00
Mattias Granlund
238a26b4ae show dismiss button if up-to-date 2024-08-17 09:02:00 +01:00
Pavel Laptev
422ce4f308 added new design 2024-08-17 09:02:00 +01:00
Mattias Granlund
bc10f4985b Add manual check for app update 2024-08-17 09:02:00 +01:00
Nico Domino
efb9a03a49
chore: migrate BranchHeader files to runes (#4710) 2024-08-16 17:44:58 +02:00
Nico Domino
88e791c307
fix: eslint.config for testing (#4704) 2024-08-16 15:30:53 +02:00
Nico Domino
4aceb459a3
fix: e2e record.ts cleanup (#4696) 2024-08-16 14:51:33 +02:00
Caleb Owens
2316d0f10d Use gix for cloning repositories 2024-08-16 12:21:42 +02:00
Nico Domino
7dc829960a
fix: tooltips when used in elevated contexts (#4703) 2024-08-16 12:17:43 +02:00
Caleb Owens
d3e3ffffd2 fix githost factory initialization 2024-08-15 19:00:44 +02:00
Comnir
b92ee0f3ee Fix imports 2024-08-15 19:50:50 +03:00
Caleb Owens
ca5de46bac sanitize all text 2024-08-15 18:02:18 +02:00
Nico Domino
13a270613c
feat: add ffmpeg video recorder for e2e tests (#4686) 2024-08-15 11:54:10 +02:00
Comnir
b5a5be42b0 Revert BackButton changes 2024-08-14 19:51:29 +03:00
Comnir
4735da4990 Replace BackButton with a Button 2024-08-14 19:47:33 +03:00
Caleb Owens
838f6e6226 Refactor mode service to remove manual unsubscribe 2024-08-14 11:22:47 +02:00
Caleb Owens
83283d918c
Merge pull request #4682 from gitbutlerapp/Provide-current-mode-to-frontend
Provide current mode to frontend
2024-08-14 10:02:37 +02:00
Pavel Laptev
fdea1cb0f5
UI lib: text utility classes (#4684) 2024-08-14 09:52:20 +02:00
Nir
a8f6e0a3b9
Change action name and logging 2024-08-14 09:01:11 +03:00
Nico Domino
11ff8a71cc
feat: initial addProject test with WebdriverIO (#4589)
Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
Co-authored-by: Test User <test@example.com>
2024-08-13 17:31:19 +02:00
Caleb Owens
e0d7b56cb5 Provide current mode to frontend 2024-08-13 17:05:28 +02:00
Pavel Laptev
273b7f9332
UI updates (#4676) 2024-08-12 09:34:18 +02:00
Caleb Owens
e18749ad1f feat(branches): add project-specific branch listing options
Implement project-specific persistence for branch listing options.
This change ensures that each project maintains its own selected
option state, improving user experience across multiple projects.
Update CombinedBranchListingService to use project-specific
persistence and modify its constructor to include projectId.
2024-08-11 17:29:49 +02:00
Caleb Owens
d68959bb78 feat(branch): optimize listing and enhance lazy loading
Improve branch listing performance and lazy loading behavior.
Introduce debouncing for branch listing updates to reduce
unnecessary calls. Refactor LazyloadContainer for better
efficiency and reliability. Update Branches component to use
reactive search term. These changes aim to enhance overall
application responsiveness and user experience.
2024-08-11 16:08:29 +02:00
Comnir
bb791f7d13 Remove colons, following svelte(?) upgrade 2024-08-10 20:28:22 +03:00
Comnir
130cef5eb4 fix: clicking Cancel on new project page does nothing
- Fixes #2539
- Clicking 'Add new project' immediately adds the the repo to the projects list
- Clicking Cancel on the project setup pageredirects to the app root page
- If the projects list conatins a project, the root page redirects to the project page. When the project setup is incomplete, the project setup is displayed
- To avoid this redirect, clicking cancel now deletes the project
2024-08-10 20:00:51 +03:00
Caleb Owens
4c47923485 feat(CloneForm): add error tracking and improve typing
Adds Sentry exception tracking and PostHog event capture for
repository clone failures.
2024-08-10 15:31:04 +02:00
Kiril Videlov
252568ec20
makes it easier to drag window 2024-08-10 13:51:12 +02:00
Kiril Videlov
a6ada0423f
refactor: Change button text to "Delete local" in BranchPreviewHeader. 2024-08-09 22:48:58 +02:00
Kiril Videlov
ed7a8c4027
Merge pull request #4663 from gitbutlerapp/create-delete-local-branch
create-delete-local-branch
2024-08-09 16:07:54 +02:00
Kiril Videlov
d635f72269
i dont trust the old Refname implementation
So not using it for deletion here
2024-08-09 15:59:32 +02:00
Nico Domino
494e2284b7
fix: handle local paths as git remote URIs (#4664) 2024-08-09 15:46:32 +02:00
Kiril Videlov
63b43b3f23
UI: the branch preview now has a button to delete local branches 2024-08-09 15:30:10 +02:00
Pavel Laptev
1e68698cd1 UX/UI: Improve selected state for sidebar buttons 2024-08-09 12:34:29 +02:00
Nico Domino
7d1b7b99db
fix(ui): update ui output (#4649) 2024-08-08 14:51:37 +02:00
Caleb Owens
5bead87303 Add inline unified word diffs 2024-08-07 18:50:14 +02:00
Caleb Owens
58043dd16e Make state calls more consistent 2024-08-07 14:42:42 +02:00
Caleb Owens
1b6a6fc91c Added guards to prevent state update races 2024-08-07 14:38:35 +02:00
Caleb Owens
f475ed1dff Default to showing the current author when there are no commits 2024-08-07 11:54:23 +02:00
Caleb Owens
d8d44f8c56 Make branch listing sort more stable 2024-08-07 11:18:49 +02:00
Caleb Owens
becb61548b
Merge pull request #4634 from gitbutlerapp/fix-branch-preview-remote-link
Fix branch preview remote link
2024-08-07 10:50:37 +02:00
Pavel Laptev
92f44e3661 UI update: branches search style 2024-08-07 00:42:11 +02:00
Caleb Owens
04391663b9 Fix branch preview remote link 2024-08-07 00:25:13 +02:00
Pavel Laptev
96a399bc92 branches grouping update 2024-08-06 23:12:22 +02:00
Pavel Laptev
b93b335dfe
Sidebar branches UI update (#4631)
* update "added/removed" and "commits" tags

* Update: search transition duration

* gap between tags update
2024-08-06 16:52:59 +02:00
Pavel Laptev
440a4f7b80 unused code removed 2024-08-06 16:46:13 +02:00
Pavel Laptev
67165c7cff
Merge pull request #4627 from gitbutlerapp/Sidebar-branches--search
feat(navigation): improve search UX/UI
2024-08-06 16:18:47 +02:00
Pavel Laptev
6de1215c56 remove unused imports 2024-08-06 16:04:01 +02:00
Pavel Laptev
530727b2b8 feat(navigation): improve search UX/UI 2024-08-06 16:01:41 +02:00
Mattias Granlund
1eeebc3c28 Fix: remember last opened project again 2024-08-06 13:15:00 +01:00
Caleb Owens
91c2e9fec7
Merge pull request #4625 from gitbutlerapp/make-branch-listing-more-reactive
feat: Integrate BranchListingService for better branch management
2024-08-06 13:39:12 +02:00
Caleb Owens
b466619ec3 feat: Integrate BranchListingService for better branch management
Adds BranchListingService to VirtualBranchService and RemoteBranchService
to improve branch synchronization and refresh mechanisms. Updates layout
files to provide the service through context. This change enhances the
overall branch management system and ensures consistent branch listing
across different components.
2024-08-06 13:37:35 +02:00
Caleb Owens
2902721367 Don't error when clicking a virtual branch and going to workspace 2024-08-06 13:33:10 +02:00
Pavel Laptev
1bba118b9b
Sidebar branches UI (#4622)
* update illustration

* update tooltip show delay

* remove `showBorderWhenScrolled`

* sticky headers added
2024-08-06 13:11:56 +02:00
Caleb Owens
3412ed3194
Merge pull request #4615 from gitbutlerapp/selected-state-for-sidebar-entries
fix: Add selected state for sidebar entries
2024-08-05 22:32:36 +02:00
Caleb Owens
5a488b6dd7 fix: Add selected state for sidebar entries
Refactors sidebar entries for branches and pull requests to show
selected state based on the current URL. This improves the visual
indication of the current active view. Introduces helper methods
for formatting URLs to prevent duplication.
2024-08-05 22:20:57 +02:00
Nico Domino
e57792639d
fix(eslint): missed file rename (#4613) 2024-08-05 20:14:34 +00:00
Nico Domino
fc70ef2ce7
fix(web): minor cleanup on downloads page (#4610) 2024-08-05 19:49:04 +00:00
Nico Domino
9d5eded33d
fix(web): initial services cleanup (#4607) 2024-08-05 19:27:24 +00:00
Caleb Owens
d03a94eb02 Don't group by day when searching 2024-08-05 20:43:15 +02:00
Caleb Owens
553ce474e7 Fix wrong authors when listing 2024-08-05 20:29:15 +02:00
Caleb Owens
a57238a371
Merge pull request #4605 from gitbutlerapp/Vidluther-ai
Vidluther ai
2024-08-05 17:17:49 +02:00
Caleb Owens
3285ba6e90 Don't refer to claude 2024-08-05 17:14:46 +02:00
Caleb Owens
8e424b2405 Correct sonnet key 2024-08-05 17:12:55 +02:00
Caleb Owens
c751ab2922 Merged origin/master into gitbutler/master 2024-08-05 17:08:41 +02:00
Caleb Owens
e5a9c4687f
Merge pull request #4593 from patelka2211/improvements-in-drag-regions-of-welcome-page
Improvements in drag regions of welcome page.
2024-08-05 17:07:51 +02:00
Caleb Owens
f5f80baa61 Add in searching with Fuse 2024-08-05 16:41:12 +02:00
Nico Domino
cec6ed6fbf
fix: add two additional tsconfig options (#4592) 2024-08-05 14:21:38 +00:00
Nico Domino
a21d1bcfae
fix: ssh clone posthog event (#4603) 2024-08-05 14:06:50 +00:00
Nico Domino
91808b94b3
fix: add additional 'open' boolean to AppUpdater.svelte (#4602) 2024-08-05 13:55:12 +00:00
Caleb Owens
e0bdfc425a Eagerly redirect to workspace 2024-08-05 15:47:54 +02:00
Caleb Owens
9593904fa7
Merge pull request #4600 from gitbutlerapp/restore-sidebar-filters
Restore filters
2024-08-05 15:22:42 +02:00
Caleb Owens
7903c73ae4 Restore filters 2024-08-05 15:16:56 +02:00
Kartavya Patel
49f9d67b81
Merge branch 'master' into improvements-in-drag-regions-of-welcome-page 2024-08-05 18:32:00 +05:30
Nico Domino
5c0b87a353
fix: remove CloneForm clone type segment select (#4599) 2024-08-05 12:56:47 +00:00
Caleb Owens
e4c3557255 Merged origin/master into sidebar-branches 2024-08-05 14:02:01 +02:00
Caleb Owens
8eb5371b0a Fix the worst conflicts I've ever delt with 2024-08-05 14:01:49 +02:00
Nico Domino
43341c4d0b
fix: cleanup dependencies in JS packages (#4591) 2024-08-05 13:45:31 +02:00
Pavel Laptev
aaf933f42d
UI package update (#4598)
* add `Button` and `Icon` to UI library

* Update Button.stories.ts

* button stories added

* remove unused dependencies

* update button stories

* Update DemoButton.stories.ts

* update tokens

* dark theme toggle fix

* replace buttons with buttons from the package UI

* Update FileCardHeader.svelte

* Update BranchLaneContextMenu.svelte

* replace the app `Icon` component with the `UI` component

* fix `Icon` import in the `package UI`

* update imports for `icons.json`

* fix wrong type on Storybook

* update imports for `types`

* fix import order

* storybook grouping update
2024-08-05 13:20:03 +02:00
Caleb Owens
0b31743a2e mergey merge 2024-08-05 11:43:10 +02:00
Caleb Owens
aec1bda197 stuff 2024-08-05 11:37:39 +02:00
Nico Domino
7a33fc8ffe
fix: commit message component behaviour (#4597) 2024-08-05 11:06:02 +02:00
Vid Luther
ff6c9f4c7d fix lint check
lint test was failing due to extra comma
2024-08-04 11:14:03 -05:00
Vid Luther
1dfe4ed4e7 feat: Rename 'Claud35Sonnet' to 'Claude35Sonnet'
The 'Claud35Sonnet' enum value has been renamed to 'Claude35Sonnet' to
correctly reflect the model name. This change ensures consistency in
the codebase and improves readability.
2024-08-04 11:05:13 -05:00
Vid Luther
2b9da0d6d8 feat(desktop): add new OpenAI and Anthropic model options
The changes introduced in this commit add new OpenAI and Anthropic model options to the AI settings page in the desktop application. Specifically, the following changes were made:

- Added 'GPT 4o mini' as a new OpenAI model option
- Added 'Claude 3.5 Sonnet' as a new Anthropic model option
- Updated the labels for existing model options to improve clarity and readability

These changes provide users with more choices when selecting the AI model they want to use, allowing them to better tailor the application to their specific needs and preferences.
2024-08-04 11:01:05 -05:00
Pavel Laptev
48d2e8baea
Package UI update (#4594)
* bump SB version

* fix Segmented control import

* formatting fix

* fix formatting on build

* migrate to Terrazzo + utility classes WIP

* copy update

* Update c-colors.mdx

* fix hex color

* move diff variables into tokens

* Update c-colors.mdx

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* update terrazzo

* Update pnpm-lock.yaml
2024-08-04 14:53:45 +02:00
Kartavya Patel
d62ac9b003
Merge branch 'master' into improvements-in-drag-regions-of-welcome-page 2024-08-04 17:36:10 +05:30
Nico Domino
d559cffe6a
feat: add @gitbutler/ui, userService, authService and some minor cleanup (#4595) 2024-08-04 11:39:41 +00:00
Kartavya Patel
201a626315 Improvements in drag regions of welcome page. 2024-08-03 23:00:11 +05:30
Nico Domino
549dff6205
fix: remove playwright (#4588) 2024-08-02 14:17:32 +02:00
Nico Domino
e5498665b4
feat: add WebdriverIO based E2E test setup (#4561) 2024-08-02 10:46:56 +00:00
Caleb Owens
691c5b3700 linty linty fixy fixy 2024-08-01 18:24:34 +02:00
Caleb Owens
00b778638a Demoing conflict resolution 2024-08-01 18:09:23 +02:00
Caleb Owens
91b939563c asdf 2024-08-01 18:05:03 +02:00
Nico Domino
cda04e9b5b
feat: clone repo onboarding step (#4542)
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-08-01 16:54:49 +02:00
Caleb Owens
bbcfbbd72b Redid branch page 2024-08-01 16:28:37 +02:00
Caleb Owens
e9d1192b6d correct orderign and PR duplication 2024-08-01 14:47:22 +02:00
Caleb Owens
32b9b523ca stuff and things 2024-08-01 14:11:54 +02:00
Caleb Owens
70422439d7 integrated the thign 2024-07-31 19:41:08 +02:00
Caleb Owens
09de80f6f0 Mergy merge 2024-07-31 13:11:02 +02:00
Caleb Owens
43600c0a13 Moved some stuff into the UI package 2024-07-31 13:08:48 +02:00
Pavel Laptev
626ae0e390
Merge pull request #4556 from gitbutlerapp/Style-updates
Style updates
2024-07-31 13:05:05 +02:00
Caleb Owens
970a14930c Make the service reactive 2024-07-31 11:55:55 +02:00
Nico Domino
ad92566cb3
fix: AppUpdater popover not able to be closed (#4555) 2024-07-31 11:51:04 +02:00
Pavel Laptev
3a93599e5c styles fix: board links 2024-07-31 11:45:27 +02:00
Mattias Granlund
0c7b2bd881 Prevent including background in text selection #2
- seems this line was lost in some UI package refactor
2024-07-31 08:18:55 +01:00
Pavel Laptev
6fe1f25959
Diff-hunk-style-fixes (#4551)
* remove styles duplication

* Add hunk background color

* fix: gap between commits when dragging

* update hunk line colors

* fix: number columns cliping

* fix: number column border clipping

* diff styles update

* update "large diff" message style
2024-07-31 00:31:26 +02:00
Kiril Videlov
9ac21d39b5
fix one more callsite 2024-07-30 22:31:43 +02:00
Kiril Videlov
9fd02c41c0
update the UI for sync-ing (feature flagged) 2024-07-30 22:08:39 +02:00
Mattias Granlund
235a6a5d83 Fix a few problems in hunk/commit drag operations 2024-07-30 18:16:15 +01:00
Mattias Granlund
e1eea3c5ab Relax the amend restriction
We currently don't have accurate lock data. Also, we should allow amending to any commit _later_ than the lock subject.
2024-07-30 16:29:04 +01:00
Caleb Owens
142798383f Merged origin/master into sidebar-branches 2024-07-30 17:11:00 +02:00
Pavel Laptev
ab0c70b673
Package UI updates (#4539)
* documentation update + design tokens generation

* ts config update

* formatting fix

* update tokens config format

* ignore JS files check

* Storybook version bump

* formatting fix

* dark theme toggle added
2024-07-30 16:45:19 +02:00
Caleb Owens
445bd6a66f Use our svelte based explosion handling 2024-07-30 16:44:27 +02:00
Caleb Owens
e53c11a477 introduce last commiter field, use jsdoc, add type transforms 2024-07-30 16:42:20 +02:00
Nico Domino
aca95b196d
fix: use SvelteKit auto-generated types for load fns (#4541) 2024-07-30 13:19:13 +00:00
Nico Domino
7175d28304
fix: tweak pii onboarding copy (#4540) 2024-07-30 15:16:16 +02:00
Caleb Owens
32868092ed Merged origin/master into sidebar-branches 2024-07-30 13:45:00 +02:00
Nico Domino
9646684f92
feat: refactor diff rendering (#4497)
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-07-30 13:27:19 +02:00
Pavel Laptev
2e3e733ac5 Merged origin/master into sidebar-branches 2024-07-29 14:24:48 +02:00
Pavel Laptev
1c6b03eb6b
UI Package: refactor (#4529)
* Separate styles responsibilities

* Add misssing dependencies

* Intro page added

* formatting fix
2024-07-29 13:52:14 +02:00
Pavel Laptev
88b8f4b1bb
Update the use and structure of styles (#4524)
* update the structure in the UI package

* remove styles from the app

* tokens update

* fix serif font style

* style: reduce margin-bottom in NotOnGitButlerBranch component. remove unused css

* style: Update background color on hover in Board component.

* fix fonts duplication

* styles restructuring

* GitButler WIP Commit

* watch command changed

---------

Co-authored-by: GitButler <gitbutler@gitbutler.com>
2024-07-29 11:29:54 +02:00
Nico Domino
45d340ef37
fix: nightly build (#4522) 2024-07-29 08:49:22 +00:00
Mattias Granlund
974e60aefc Fix branch reordering
- move branches into their own div
- make only one update request
2024-07-29 01:07:06 +01:00
Mattias Granlund
dc87e5fd64 Fix azure devops urls
- manually tested
2024-07-28 22:57:47 +01:00
Kiril Videlov
9d04c08528
add branch listing details api
this allows us to paginate the expensive bit of the API, like getting the lines added / removed
2024-07-28 22:19:30 +02:00
Mattias Granlund
e1f9c8b59e Add gitlab/bitbucket/azure GitHost implementations 2024-07-28 20:01:10 +01:00
Kiril Videlov
3033c7e7f5
order branch listing by last modified
also fixes an error in last modified computation
2024-07-28 19:35:54 +02:00
Pavel Laptev
701bcc2719
tokens update (#4512) 2024-07-27 23:26:37 +02:00
Pavel Laptev
c70d837e02
update dark more illustration token (#4511) 2024-07-27 22:48:50 +02:00
Kiril Videlov
a7579915f7
rename Trunk to Target in the UI
As it is more descriptive what it is. Added a tooltip for a good measure
2024-07-27 19:26:45 +02:00
Nico Domino
1ced81fd06
fix: cleanup repo organisation (#4503) 2024-07-27 13:29:32 +02:00
Kiril Videlov
19cf35698a
fix lint 2024-07-27 11:32:55 +02:00
Kiril Videlov
c7a8ef99c8
branch listing - allow filtering
fix matching
2024-07-26 15:00:08 +02:00
Mattias Granlund
3629c45997 Add file count to metrics collection 2024-07-27 10:28:40 +02:00
Mattias Granlund
7897e5703b Prevent including background in text selection 2024-07-27 10:18:54 +02:00
Pavel Laptev
b29229f3b6
commits-section-buttons (#4498)
* Added push button

* `integrate commits` wip

* CSS for sticky buttons

* update interaction observer + revert line group changes

* fix border bottom if there are no remote commits

* fix interaction observer

* remove unused components

* Fix line drawing with the new push buttons

---------

Co-authored-by: Caleb Owens <caleb@gitbutler.com>
2024-07-27 00:47:02 +02:00
Pavel Laptev
7a3a9148cb merge conflict resolve 2024-07-26 12:29:27 +02:00
Nico Domino
8ccdb8f578
fix: cleanup gitbutler/web package name (#4496) 2024-07-26 10:23:31 +00:00
Scott Chacon
7969e4bc93 has isnt a thing 2024-07-26 09:45:18 +02:00
Kiril Videlov
bccf17da89
fix camel casing in typescript 2024-07-25 21:05:35 +02:00
Kiril Videlov
7e660782ad
update docs 2024-07-25 21:03:28 +02:00
Kiril Videlov
abde2a03b6
fix merge conflict oopsie 2024-07-25 20:27:03 +02:00
Nico Domino
5f7a67f271
fix: update web env file (#4495) 2024-07-25 15:58:56 +00:00
Nico Domino
bce53ba383
feat: move @gitbutler/cloud into monorepo (#4494) 2024-07-25 15:53:28 +00:00