gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 00:21:35 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,430 Commits 157 Branches 1,064 Tags 61 MiB
03247b7e22
Commit Graph

890 Commits

Author SHA1 Message Date
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
942baa44d2 fix reset font-weight 2024-07-31 11:45:06 +02:00
Pavel Laptev
9f2cc1cfbd deletion lines highlight color update 2024-07-31 11:23:11 +02:00
Pavel Laptev
73b2d3c045 bump the contrast for the added lines text 2024-07-31 11:18:12 +02: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
Caleb Owens
142798383f Merged origin/master into sidebar-branches 2024-07-30 17:11:00 +02:00
Pavel Laptev
6194a58f5b
segment control added (#4544) 2024-07-30 17:08:02 +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
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
Nico Domino
852522dcc0
fix: skip turbo in init-node-env (#4537) 2024-07-30 08:03:47 +00: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
Nico Domino
44a08d4645
fix: run @gitbutler/ui package steps sequentially (#4526) 2024-07-29 12:36:03 +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
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
Nico Domino
1ced81fd06
fix: cleanup repo organisation (#4503) 2024-07-27 13:29:32 +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
becfd09520 segment control updates 2024-07-23 16:23:55 +02:00
Pavel Laptev
1f656d8f8c remove old component, component name changed 2024-07-23 16:17:49 +02:00
Pavel Laptev
7caf2715d1 new segmented controller component 2024-07-23 16:13:10 +02:00
Pavel Laptev
2c78ad3ece merge upstream 2024-07-23 12:30:36 +02:00
Pavel Laptev
eccb896c6d
Use UI package functions instead of app utility functions (#4471) 
* replace `pxToRem`

* replace `tooltip` and `typeguards`

* replace `tooltip`

* `Actions` updated

* draggable.ts update
 2024-07-23 12:15:05 +02:00
Pavel Laptev
ea17f3ace4 avatars component updated 2024-07-23 01:12:19 +02:00
Pavel Laptev
c364d6e901 Groups and search functionality added 2024-07-23 00:54:27 +02:00
Nico Domino
ab5af61960
feat: use pnpm@9.5.0 catalogs feature to keep versions in sync within monorepo (#4411) 2024-07-17 10:48:51 +02:00
Caleb Owens
d203ed897c
Fix everything runes runed 2024-07-16 18:25:16 +02:00
Caleb Owens
09344ee8d1
Fixed logic for removing the ghost line 2024-07-15 17:34:30 +02:00
Nico Domino
db28854983
fix: commit avatar loading improvement (#4335) 2024-07-11 17:46:04 +02:00
Nico Domino
e2441ee8df
fix: gitbutler/ui hot reload (#4333) 2024-07-11 15:13:21 +02:00
Caleb Owens
6bb57466e8
Update to non-relative imports 2024-07-02 14:47:27 +02:00
Caleb Owens
6f0e3dca39
Updated broken imports 2024-07-02 13:16:26 +02:00
Caleb Owens
4d29cd0723
Get things working a little tiny bit more 2024-07-01 21:09:10 +02:00
ndom91
b1b390ce72
fix: ui export map 2024-07-01 18:58:40 +02:00
ndom91
74383ba239
fix: prettier 2024-07-01 18:48:22 +02:00
ndom91
b46c2c4d5b
feat: add initial turbo cli 2024-07-01 18:47:43 +02:00
ndom91
b8e51eeeee
fix: ui export map 2024-07-01 13:53:05 +02:00
ndom91
911c2230c9
fix: fix test import paths 2024-07-01 13:37:52 +02:00
ndom91
cdc4359003
fix: prettier ui/package.json 2024-07-01 13:34:20 +02:00
ndom91
f0ae83fda5
fix: move CommitLines dir and update export map 2024-07-01 13:04:47 +02:00
ndom91
5b9991b93c
fix: types in ui package 2024-06-28 13:39:06 +02:00
ndom91
836b86a753
Merge branch 'master' into ndom91/create-gitbutler-ui-package 2024-06-28 12:50:44 +02:00
ndom91
e8c36f10db
fix: cleanup ui vite config 2024-06-28 12:41:18 +02:00
ndom91
7e8ebdab76
fix: move globals dep to root 2024-06-28 11:57:16 +02:00
ndom91
e84946d9b5
fix: move eslint/prettier config to root 2024-06-28 11:40:36 +02:00
ndom91
25068de8bb
fix: move eslint/prettier to root only 2024-06-28 11:34:54 +02:00
ndom91
7b073c536b
fix: prettier 2024-06-27 16:45:47 +02:00
ndom91
bd55e22df3
fix: export map config 2024-06-27 16:42:22 +02:00
ndom91
7e75780b1a
fix: commitList path 2024-06-27 16:37:54 +02:00
ndom91
89a12044c3
fix: rename ui CommitLines dir 2024-06-27 16:23:00 +02:00
ndom91
f3e79e85c8
fix: add storybook eslint-config 2024-06-27 14:27:45 +02:00
ndom91
a93cd3ceb7
fix: cleanup dependencnies in app and ui 2024-06-27 14:26:56 +02:00
ndom91
2eeb93b81f
feat: add consumption of @gitbutler/ui pkg 2024-06-27 11:39:48 +02:00
ndom91
772f235f07
fix: mv ui package to packages/ 2024-06-26 18:03:55 +02:00
Josh Junon
c5c51c9254 move packages/* into root as crates 2023-12-22 14:20:02 +01:00
Kiril Videlov
8376b737e4 🔨 chore: update loading status tooltip layout in the UI 2023-12-22 14:15:40 +01:00
Mattias Granlund
3d78f1e88c chore: remove console.log statement in updateResizable function 2023-12-22 14:06:00 +01:00
Mattias Granlund
ec3e6b2816 Fix occasionally hidden commit dialog 2023-12-22 14:03:25 +01:00
Kiril Videlov
7357b3f31e 🚀 feat: add support for running commit hooks during branch commit 2023-12-22 13:48:14 +01:00
Pavel Laptev
735cab3ef2 chore: update SVG icons 
The SVG icons in the code have been updated to match the latest design specifications.
 2023-12-22 11:38:37 +01:00
Pavel Laptev
50dcefdbd1 chore: update color variables 2023-12-22 11:35:00 +01:00
Mattias Granlund
5dfcf6182a Add apdding to empty branch messages 
- also refactors how to display border when scrollable container is scrolled
 2023-12-22 10:53:20 +01:00
Pavel Laptev
071044fd4d chore: update styling for indeterminate checkbox and remove unused test code 2023-12-22 10:41:39 +01:00
Nikita Galaiko
c290a294a8
Merge pull request #2119 from gitbutlerapp/update-dev-dependencies 
Update dev dependencies
 2023-12-22 08:46:24 +01:00
Nikita Galaiko
624451edc3 rm extra lock file 2023-12-22 08:44:59 +01:00
Mattias Granlund
4005f6d06f Add timeouts to prevent createPr() taking forever 2023-12-21 18:38:31 +01:00
Mattias Granlund
96c3696281 Retry creating PR when it fails 
- happens if request comes too qucikly after pushing
 2023-12-20 17:13:38 +01:00
Pavel Laptev
83726040c1 chore: remove unused code for info-message 2023-12-20 11:22:14 +01:00
Kiril Videlov
e055bd9d25 🔨 chore: update file title in header to be reactive 2023-12-19 21:38:04 +01:00
Mattias Granlund
6eebffabd2 Fix tree list partial commit checkboxes 2023-12-19 15:49:05 +01:00
Mattias Granlund
8e2f2d331f refactor: rename subscribe function to subscribeToFetches for clarity and consistency 2023-12-19 15:36:22 +01:00
Mattias Granlund
b73ccf8251 Style indeterminate checkboxes 2023-12-19 15:28:53 +01:00
Mattias Granlund
c0b56655ee feat: add overflow-x hidden and text-overflow ellipsis to name in btn class to prevent text overflow 2023-12-19 12:00:08 +01:00
Mattias Granlund
ca0689557c Bring back partial commits 
- functional but needs refactor and design
 2023-12-19 11:18:55 +01:00
Mattias Granlund
2cb56b97bb fix observable mistake that leads to mutiple loads 2023-12-18 20:41:58 +01:00
Mattias Granlund
03362851d7 Fix more text clipping problems 
- in some places we need to use e.g. text-base-body-11 instead of text-base-11
 2023-12-18 20:29:18 +01:00
dependabot[bot]
cc42b4f0bd Bump @typescript-eslint/parser from 6.9.0 to 6.14.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.9.0 to 6.14.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 20:13:34 +01:00
dependabot[bot]
f20729a8c2 chore(deps-dev): bump @codemirror/lang-markdown from 6.2.1 to 6.2.3 
Bumps [@codemirror/lang-markdown](https://github.com/codemirror/lang-markdown) from 6.2.1 to 6.2.3.
- [Changelog](https://github.com/codemirror/lang-markdown/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-markdown/compare/6.2.1...6.2.3)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-markdown"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 20:13:20 +01:00
dependabot[bot]
5f8ad2c1c5 chore(deps-dev): bump @lezer/highlight from 1.1.6 to 1.2.0 
Bumps [@lezer/highlight](https://github.com/lezer-parser/highlight) from 1.1.6 to 1.2.0.
- [Changelog](https://github.com/lezer-parser/highlight/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lezer-parser/highlight/compare/1.1.6...1.2.0)

---
updated-dependencies:
- dependency-name: "@lezer/highlight"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 20:13:11 +01:00
Mattias Granlund
2dad3f2593 chore: update interval for checking updates to every 6 hours instead of every 12 hours 2023-12-18 20:11:11 +01:00
Mattias Granlund
a3c3141782 fix: set explicit branches sidebar height when none found in storage 
- to prevent content shifting when filters are applied/unapplied
 2023-12-18 17:26:59 +01:00
Pavel Laptev
f8a8a2f262 feat: improve commit message generation and focus textarea on mount and on focus 2023-12-18 12:38:05 +01:00
Pavel Laptev
c36033feb8 removed unused import 2023-12-17 11:46:23 +01:00
Pavel Laptev
7cf61d7cf4 updated commit box css and animation 2023-12-17 11:44:17 +01:00
Pavel Laptev
5f4b47182e Updated event type 2023-12-17 02:44:38 +01:00
Pavel Laptev
b547bbf4ef UX updates 
- removed full label select on double click
- text area styling changes
- text area auto height hook added
 2023-12-17 02:39:22 +01:00
Pavel Laptev
17eb806354 updated commit box animation speed 2023-12-17 01:03:01 +01:00
Pavel Laptev
33f9e54b74 Commit box animation updated 2023-12-17 00:23:16 +01:00
Mattias Granlund
8f0c393ceb Fix variable declaration mistake in github service 2023-12-16 21:00:35 +00:00
Mattias Granlund
8b4d3c9791 Add busy indicator while waiting for addProject 
- the plus icon turns into a spinner
 2023-12-16 20:59:53 +00:00
Mattias Granlund
55a3bd1951 Refactor and remove use of GitHubIntegrationContext 2023-12-16 19:48:51 +00:00
Mattias Granlund
a99694e670 Rename PrService -> GitHubService 2023-12-16 19:48:51 +00:00
Mattias Granlund
6d9b8828d0 Integrate github context object into PrService 2023-12-16 19:48:51 +00:00
Mattias Granlund
5d404c937b Rename pullrequests.ts -> service.ts 2023-12-16 19:48:51 +00:00
Pavel Laptev
403c255dde minor css updates 2023-12-16 16:40:58 +01:00
Pavel Laptev
dbb6154a76 Titles styles updated. Badge style updated 2023-12-16 16:27:50 +01:00
Pavel Laptev
76b26a27bb branch remote name styles 2023-12-16 15:56:06 +01:00
Mattias Granlund
34239d7097 Fix background color of commit box in dark mode 2023-12-16 12:46:37 +00:00
Mattias Granlund
ac46104ca0 Implement new commit box design 2023-12-16 12:37:14 +00:00
Mattias Granlund
eada859f6f Bundle css into js for posthog 
- should fix rendering of navbar in session recordings
- tested using Dev build, let's see what happens
 2023-12-16 10:43:39 +00:00
Pavel Laptev
9779a8d970
Merge pull request #2066 from gitbutlerapp/hunk-focus-state-update 
Hunk focus state update
 2023-12-15 15:41:33 +01:00
Mattias Granlund
1f5dfd4c68 Fix commit card connecting line when resizing 2023-12-15 14:40:50 +00:00
Pavel Laptev
f55ab7451b style: update hunk scrollbar styling and add transition for border color 2023-12-15 15:39:38 +01:00
Mattias Granlund
42d747e058 Require focus before horizontal hunk scroll 2023-12-15 14:33:34 +00:00
Pavel Laptev
257d61bec8
Merge pull request #2062 from gitbutlerapp/new-icon-ai-small 
new icon "ai-small"
 2023-12-15 14:08:16 +01:00
Mattias Granlund
cd0e209f12 feat: add remote branch display in branch card header 
The changes in this commit add the ability to display the name of the remote branch in the branch card header. This provides better visibility and context for users when working with branches.
 2023-12-15 12:58:53 +00:00
Pavel Laptev
73d171eafd chore: new ai icon 2023-12-15 13:56:42 +01:00
Pavel Laptev
c955f1f417 updated space between branches 2023-12-15 13:06:51 +01:00
Kiril Videlov
94f476eeb7 🔧 fix: improve UI text and options for Git authentication configuration 2023-12-15 12:02:27 +01:00
Mattias Granlund
eb6f224949 Fix generate message button 
- regressed when removing square/svelte-store
 2023-12-15 10:58:51 +00:00
Nikita Galaiko
5646580183
Merge pull request #2052 from gitbutlerapp/create-virtual-branch-from-branch 
Create virtual branch from branch
 2023-12-15 10:54:55 +01:00
Nikita Galaiko
135b78a2bf use vbranch time over remote branch time 2023-12-15 10:46:36 +01:00
Kiril Videlov
0938c82793 🐛 fix: prevent duplicate authors from being added when remoteBranch is present but pr is not 2023-12-15 10:43:52 +01:00
Mattias Granlund
0d008ff74b Prevent branch list item overflow 
- truncate long name field with ellipsis
 2023-12-15 09:43:38 +00:00
Mattias Granlund
183e044700 Fix lint errors required by new version of prettier 2023-12-14 17:02:11 +00:00
Mattias Granlund
19a27b0712 chore: update posthog-js to version 1.95.1 and prettier to version 3.1.1 2023-12-14 17:02:11 +00:00
Mattias Granlund
53dba74be8 Filter out remote branches that aren't ahead 2023-12-14 15:24:51 +00:00
Mattias Granlund
0503c803e8 style: add padding to empty message in project list 2023-12-14 15:19:30 +00:00
Nikita Galaiko
4ddc970747 feat: add support for default and git credentials helper as preferred SSH key options in the UI 2023-12-14 15:22:00 +01:00
Mattias Granlund
31802477eb Fix project selection bug 
- branches in branch list were not being updated
 2023-12-14 12:04:34 +00:00
Mattias Granlund
072721c034 style: update width and min-width of .hunk__inner_inner class to ensure proper layout on different screen sizes 2023-12-14 11:20:08 +00:00
Mattias Granlund
35b02d7e5f Hide pr filter if not signed into github 2023-12-14 10:51:52 +00:00
Mattias Granlund
b031c50989 Fix hunk dragging style bug 
- draggable elements need unstyeld containers
 2023-12-14 10:41:06 +00:00
Mattias Granlund
bd2beac459 Fix hunk menu by using new context menu 2023-12-14 10:01:08 +00:00
Nikita Galaiko
845f9c3862
Merge pull request #2036 from gitbutlerapp/update-modifiedat-and-updated-at 
Update modifiedat and updated_at
 2023-12-14 09:43:35 +01:00
Nikita Galaiko
3b86f4cf05 updatedTimestampMs => updatedAt 2023-12-14 09:38:53 +01:00
Mattias Granlund
d320beec33 Allow row click in branch filter 2023-12-13 23:38:55 +00:00
Mattias Granlund
2ef023d4f6 Fix branch deletion 
- modal disappeared after menu auto closes
 2023-12-13 23:28:17 +00:00
Mattias Granlund
0df859366c Show filtered branch count in sidebar rather than total 2023-12-13 23:23:27 +00:00
Mattias Granlund
ecf229a018 Get rid of square/svelte-store 
- rewrite simplified version of persisted store
- replace all usages with new version
- convert updater store to AppUpdate
 2023-12-13 23:08:55 +00:00
Pavel Laptev
522e0546f5 Filter popup menu checkbox and toggle size updated 2023-12-13 20:59:01 +01:00
Kiril Videlov
e3c257cb26 🔧 fix: disable action button when branch has no files or is not active 2023-12-13 20:41:32 +01:00
Kiril Videlov
69e15844d9 🔨 chore: add check to prevent reloading when inactive 2023-12-13 19:25:57 +01:00
Mattias Granlund
26eafe27ae Move spacer component to $lib 2023-12-13 16:10:16 +00:00
Mattias Granlund
c3257691b9
Fix branch filtering 2023-12-13 16:09:58 +00:00
Mattias Granlund
be94eb6350 fix: update condition for hiding bots in branch filtering 2023-12-13 15:49:03 +00:00
Nikita Galaiko
38a733f1ca use backend branch update time 2023-12-13 16:42:28 +01:00
Mattias Granlund
82b861758c Fix branch lane context menu 
- made it unclickable by mistake
 2023-12-13 15:10:42 +00:00
Mattias Granlund
dc6f23ccd3 Fix default state for filters 
- do not show little dot when checkboxes are checked, toggles are off
 2023-12-13 14:18:01 +00:00
Mattias Granlund
81c008c6e2 chore: remove console.log statement 2023-12-13 14:14:38 +00:00
Mattias Granlund
d60860267d feat: optimize update checking by reloading update store every 12 hours 2023-12-13 14:14:15 +00:00
Mattias Granlund
c23d1eb7e3 Refactor branch filter and apply new design 
- add toggle for hiding inactive
- choices persisted in localStorage
 2023-12-13 13:33:10 +00:00
Nikita Galaiko
483230b5c1
Merge pull request #2018 from gitbutlerapp/add-test-for-diff-correct-after-update 
Add test for diff correct after update
 2023-12-13 14:04:44 +01:00
Nikita Galaiko
fe1662d58a use target fetchedat time from backend 2023-12-13 13:50:29 +01:00
Nikita Galaiko
8d6827d784 do not show "Open" link for remote commits 2023-12-13 09:33:11 +01:00