gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-03 03:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,755 Commits 147 Branches 1,033 Tags 66 MiB
3117769556
Commit Graph

406 Commits

Author SHA1 Message Date
Mattias Granlund
69a69788fb Create account link component and style it according to design 2023-11-26 11:54:15 +00:00
Mattias Granlund
032386e3cb Fix casing inconsistency in css tokens 2023-11-26 11:52:32 +00:00
Mattias Granlund
b23e5c1178 style: update loading state and styling for merge button 2023-11-26 11:51:27 +00:00
Mattias Granlund
58e4869998 Fix focus related bug in segmented control 2023-11-26 11:05:08 +00:00
PavelLaptev
d2f8610fb2 new icons 2023-11-26 03:29:22 +01:00
PavelLaptev
b198c64cab tokens update 2023-11-26 03:25:40 +01:00
Mattias Granlund
01efef77e0 Make segment controls equal width 2023-11-25 13:44:17 +00:00
Mattias Granlund
370b8f589b Update IconButton to reflect design 2023-11-25 13:41:39 +00:00
Mattias Granlund
cf3600a3f7 Auto close project selector 2023-11-25 12:24:43 +00:00
Mattias Granlund
d9f6249a55 Add branch filtering to sidebar 2023-11-25 12:23:14 +00:00
PavelLaptev
3687cf2d40 - updated sidebar paddings. Changed 16 to 12 spacers 2023-11-25 02:27:48 +01:00
PavelLaptev
a547df9b76 dark theme update 2023-11-25 02:09:51 +01:00
PavelLaptev
d398fa3d66 added new color tokens for accent outlines 2023-11-25 01:57:10 +01:00
PavelLaptev
4f7b8d68c3 styles updates 2023-11-25 00:48:46 +01:00
PavelLaptev
aa39b2c336 new profile icon 2023-11-24 16:00:58 +01:00
PavelLaptev
1c79b0cc73 busy icon added 2023-11-24 15:06:26 +01:00
PavelLaptev
ec588fef56 new-icons 2023-11-24 15:00:24 +01:00
Mattias Granlund
a5371f9bb1 Improve app drag region 2023-11-24 12:59:19 +00:00
Mattias Granlund
94e2ce108a Fix assignment bug in projects service 2023-11-24 12:51:14 +00:00
Nikita Galaiko
ccc7405aa7
Merge pull request #1706 from gitbutlerapp/refactor-menu-subscribe 
Refactor menu subscribe
 2023-11-24 12:20:21 +01:00
PavelLaptev
44a032f492 merged upstream 2023-11-24 12:16:26 +01:00
Nikita Galaiko
b5712d0b00 chore: refactor menu subscription and event handling in components 2023-11-24 12:15:42 +01:00
PavelLaptev
f3068781b8 code review fixes 2023-11-24 12:13:45 +01:00
Mattias Granlund
d477c26930 Fix issue with saving project settings 2023-11-24 09:19:38 +00:00
PavelLaptev
b80f4b48de styles update 2023-11-24 00:53:23 +01:00
PavelLaptev
a62cd070c4 refresh icon style update 2023-11-23 22:26:31 +01:00
PavelLaptev
7f2a392396 some css fixes 2023-11-23 21:28:51 +01:00
Mattias Granlund
75746a4407 Don't show stashed branches if empty 2023-11-23 17:50:11 +00:00
Mattias Granlund
410e92d4e8 Allow collapsing of branch list as well 2023-11-23 17:44:03 +00:00
Mattias Granlund
08090c496e Make resizing better for sidebar and lanes 2023-11-23 15:21:02 +00:00
Nikita Galaiko
c6f9c35bbb
Merge pull request #1695 from gitbutlerapp/add-project-menu 
Add project menu
 2023-11-23 13:23:05 +01:00
Nikita Galaiko
8e0b0a6bad refactor project menu 2023-11-23 12:58:15 +01:00
Mattias Granlund
acd41586d5 Remove border from purple button 2023-11-23 11:00:59 +00:00
Mattias Granlund
59b39a9c84 Remove unused pr and remote branches components 2023-11-23 11:00:40 +00:00
Mattias Granlund
bf58208b7e Rewrite branches component styles from tailwind to regular css 2023-11-23 10:59:53 +00:00
Mattias Granlund
d5840959be Revert "Add inter font through Google Fonts" 
This reverts commit d98623fc43.
 2023-11-23 09:41:39 +00:00
Mattias Granlund
43a3a8b71e Fix color on project dropdown component 2023-11-22 23:36:16 +00:00
Mattias Granlund
d98623fc43 Add inter font through Google Fonts 
We should perhaps bundle this?
 2023-11-22 23:07:22 +00:00
Mattias Granlund
fe5595b59f Make project selector look like design 2023-11-22 23:06:49 +00:00
Mattias Granlund
63f50f5cf4 Increase tooltip timeout to 2.5s 2023-11-22 22:07:30 +00:00
Mattias Granlund
69bf23fd0b Start both remote branches and prs with empty array 
In the future we should figure out a way of keeping the stream undefined until either has emitted.
 2023-11-22 22:07:09 +00:00
Mattias Granlund
db94da1184 Use correct style tag in some components 2023-11-22 22:06:59 +00:00
Mattias Granlund
4d6088880b chore: update spacing and radius variables in CSS file 
The spacing and radius variables in the CSS file were updated to use relative units (rem) instead of fixed pixel values. This allows for better responsiveness and flexibility in the design.
 2023-11-22 21:52:33 +00:00
Mattias Granlund
cdb7d12fe6 Fix error 
This section was meant to be included in the previous commit.
 2023-11-22 21:02:10 +00:00
Mattias Granlund
5fd83e2461 Force collapse stashed branches when empty 2023-11-22 21:02:10 +00:00
Mattias Granlund
e1402b7178 Show correct number of stashed branches 2023-11-22 21:02:10 +00:00
Mattias Granlund
41a91a5823 Show time ago in loading indicator 2023-11-22 21:01:50 +00:00
Mattias Granlund
eb98425231 Allow modern javascript 
Needed for e.g. [].slice()
 2023-11-22 20:49:58 +00:00
Kiril Videlov
db46907fb0 feat: add menu action to navigate to project settings page; introduces the notion of 'current project'; the app now starts with the last current project 2023-11-22 19:13:03 +01:00
Mattias Granlund
2cefd8493c Update sidebar header to match design 2023-11-22 17:36:54 +00:00
Mattias Granlund
ad4544674b Rename "your branches" to "stashed branches" 2023-11-22 16:08:52 +00:00
Mattias Granlund
4c8c0d9bb2 Fix tooltip inconsistencies with design 2023-11-22 16:01:00 +00:00
Mattias Granlund
23eade8d53 Improve project selector styles 2023-11-22 15:42:34 +00:00
Mattias Granlund
e27c7ab289 chore: refactor tooltip component in Svelte 
- Removed arrow middleware from floating actions.
- Updated the styles for the tooltip component
 2023-11-22 15:25:41 +00:00
Mattias Granlund
e59cc2a39a Rename store.ts -> service.ts 
- reflects the class name
 2023-11-22 15:18:49 +00:00
Mattias Granlund
ca6e8f6597 Rename folder 
- renames remotecontributions -> branches
 2023-11-22 15:18:49 +00:00
Mattias Granlund
511abc951c chore: update font-weight for text classes 
The font-weight property for the text classes has been updated to 500 to improve readability and consistency across the application.
 2023-11-22 15:17:13 +00:00
Mattias Granlund
254c5084b7 Use login instead of name field for pr author 2023-11-22 14:02:57 +00:00
Mattias Granlund
829390ee73 Fix lint errors 2023-11-22 12:55:04 +00:00
Mattias Granlund
af9ea08dc6 Start implementing new sidebar 
- big commit, but still work in progress
 2023-11-22 12:55:04 +00:00
dependabot[bot]
0760d602e9 chore(deps-dev): bump nanoid from 5.0.1 to 5.0.3 
Bumps [nanoid](https://github.com/ai/nanoid) from 5.0.1 to 5.0.3.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/5.0.1...5.0.3)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 13:28:00 +00:00
dependabot[bot]
60fc4981a7 chore(deps-dev): bump eslint from 8.53.0 to 8.54.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.53.0...v8.54.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 13:27:51 +00:00
dependabot[bot]
6446d7819e chore(deps-dev): bump marked from 9.1.4 to 10.0.0 
Bumps [marked](https://github.com/markedjs/marked) from 9.1.4 to 10.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.1.4...v10.0.0)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 13:27:43 +00:00
dependabot[bot]
6ff68603d2 chore(deps-dev): bump vitest from 0.34.3 to 0.34.6 
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 0.34.3 to 0.34.6.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.34.6/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 11:03:31 +00:00
Mattias Granlund
c2e6c89819 Replace a few icons with new JSON version 
Testing out icons provided in JSON format by pavel.
 2023-11-20 13:42:08 +00:00
Mattias Granlund
fef8c0fce8 Align push button a bit better 2023-11-20 12:54:28 +00:00
Mattias Granlund
692e69941c Make commit card truncate commit message correctly 2023-11-20 12:54:28 +00:00
Mattias Granlund
a364fc9341 Use reactive variables for page data 
We need to use reactive variables for page data, otherwise they
do not trigger recalculation on navigation.
 2023-11-20 10:32:04 +00:00
Mattias Granlund
74a28e166a Move settings and change vbranch label 2023-11-17 14:33:38 +00:00
Mattias Granlund
bbcb5c12ca Prevent default on update and refresh 2023-11-17 14:16:29 +00:00
Mattias Granlund
6fb83315a6 Moving a bit towards Pavel's unfinished nav design 2023-11-17 14:11:47 +00:00
Nikita Galaiko
12ca8f9abd fix add project 2023-11-17 14:57:01 +01:00
Nikita Galaiko
643c78270d
Merge pull request #1630 from gitbutlerapp/remove-bookmark-related-code 
Remove bookmark related code
 2023-11-17 12:53:39 +01:00
Mattias Granlund
11957bfc42 Fixes glitches in user login management 
We can't use a behaviour subject for the reset observable, it creates a race
condition between user$ and reset$ observables.
 2023-11-17 11:42:36 +00:00
Nikita Galaiko
e874d6ce6f chore: remove unused bookmark functionality and related code 2023-11-17 12:32:20 +01:00
Kiril Videlov
886669ce4d delete dead code 2023-11-17 11:26:12 +01:00
Mattias Granlund
17eae088d5 Fix css for project selection page. 2023-11-17 09:31:13 +00:00
Mattias Granlund
09cce30cbe Remove the flicker of base branch select 2023-11-16 16:01:10 +00:00
Mattias Granlund
176372758d Upgrade prettier and use common path + config 2023-11-16 15:53:17 +00:00
Mattias Granlund
3bd4f26f09 Fix accidental logouts 
This was introduced in the big observable refactor.
 2023-11-16 15:14:10 +00:00
Mattias Granlund
92893d4b14 Remove console.log and fix lint error 2023-11-16 15:00:00 +00:00
Mattias Granlund
d37daed784 Subscribe to branches using new API 
This completely removes the need for the delta service, and simplifies the vbranch service.
 2023-11-16 14:54:31 +00:00
Kiril Videlov
d7306d4cd9 feat: add event emission for virtual branches after certain actions to keep UI in sync 2023-11-16 12:30:28 +01:00
Mattias Granlund
eda172ac19 Fixes broken project settings page 2023-11-16 11:27:02 +00:00
Mattias Granlund
d5f9216956 Fixes github login 2023-11-16 10:58:16 +00:00
Mattias Granlund
3e76504ded A few more fixes to the observable streams 2023-11-16 10:49:08 +00:00
Mattias Granlund
52a028440f Fix reactive variables to make project navigation work 2023-11-16 10:22:37 +00:00
dependabot[bot]
61eb145215 chore(deps-dev): bump eslint-plugin-import from 2.28.1 to 2.29.0 
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:58 +00:00
dependabot[bot]
d74607321c chore(deps-dev): bump eslint-plugin-svelte from 2.33.1 to 2.35.0 
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) from 2.33.1 to 2.35.0.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.33.1...v2.35.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:51 +00:00
dependabot[bot]
35017d4233 chore(deps-dev): bump @types/diff-match-patch from 1.0.34 to 1.0.36 
Bumps [@types/diff-match-patch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff-match-patch) from 1.0.34 to 1.0.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff-match-patch)

---
updated-dependencies:
- dependency-name: "@types/diff-match-patch"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:43 +00:00
dependabot[bot]
01884b2541 chore(deps-dev): bump @sveltejs/kit from 1.27.3 to 1.27.5 
Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) from 1.27.3 to 1.27.5.
- [Release notes](https://github.com/sveltejs/kit/releases)
- [Changelog](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.27.5/packages/kit)

---
updated-dependencies:
- dependency-name: "@sveltejs/kit"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:33 +00:00
Mattias Granlund
a8c2fb6884 Fixes user login that broke in previous commit 2023-11-16 10:06:01 +00:00
Mattias Granlund
e243b4d9ff Replace most stores with observables 
Heads up, this is a massive commit touching at least 50-60 files. We want to
remove square/svelte-store completely, and we're almost there.

In this commit we also drop the /old/ code.
 2023-11-16 09:28:07 +00:00
Nikita Galaiko
6bf22e4e93 fix branch reorder 2023-11-15 11:55:30 +01:00
Nikita Galaiko
e24ebcdbab set default path to homedir 2023-11-14 18:02:26 +01:00
Mattias Granlund
ed7410e186 Fixing some container and theme stuff for PR list/page 2023-11-13 19:01:37 +00:00
Mattias Granlund
ca21e879ac Use observable suffix in pr component 2023-11-13 18:22:12 +00:00
Mattias Granlund
e62157646f Add error handling to PR service 2023-11-13 15:44:20 +00:00
Mattias Granlund
3e162e645c Add service for pull requests 2023-11-13 15:44:20 +00:00
Mattias Granlund
dbfff1e52f Make remote contributions code a bit more succinct 2023-11-13 15:44:20 +00:00