gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,871 Commits 148 Branches 1,032 Tags 66 MiB
04afdc47e0
Commit Graph

938 Commits

Author SHA1 Message Date
Mattias Granlund
d477c26930 Fix issue with saving project settings 2023-11-24 09:19:38 +00:00
Nikita Galaiko
07a2d01e83 filter pushable references by type 2023-11-24 10:03:04 +01:00
Nikita Galaiko
c58298f48f support stash ref 2023-11-24 09:56:42 +01:00
Nikita Galaiko
586a9fa336
Merge pull request #1703 from gitbutlerapp/support-tag-refnames 
support tag refnames
 2023-11-24 09:50:27 +01:00
Nikita Galaiko
60ddc66e84
Merge pull request #1702 from gitbutlerapp/drop-cranky 
drop cranky
 2023-11-24 09:38:57 +01:00
Nikita Galaiko
8defd6e42b support tag refnames 2023-11-24 09:38:50 +01:00
Nikita Galaiko
ee53b09a61 replace cranky with new clippy 2023-11-24 09:03:04 +01: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
b36fdc068a refactor: update log message for project batch pushed to include current and total count 2023-11-23 15:04:53 +01:00
Nikita Galaiko
b038b630ad fix rebasing after squashing 2023-11-23 14:15:52 +01:00
Nikita Galaiko
2b7f0535cc feat: add functionality to update commit message in repository 2023-11-23 14:08:40 +01: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
Kiril Videlov
0893441379 chore: fix inconsistency in menu item ID for project settings 2023-11-22 22:12:56 +01: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
e80f806ff4 fix: update set_current_project function to properly handle user and project ID updates 2023-11-22 20:04:20 +01: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
Nikita Galaiko
c62adb4531 handle git network errors 2023-11-22 15:05:06 +01:00
Nikita Galaiko
47ce0c49e8
Merge pull request #1669 from gitbutlerapp/virtual-branch 
Virtual branch
 2023-11-22 15:03:33 +01:00
Mattias Granlund
254c5084b7 Use login instead of name field for pr author 2023-11-22 14:02:57 +00:00
Nikita Galaiko
104a401400 refactor: change debug log to info log for project push status 2023-11-22 14:22:27 +01:00
Nikita Galaiko
b4f67aaa7a
Merge pull request #1664 from gitbutlerapp/all-refs 
Just push all refs
 2023-11-22 14:08:15 +01: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
Nikita Galaiko
3e08e60bf1 set actual time 2023-11-22 13:46:42 +01:00
Nikita Galaiko
78d2944476 push default_target, not head 2023-11-22 13:38:44 +01:00
Nikita Galaiko
9e7a6379fe use refname where possible 2023-11-22 12:20:07 +01:00
Nikita Galaiko
229745b721 rename branch to refname 2023-11-22 10:33:31 +01:00
Nikita Galaiko
af9b9c465b categorize git network error 2023-11-22 09:29:12 +01:00
Scott Chacon
65928d78b8 just push all refs 2023-11-21 15:18:10 -08:00
Nikita Galaiko
372f60189b
Merge pull request #1663 from gitbutlerapp/delete-empty-branches 
delete empty branches
 2023-11-21 14:36:43 +01:00
Nikita Galaiko
43fda60c25 on unapply, delete empty branches 2023-11-21 14:29:58 +01: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
Nikita Galaiko
6b14c71ed2
Merge pull request #1660 from gitbutlerapp/fix-repo-usage 
fix repo usage
 2023-11-21 14:00:05 +01:00
Nikita Galaiko
8b730cc267 always call odb create 2023-11-21 13:51:37 +01:00
Nikita Galaiko
0eac6f96be make sure to use project repo 2023-11-21 13:51:18 +01:00
Nikita Galaiko
7c4af4e86a
Merge pull request #1647 from gitbutlerapp/dependabot/cargo/tracing-0.1.40 
chore(deps): bump tracing from 0.1.37 to 0.1.40
 2023-11-21 13:16:44 +01:00
Nikita Galaiko
fe1b12b3f7
Merge pull request #1648 from gitbutlerapp/dependabot/cargo/bstr-1.8.0 
chore(deps): bump bstr from 1.7.0 to 1.8.0
 2023-11-21 13:16:38 +01:00
dependabot[bot]
07b9189b8c
chore(deps): bump tracing from 0.1.37 to 0.1.40 
Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.37 to 0.1.40.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.37...tracing-0.1.40)

---
updated-dependencies:
- dependency-name: tracing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 12:01:09 +00:00
Nikita Galaiko
21a22ed4a4
Merge pull request #1650 from gitbutlerapp/dependabot/cargo/slug-0.1.5 
chore(deps): bump slug from 0.1.4 to 0.1.5
 2023-11-21 13:00:28 +01:00
Nikita Galaiko
145a6cc12b
Merge pull request #1646 from gitbutlerapp/dependabot/cargo/uuid-1.6.1 
chore(deps): bump uuid from 1.5.0 to 1.6.1
 2023-11-21 13:00:15 +01:00
Nikita Galaiko
c900f18496
Merge pull request #1659 from gitbutlerapp/remove-git-wd-diff-function 
Remove git wd diff function
 2023-11-21 12:59:33 +01:00
Nikita Galaiko
fb469d411b rm dead code 2023-11-21 12:42:15 +01: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
Nikita Galaiko
b889bbc560
Merge pull request #1658 from gitbutlerapp/fix-vbranch-limit 
fix vbranch limit
 2023-11-21 10:21:02 +01:00
Nikita Galaiko
6ffb711710 fix: allow to send vbranches more often 2023-11-21 10:16:50 +01:00
Nikita Galaiko
282d5517db do not import gitbutler/integration 2023-11-21 10:09:21 +01:00
Nikita Galaiko
47a7c93dad make wathcher handlers async 2023-11-21 09:30:49 +01:00
dependabot[bot]
5c84add6df
chore(deps): bump slug from 0.1.4 to 0.1.5 
Bumps [slug](https://github.com/Stebalien/slug-rs) from 0.1.4 to 0.1.5.
- [Commits](https://github.com/Stebalien/slug-rs/compare/v0.1.4...v0.1.5)

---
updated-dependencies:
- dependency-name: slug
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-20 15:27:52 +00:00
dependabot[bot]
c27735d9a0
chore(deps): bump bstr from 1.7.0 to 1.8.0 
Bumps [bstr](https://github.com/BurntSushi/bstr) from 1.7.0 to 1.8.0.
- [Commits](https://github.com/BurntSushi/bstr/compare/1.7.0...1.8.0)

---
updated-dependencies:
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-20 15:26:57 +00:00
dependabot[bot]
2ca649fe3d
chore(deps): bump uuid from 1.5.0 to 1.6.1 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.5.0 to 1.6.1.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.5.0...1.6.1)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-20 15:26:07 +00:00
Nikita Galaiko
22104885b0 fix virtual branches lock 
separating controllers by project_id allows to avoid app-wide lock
 2023-11-20 16:17:22 +01:00
Nikita Galaiko
26f6aee05b
Merge pull request #1643 from gitbutlerapp/add-handler-inner 
Add handler inner
 2023-11-20 15:31:09 +01:00
Nikita Galaiko
52d34afe3f allow only one flush handler 2023-11-20 15:18:13 +01: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
Nikita Galaiko
383d5a3bb5 feat: update logging configuration to use LOG_LEVEL environment variable instead of debug feature flag 2023-11-20 09:29:45 +01:00
Kiril Videlov
6abf22089b chore: remove unused import and simplify code in project_flush_and_push function 2023-11-17 19:10:39 +01:00
Kiril Videlov
6728116d2c feat: add event posting for session and push project to Gitbutler 2023-11-17 19:10:39 +01: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
Nikita Galaiko
78494dd6e6
Merge pull request #1633 from gitbutlerapp/submodules 
submodules
 2023-11-17 15:14:10 +01:00
Mattias Granlund
6fb83315a6 Moving a bit towards Pavel's unfinished nav design 2023-11-17 14:11:47 +00:00
Nikita Galaiko
007d3783b8 ignore submodules when diffing 2023-11-17 15:09:43 +01:00
Nikita Galaiko
12ca8f9abd fix add project 2023-11-17 14:57:01 +01:00
Nikita Galaiko
e05c30ca60 add submodules tests 2023-11-17 14:47:08 +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
Nikita Galaiko
3f7cb92598 minor refactor 2023-11-17 10:24:35 +01:00
Nikita Galaiko
763d346196
Merge pull request #1611 from gitbutlerapp/sort-branches-by-order 
vbranch errors
 2023-11-17 10:15:16 +01:00
Nikita Galaiko
4aee982dfb refactor virtual branch errors 2023-11-17 09:55:47 +01: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
Kiril Videlov
964b8c361c refactor: simplify rate limiter initialization in Handler struct 2023-11-16 16:19:28 +01:00
Kiril Videlov
42652d9655 chore: refactor Handler struct initialization and add unnecessary_wraps lint allow 2023-11-16 16:19:28 +01:00
Kiril Videlov
14841d9848 feat: add rate limiting to throttle events in the Handler's handle method 2023-11-16 16:19:28 +01:00
Kiril Videlov
9a4f5cb3ab chore: update file change listener to use the session handler instead of the project file change handler 2023-11-16 16:19:28 +01:00
Kiril Videlov
606fbf8384 chore: refactor project file change handler to simplify code and remove unnecessary dependencies 2023-11-16 16:19:28 +01: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
d12d647ba9 refactor: simplify payload assignment in Event struct 2023-11-16 15:51:29 +01:00
Kiril Videlov
b23169fc92 chore: update emit_vbranches function signature to accept a reference to AppHandle instead of value 2023-11-16 12:30:28 +01: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
13d3588a87
Merge pull request #1610 from gitbutlerapp/fix-session-flush-error 
Fix session flush error
 2023-11-15 14:01:11 +01:00
Nikita Galaiko
4164907245 log which session is failed to flush 2023-11-15 13:55:59 +01:00
Nikita Galaiko
6bf22e4e93 fix branch reorder 2023-11-15 11:55:30 +01:00
Nikita Galaiko
4eabae9f76
Merge pull request #1608 from gitbutlerapp/update-debouncer-timeout 
Update debouncer timeout
 2023-11-15 10:50:12 +01:00
Nikita Galaiko
2a1723cb8c set file watch debouncer to 10ms 2023-11-15 10:45:32 +01:00
Nikita Galaiko
182449b0f1
Merge pull request #1607 from gitbutlerapp/handle-binary-hunks 
Handle binary hunks
 2023-11-15 10:42:16 +01:00
Nikita Galaiko
b142a3c25b fix: handle binary files and prioritize binary hunks 2023-11-15 10:21:33 +01:00
Nikita Galaiko
824012466d do not send handled auth errors to sentry 2023-11-15 09:13:50 +01:00
Nikita Galaiko
e24ebcdbab set default path to homedir 2023-11-14 18:02:26 +01:00
Nikita Galaiko
779c731f1c introduce rate limiter for sentry 2023-11-14 16:58:51 +01:00
Nikita Galaiko
9eb3cf9e0a handle open error 2023-11-14 15:19:22 +01:00
Nikita Galaiko
bdd24b69da extract sentry mod 2023-11-14 15:09:01 +01:00
Nikita Galaiko
165b0fcf46 handle projects that were removed 2023-11-14 15:02:16 +01:00
Nikita Galaiko
4684e22ba1
Merge pull request #1586 from gitbutlerapp/dependabot/cargo/tokio-1.34.0 
chore(deps): bump tokio from 1.33.0 to 1.34.0
 2023-11-14 11:45:13 +01:00
Nikita Galaiko
ab893091ad
Merge pull request #1590 from gitbutlerapp/dependabot/cargo/uuid-1.5.0 
chore(deps): bump uuid from 1.4.1 to 1.5.0
 2023-11-14 11:44:56 +01:00
Nikita Galaiko
8dcc102d29 debounce file change events 2023-11-14 11:37:40 +01:00
Nikita Galaiko
9f1910a59e ignore some vbranch errors while flushing 2023-11-14 10:25:31 +01:00
Nikita Galaiko
ee2e281ec3
Merge pull request #1595 from gitbutlerapp/fix-amend-ownership-check 
Fix amend ownership check
 2023-11-14 10:14:21 +01:00
Nikita Galaiko
0046cc2628 merged upstream 2023-11-14 10:06:37 +01:00
Nikita Galaiko
2cccfec49a merged upstream 2023-11-14 10:06:37 +01:00
Nikita Galaiko
f6531e815e verify amendable diffs agains real diff 2023-11-14 09:48:18 +01:00
Nikita Galaiko
449c0092e5 make sure all dirs exist when creating project 2023-11-14 09:47:49 +01:00
Nikita Galaiko
bdb0753e0b chore: fix warnings 2023-11-14 09:24: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
Nikita Galaiko
19619a6781
Merge pull request #1585 from gitbutlerapp/remove-result-from-handle-event 
Remove result from handle event
 2023-11-13 16:59:58 +01:00
dependabot[bot]
fd7a0a6b92
chore(deps): bump uuid from 1.4.1 to 1.5.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.4.1...1.5.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-13 15:55:30 +00:00
dependabot[bot]
875ee4b40a
chore(deps): bump tokio from 1.33.0 to 1.34.0 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.33.0...tokio-1.34.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-13 15:54:23 +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
Nikita Galaiko
75541c16b8 remove wd_tree flush optimization 2023-11-13 16:34:15 +01:00
Mattias Granlund
cceac88b85 Darken overlay backdrop color slightly 2023-11-13 10:55:51 +00:00
Kiril Videlov
bfa84c9d46 chore: remove unused imports and variables 2023-11-12 23:18:01 +01:00
Kiril Videlov
c01c7626ce feat: add support for filtering pull requests by "Only Yours" in project pull request listing, based on the logged-in user's GitHub username 2023-11-12 23:07:30 +01:00
Kiril Videlov
8de3eaf9b2 feat: add function to generate remote contributions based on pull requests and remote branches 2023-11-12 22:47:53 +01:00
Mattias Granlund
e79d3e9ebe Fix text input styles 2023-11-12 21:09:23 +00:00
Mattias Granlund
6d0d34fa65 Add first iteration of project switcher 
- next to base refresh button
 2023-11-12 20:45:50 +00:00
Mattias Granlund
6e2139b224 Improve stashed branch view 2023-11-12 20:45:50 +00:00
Kiril Videlov
1882b8e736 fix: remove unused imports and update conditional rendering in PullRequestPage component 2023-11-12 19:39:55 +01:00
Kiril Videlov
94ff6cb3b9 feat: update dependencies and refactor pullRequestsStore to use RxJS Observable 2023-11-12 19:39:55 +01:00
Mattias Granlund
b4c11c9e6a Move some files into nav package 2023-11-12 16:03:02 +00:00
Mattias Granlund
5ed72f3883
Moving faster with the UI (#1569) 
- using css vars directly in components for theming
- getting far with app bg, surfaces and cards
- lots of files touched to make app generally look better
 2023-11-12 15:50:02 +00:00
Mattias Granlund
4d22f1339e
More UI edits for the board (#1568) 
- adjusting colors, spacing, borders
 2023-11-11 19:51:15 +00:00
Mattias Granlund
0b05eea9de Fixes the style of the email button in the footer 2023-11-11 18:55:51 +00:00
Mattias Granlund
6ce3335170 Update the board UI with more padding 2023-11-11 18:46:15 +00:00
Mattias Granlund
a49d146d96 - active branch domain link 
- settigns domain link
- remove project header
 2023-11-11 18:27:49 +00:00
Mattias Granlund
9aa9ab14aa Make default bg color a bit brighter 2023-11-11 18:27:28 +00:00
Mattias Granlund
6ceca226ec Fixes weird commit card overflow 2023-11-11 18:02:07 +00:00
Mattias Granlund
8ebc746bd0 Fix some things related to project store 2023-11-11 17:20:44 +00:00
Mattias Granlund
e9563d9437 Refactor project store 
- also changes how the base branch is displayed
 2023-11-11 17:20:44 +00:00
Mattias Granlund
e1b63dfbc3 Show trunk as card 2023-11-11 17:20:44 +00:00
Mattias Granlund
a480ea0ecc Make base branch into component 2023-11-11 17:20:44 +00:00
Kiril Videlov
071889592c chore: simplify filter condition in list_remote_branches function 2023-11-11 18:02:23 +01:00
Kiril Videlov
c00e645881 list all remote branches 2023-11-11 18:02:23 +01:00
Mattias Granlund
4de1f8ad7f Show loading stack on hovering spinner 2023-11-11 13:24:05 +00:00
Mattias Granlund
267d073f7a Use Meta + Shift + S for manual sync to cloud 2023-11-11 10:49:32 +00:00
Mattias Granlund
66b05c0430 Show loading spinner during ipc/fetch 2023-11-11 10:24:42 +00:00
Nikita Galaiko
8f43847213
Merge pull request #1557 from gitbutlerapp/add-commit-method 
Add commit method
 2023-11-10 16:12:59 +01:00
Nikita Galaiko
77a8f15efa no signing when authors might mismatch 2023-11-10 16:04:39 +01:00
Nikita Galaiko
f58a79eb0c chore: remove migration logic for old data format 2023-11-10 15:48:23 +01:00
Nikita Galaiko
b48815c4d7
Merge pull request #1555 from gitbutlerapp/virtual-branch 
Virtual branch
 2023-11-10 13:02:33 +01:00
Nikita Galaiko
9949d2aa39
Merge pull request #1554 from gitbutlerapp/check-and-push-project-code 
Check and push project code
 2023-11-10 13:02:23 +01:00
Nikita Galaiko
b11f9be1ba refactor: remove unused activeZones set from draggable function 2023-11-10 12:29:29 +01:00
Nikita Galaiko
018a480f3f feat: optimize code push check to only push if sync is enabled and code URL is present 2023-11-10 12:26:53 +01:00
Nikita Galaiko
b2c97fcc89 fix: fix order of commit descriptions in assertion statements 2023-11-10 12:19:57 +01:00
Nikita Galaiko
67cea3c292
Merge pull request #1551 from gitbutlerapp/gb-601-squash-commits-ui 
GB-601: squash commits ui
 2023-11-10 10:42:24 +01:00
Nikita Galaiko
35dce0b728 fix draggable commit apperance 2023-11-10 10:34:20 +01:00
Mattias Granlund
b6e039115f Fix syntax highlighting backgrounds 2023-11-10 09:04:38 +00:00
Nikita Galaiko
dc2e8accfe simplify draggable 2023-11-10 09:09:29 +01:00
Nikita Galaiko
c144a82e36 feat: squash commits 2023-11-10 09:05:20 +01:00
Nikita Galaiko
41710e8656
Merge pull request #1549 from gitbutlerapp/add-squash-function 
GB-601 Add squash function
 2023-11-09 13:45:19 +01:00
Nikita Galaiko
ed8e348bfe feat: squash api 2023-11-09 13:00:14 +01:00
Kiril Videlov
1f7bcd05fb remove dead code 2023-11-08 18:45:32 +01:00
Mattias Granlund
308edbe1b9 Fix "open in vscode" context menu 2023-11-08 16:34:11 +00:00
Mattias Granlund
b101c1db58 Make pull request cache work with new store functionality 
This makes it load early based on cached results, followed up
with results from the API.
 2023-11-08 16:14:42 +00:00
Mattias Granlund
6809ada374 Bump the forked square/svelte-store library version 2023-11-08 16:11:20 +00:00
extrawurst
e94631cbb1 remove unused code 2023-11-08 16:36:11 +01:00
extrawurst
7e0a5844c4
GB-627: Session flush command (#1539) 2023-11-08 16:34:33 +01:00
Nikita Galaiko
26acd86063
Merge pull request #1542 from gitbutlerapp/remove-git-remote-branches-data 
Remove git remote branches data
 2023-11-08 15:08:34 +01:00
Mattias Granlund
8f9f29e8d6 Drop unused file 2023-11-08 13:48:08 +00:00
Nikita Galaiko
b277992391 move virtual branches call into controller 2023-11-08 14:38:27 +01:00
Nikita Galaiko
43ffb2dc05 extract bookmarks controller 2023-11-08 13:32:46 +01:00
Nikita Galaiko
21f678b273 extract deltas controller 2023-11-08 12:28:50 +01:00
extrawurst
7d7fbbb513 * not not try to push code to gb every tick 
* use same tick interval as for fetch: 15min
* flush leading to push is unaffected by this
 2023-11-08 12:08:48 +01:00
Mattias Granlund
3c9a1a3170 Make remote branch peek into page 2023-11-08 10:47:47 +00:00
Nikita Galaiko
cc900b911d
Merge pull request #1536 from gitbutlerapp/remove-log-tree-function 
Remove log tree function
 2023-11-08 11:13:49 +01:00
Nikita Galaiko
76c871bebe do not flush logs tree 2023-11-08 10:51:00 +01:00
Nikita Galaiko
14b25966e5 fix: handle removed files correctly when building working directory tree 2023-11-08 10:48:09 +01:00
Mattias Granlund
35cc2a5870 Make pull request peek into page 2023-11-08 09:46:02 +00:00
Nikita Galaiko
872079fc8a
Merge pull request #1532 from gitbutlerapp/add-sessions-controller 
Add sessions controller
 2023-11-08 10:45:53 +01:00
Nikita Galaiko
89f4ee7899
Merge pull request #1533 from gitbutlerapp/remove-git-gb-push 
Remove git gb push
 2023-11-08 10:45:45 +01:00
dependabot[bot]
cf28889d79
chore(deps-dev): bump prettier-plugin-tailwindcss from 0.5.4 to 0.5.6 (#1523) 
Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.4...v0.5.6)

---
updated-dependencies:
- dependency-name: prettier-plugin-tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-08 09:09:45 +00:00
dependabot[bot]
64efd859b3
chore(deps-dev): bump @codemirror/state from 6.2.1 to 6.3.1 (#1522) 
Bumps [@codemirror/state](https://github.com/codemirror/state) from 6.2.1 to 6.3.1.
- [Changelog](https://github.com/codemirror/state/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/state/compare/6.2.1...6.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-08 09:09:34 +00:00
dependabot[bot]
bec7bafa96
chore(deps): bump tokio-util from 0.7.9 to 0.7.10 
Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.9 to 0.7.10.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits)

---
updated-dependencies:
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-08 08:23:24 +00:00
Nikita Galaiko
18c83607bb
Merge pull request #1516 from gitbutlerapp/dependabot/cargo/chrono-0.4.31 
chore(deps): bump chrono from 0.4.29 to 0.4.31
 2023-11-08 09:20:46 +01:00
Nikita Galaiko
f8ef0e005a
Merge pull request #1515 from gitbutlerapp/dependabot/cargo/thiserror-1.0.50 
chore(deps): bump thiserror from 1.0.48 to 1.0.50
 2023-11-08 09:20:17 +01:00
Nikita Galaiko
84bb4f0eee rm unused methods 2023-11-08 09:18:12 +01:00
Nikita Galaiko
8e895a90c4 extract session commands 2023-11-08 09:16:40 +01:00
Mattias Granlund
e9cf8cfa7f
Remove vbranch peek (#1531) 
Make virtual branch peek into a page
 2023-11-07 16:56:32 +00:00
Kiril Videlov
53e97b9a77 feat: adds commit URL to CommitCard component to allow linking to the commit details page 2023-11-07 17:45:22 +01:00
extrawurst
fe0368219f workaround libgit2 limitation of not pushing wildcards: explicitly pushing all ref/gitbutler/.. refs 2023-11-07 17:23:56 +01:00
Kiril Videlov
ed8606d5e1 feat: add logic to determine whether to show HTTPS warning banner or not based on project configuration and environment variables 2023-11-07 17:17:14 +01:00
Nikita Galaiko
823672ff47
Merge pull request #1527 from gitbutlerapp/fix-session-indexing 
less aggressive session indexing hack
 2023-11-07 14:54:20 +01:00
Nikita Galaiko
5027509640 cargo fmt 2023-11-07 14:02:57 +01:00
Nikita Galaiko
bd022452f1 less aggressive session indexing hack 2023-11-07 13:35:18 +01:00
Nikita Galaiko
3a3f8da54c make sure deleted files are removed from session/wd 2023-11-07 13:31:14 +01:00
Nikita Galaiko
735e23be83 chore: refactor code to remove unnecessary references in function signatures 2023-11-07 12:42:38 +01:00
Nikita Galaiko
90db1ae8c3
Merge pull request #1510 from gitbutlerapp/add-draggable-action 
Add draggable action
 2023-11-07 08:52:43 +01:00
Nikita Galaiko
5496cfb7b1 refactor to have flat function arguments 2023-11-07 08:51:17 +01:00
dependabot[bot]
c2e5b1bc5f chore(deps-dev): bump @codemirror/view from 6.21.4 to 6.22.0 
Bumps [@codemirror/view](https://github.com/codemirror/view) from 6.21.4 to 6.22.0.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.21.4...6.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-07 06:38:20 +00:00
dependabot[bot]
8314d525fc chore(deps-dev): bump @sveltejs/kit from 1.24.1 to 1.27.3 
Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) from 1.24.1 to 1.27.3.
- [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.3/packages/kit)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-07 06:38:09 +00:00
dependabot[bot]
8fff608165 chore(deps-dev): bump eslint from 8.52.0 to 8.53.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.53.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.52.0...v8.53.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-07 06:38:00 +00:00
Kiril Videlov
20baf0a2f5 feat: remove BackButton component from Upstream page, add ProjectHeader component to Trunk and Board pages 2023-11-06 17:18:15 +01:00
dependabot[bot]
d07530d554
chore(deps): bump chrono from 0.4.29 to 0.4.31 
Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.29 to 0.4.31.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.29...v0.4.31)

---
updated-dependencies:
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-06 15:36:05 +00:00
dependabot[bot]
b77e604ebb
chore(deps): bump thiserror from 1.0.48 to 1.0.50 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.48 to 1.0.50.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.48...1.0.50)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-06 15:35:48 +00:00
Nikita Galaiko
1aeedbba4d allow amending locked hunks 2023-11-06 15:56:21 +01:00
Nikita Galaiko
7389091c18 refactor dropzone and draggable functions to support dynamic updating of options 2023-11-06 15:50:58 +01:00
Nikita Galaiko
fe03c342f0 review fixes 2023-11-06 15:38:41 +01:00
Nikita Galaiko
8917e3b9ba git: treat ssh key error as auth error 2023-11-06 15:24:08 +01:00
Nikita Galaiko
e5ee060eaf re-enable branch reorder 2023-11-06 14:15:17 +01:00