gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-08 10:58:33 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,295 Commits 162 Branches 1,083 Tags 64 MiB
5209087b8d
Commit Graph

4295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikita Galaiko
6bb4842cfe
Merge pull request #2082 from gitbutlerapp/fix-session-exists-check 
Fix session exists check
 2023-12-18 13:45:03 +01:00
Nikita Galaiko
15c090a114 infer session existance from reading required files 2023-12-18 13:41:00 +01:00
Nikita Galaiko
3fce307a4d
Merge pull request #2081 from gitbutlerapp/gb-684-allow-stashing-conflicts 
GB-684 allow stashing conflicts
 2023-12-18 13:28:17 +01:00
Nikita Galaiko
56dae673cc allow to stash conflicting branches 2023-12-18 12:59:51 +01:00
Pavel Laptev
32abb36a49
Merge pull request #2080 from gitbutlerapp/commit-textarea-height-fix 
commit textarea height fix
 2023-12-18 12:40:15 +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
ba12a77379
Merge pull request #2078 from gitbutlerapp/updated-commit-box-css-and-animation 
updated commit box css and animation
 2023-12-17 11:48:09 +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
b6ba873ba5
Merge pull request #2077 from gitbutlerapp/css-updates 
CSS updates
 2023-12-17 02:47: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
193e8baf29
Merge pull request #2076 from gitbutlerapp/update-commit-box-animation 
Update commit box animation
 2023-12-17 00:38:35 +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
b9b9bb6754
Merge pull request #2072 from gitbutlerapp/hunk-focus-state-update 
CSS styles updated
 2023-12-16 16:42:34 +01:00
Pavel Laptev
403c255dde minor css updates 2023-12-16 16:40:58 +01:00
Pavel Laptev
acfde5cae0
Merge pull request #2071 from gitbutlerapp/hunk-focus-state-update 
Branch remote name styles
 2023-12-16 16:33:15 +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
Kiril Videlov
884420e618 🔧 fix: refactor commit function to allow running hooks conditionally 2023-12-15 16:11:08 +01:00
Nikita Galaiko
a6b6a79268
Merge pull request #2064 from gitbutlerapp/handle-git2-http-error 
Handle git2 http error
 2023-12-15 15:42:39 +01: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
Nikita Galaiko
1cb49179d2 handle http error when pushing/pulling project 2023-12-15 15:37:28 +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
52fa3e3a62
Merge pull request #2060 from gitbutlerapp/space-between-branches 
Space between branches
 2023-12-15 13:08:33 +01:00
Pavel Laptev
c955f1f417 updated space between branches 2023-12-15 13:06:51 +01:00
Nikita Galaiko
2b1c7d21c1
Merge pull request #2059 from gitbutlerapp/virtual-branch-3 
Virtual branch
 2023-12-15 13:00:20 +01:00
Nikita Galaiko
7874e60bbd only verify ssh url hosts 2023-12-15 12:55:13 +01:00
Nikita Galaiko
ed44b4e521
Merge pull request #2058 from gitbutlerapp/handle-fetch-project-error 
Handle fetch project error
 2023-12-15 12:42:59 +01:00