gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-24 10:02:26 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,265 Commits 157 Branches 1,067 Tags 61 MiB
337096a254
Commit Graph

1418 Commits

Author SHA1 Message Date
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
Nikita Galaiko
0cdf187115 ensure branch updated time is always up to date 2023-12-13 16:14:23 +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
063e77c672 store last_fetched on target, not project 2023-12-13 13:40:41 +01:00
Nikita Galaiko
a93ac7a822
Merge pull request #2016 from gitbutlerapp/add-is-local-method 
do not shot "Open" for local commits
 2023-12-13 13:40:23 +01:00
Kiril Videlov
c8e63f24ba 🐛 fix: handle truncation when converting file metadata to u32 in git index entry 2023-12-13 12:45:24 +01:00
dependabot[bot]
e3796a1484
chore(deps): bump sentry from 0.31.8 to 0.32.0 
Bumps [sentry](https://github.com/getsentry/sentry-rust) from 0.31.8 to 0.32.0.
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.31.8...0.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 08:46:43 +00:00
Nikita Galaiko
f34f7ae20e
Merge pull request #1995 from gitbutlerapp/dependabot/cargo/sentry-tracing-0.32.0 
chore(deps): bump sentry-tracing from 0.31.8 to 0.32.0
 2023-12-13 09:42:24 +01:00
Nikita Galaiko
3a227df7b0
Merge pull request #1998 from gitbutlerapp/dependabot/cargo/similar-2.3.0 
chore(deps): bump similar from 2.2.1 to 2.3.0
 2023-12-13 09:41:56 +01:00
Nikita Galaiko
8d6827d784 do not show "Open" link for remote commits 2023-12-13 09:33:11 +01:00
Pavel Laptev
e40886efb8 Merged origin/master into Update hunk styles 2023-12-12 23:44:27 +01:00
Pavel Laptev
fa7f2f8b27 Space between the hunk title and details updated 2023-12-12 23:43:22 +01:00
Mattias Granlund
70d7347ae3 Refactor context menus and popups 
- add dividers (sections)
- stop using overlay for branch popup
- click outside to dismiss (without canceling click)
 2023-12-12 22:43:07 +00:00
Pavel Laptev
0f9bbc9cfa File preview. Header title styles updated 2023-12-12 23:39:54 +01:00
Pavel Laptev
a72932a2a9 hunk overflow fixed 2023-12-12 22:59:46 +01:00
Pavel Laptev
40c957d9a1 hunk CSS updated 2023-12-12 22:56:26 +01:00
Pavel Laptev
05bd73da34 hunk css updated 2023-12-12 22:27:12 +01:00
Pavel Laptev
e4e0b2de53 added horizontal scroll to hunks 2023-12-12 22:23:13 +01:00
Kiril Videlov
954d51c853 🔧 fix: update tests to use correct assertions and add missing projects parameter in test setup 2023-12-12 18:56:29 +01:00
Kiril Videlov
b18980c008 🐛 fix: update type of ok_with_force_push field in Project struct to use DefaultTrue type for better serialization 2023-12-12 18:56:29 +01:00
Pavel Laptev
cdccb59e33 Merged origin/master into Update modal styles 2023-12-12 17:32:17 +01:00
Pavel Laptev
75b8216918 loader hight fixed 2023-12-12 17:31:59 +01:00
Qix
dd099353ca
Merge pull request #2012 from gitbutlerapp/add-defaulttrue-type 
add `DefaultTrue` type
 2023-12-12 17:30:56 +01:00
Pavel Laptev
930b06a0eb deleted unnesesery import 2023-12-12 17:28:18 +01:00
Pavel Laptev
26f826413f coderefactoring 2023-12-12 17:25:44 +01:00
josh@gitbutler.com
9133ef3607 add DefaultTrue type 2023-12-12 17:25:15 +01:00
extrawurst
8d917494ed
GB-700: support user triggered pre commit hook (#1960) 
* run pre commit hook
* unittest
* support custom search path: `.husky`
 2023-12-12 17:15:35 +01:00
Pavel Laptev
db037960a8 Codereview: header and icon to props 2023-12-12 17:12:25 +01:00
Pavel Laptev
d32f08153c Merged origin/master into Update modal styles 2023-12-12 16:05:41 +01:00
Mattias Granlund
043e0de45b Use main app background for dragging window 
- this doesn't yet enable dragging for e.g. settings, but we'll get there
 2023-12-12 15:05:32 +00:00
Pavel Laptev
66bc0303c4 removed unused import 2023-12-12 16:05:28 +01:00
Mattias Granlund
669c481bf6 Enable app drag from board background 2023-12-12 15:05:03 +00:00
Pavel Laptev
20d150cac1 removed unnesessery css 2023-12-12 16:02:54 +01:00
Pavel Laptev
5d805513c1 modal title replaced 2023-12-12 16:01:31 +01:00
Pavel Laptev
697b1fa3bb fixed code line width 2023-12-12 15:56:42 +01:00
Pavel Laptev
1182161c70 Merged origin/master into Update modal styles 2023-12-12 15:54:31 +01:00
Pavel Laptev
388d645a2b changed modals and some styles 2023-12-12 15:53:49 +01:00
Mattias Granlund
867d82efde Always go to the board when switching projects 2023-12-12 14:48:39 +00:00
Nikita Galaiko
838150c7a4
Merge pull request #2006 from gitbutlerapp/handle-branch-read-error 
Handle branch read error
 2023-12-12 14:48:59 +01:00
Nikita Galaiko
f5331b4c1e fix: handle case when branch is not found in delete_branch function 2023-12-12 14:43:37 +01:00
Nikita Galaiko
8ec307bfbc fix file keypath resolution 2023-12-12 14:23:28 +01:00
Nikita Galaiko
7794e8778b chore: update From trait implementation for ForcePushNotAllowedError to ignore the value parameter 2023-12-12 13:33:20 +01:00
Nikita Galaiko
4c2ff38bc9 test: add integration tests for integrated commits with locked and non-locked hunks 2023-12-12 13:32:48 +01:00
Nikita Galaiko
1cd6220dda do not include id into user facing error message 2023-12-12 12:20:17 +01:00
Nikita Galaiko
9be36ef6af add descritpion to force pushing preference 2023-12-12 12:15:19 +01:00
Nikita Galaiko
0bb1b786ff consider force push preference when updating commit message 2023-12-12 10:47:00 +01:00
Nikita Galaiko
08e41f46d1 reflect squashing rules in ui 2023-12-12 10:18:34 +01:00
Nikita Galaiko
a98ea8ccc3 consider force push preference while squashing 2023-12-12 09:45:16 +01:00
Nikita Galaiko
a1516e24ff test amend with force 2023-12-12 09:26:48 +01:00
dependabot[bot]
ee90793b0d chore(deps-dev): bump svelte-floating-ui from 1.5.3 to 1.5.8 
Bumps [svelte-floating-ui](https://github.com/fedorovvvv/svelte-floating-ui) from 1.5.3 to 1.5.8.
- [Release notes](https://github.com/fedorovvvv/svelte-floating-ui/releases)
- [Commits](https://github.com/fedorovvvv/svelte-floating-ui/compare/1.5.3...1.5.8)

---
updated-dependencies:
- dependency-name: svelte-floating-ui
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 19:41:13 +00:00
dependabot[bot]
feed4b3df6 chore(deps-dev): bump eslint-plugin-svelte from 2.35.0 to 2.35.1 
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) from 2.35.0 to 2.35.1.
- [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.35.0...v2.35.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 19:39:44 +00:00
Nikita Galaiko
8b3d8e42d0
Merge pull request #1988 from gitbutlerapp/add-force-pushing-error 
disallow amending if force pushing is not ok
 2023-12-11 16:54:04 +01:00
dependabot[bot]
03e95d1e00
chore(deps): bump similar from 2.2.1 to 2.3.0 
Bumps [similar](https://github.com/mitsuhiko/similar) from 2.2.1 to 2.3.0.
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mitsuhiko/similar/compare/2.2.1...2.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 15:48:08 +00:00
dependabot[bot]
04bc52a7e7
chore(deps): bump sentry-tracing from 0.31.8 to 0.32.0 
Bumps [sentry-tracing](https://github.com/getsentry/sentry-rust) from 0.31.8 to 0.32.0.
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.31.8...0.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 15:47:20 +00:00
Nikita Galaiko
768bde4f27 disallow amending if force pushing is not ok 2023-12-11 15:49:43 +01:00
Pavel Laptev
680cf192db wip 2023-12-11 15:12:31 +01:00
Nikita Galaiko
d0603c5643 fix test 2023-12-11 14:03:34 +01:00
Nikita Galaiko
9c157ae0af do not show create pr button for pushed branches 2023-12-11 14:00:51 +01:00
Nikita Galaiko
e5f7a71f7c docs: add documentation for ok_with_force_push field in Project struct 2023-12-11 14:00:26 +01:00
Nikita Galaiko
c2b8eb6a71 test force push setting 2023-12-11 13:01:17 +01:00
Nikita Galaiko
0a311f14b5 Merged origin/master into Add ok with force push to project 2023-12-11 11:25:27 +01:00
Nikita Galaiko
a1e4e651cc ui for ok with force pushing 2023-12-11 11:17:20 +01:00
Nikita Galaiko
0840e69db8 configurable "ok with force pushing" 2023-12-11 11:17:08 +01:00
josh@gitbutler.com
333ded9534 fix clippy lints in nightly 2023-12-11 11:09:27 +01:00
Nikita Galaiko
fdfe34b21b add credentials tests 2023-12-11 09:33:11 +01:00
Mattias Granlund
e7990b41ba Fix bug in hunk context menu 
- it wasn't always referring to the right file
 2023-12-10 23:56:56 +00:00
Mattias Granlund
ebbc71a0bc Go back on flex container in scrollable 
- using block is more ergonomic for its contents
- undo the decision on using flex I made earlier today
 2023-12-10 23:54:43 +00:00
Pavel Laptev
57ee23bf77 hover updated 2023-12-11 00:08:39 +01:00
Mattias Granlund
5dc93d932d Fix a couple of scrollable glitches 2023-12-10 21:38:52 +00:00
Kiril Videlov
2aaeac1f80 🐛 fix: correctly handle user authentication status for enabling branch name and commit message generation 
🔨 chore: remove unused userSettings variable from login page
 2023-12-10 21:42:16 +01:00
Kiril Videlov
10165be6ac 🐛 fix: correct typo in error message for failed pull request creation 2023-12-10 21:36:31 +01:00
Kiril Videlov
136eb65225 fix a nasty auth bug — incorrect url conversion 2023-12-10 21:27:38 +01:00
Pavel Laptev
ce9ffdf3bd small css fix 2023-12-10 20:26:24 +01:00
Pavel Laptev
ef096fa480 default branch width updated 2023-12-10 16:52:29 +01:00
Pavel Laptev
fd42da0774 New branch dragzone updated 2023-12-10 16:42:02 +01:00
Pavel Laptev
b72f2e4b1f Wip 2023-12-09 21:54:12 +01:00
Pavel Laptev
8fa960cdee Wip 2023-12-09 21:07:59 +01:00
Pavel Laptev
8e196b1274 Fixed files list gap and added bottom padding 2023-12-09 21:03:04 +01:00
Pavel Laptev
433db0cd32 Sync button, new icons, tag updated 2023-12-09 20:53:13 +01:00
Pavel Laptev
961df0852e padding updates 2023-12-09 14:59:06 +01:00
Pavel Laptev
5cbc98fca0 new icon “commit" 2023-12-09 14:56:51 +01:00
Pavel Laptev
1b48cd40ac merged from upstream 2023-12-09 14:47:32 +01:00
Pavel Laptev
2727312b77 Added new overlay color 2023-12-09 10:23:18 +01:00
Pavel Laptev
48ad2c4e99 Updated tokens 2023-12-08 17:27:04 +01:00
Pavel Laptev
7dc40b0c1f Css fix 2023-12-08 17:18:14 +01:00
Pavel Laptev
ae4a13450d codereview fixes from https://github.com/gitbutlerapp/gitbutler-client/pull/1961 2023-12-08 17:14:05 +01:00
Pavel Laptev
478f672acb hover color updated 2023-12-08 17:09:07 +01:00
Pavel Laptev
6089678198 Merged origin/master into Update gravatar icons and branch item 2023-12-08 17:03:39 +01:00
Pavel Laptev
0e98acd370 Wip 2023-12-08 17:03:22 +01:00
Nikita Galaiko
29b6430fb4
Merge pull request #1964 from gitbutlerapp/update-dependencies-1 
Update dependencies 1
 2023-12-08 16:26:40 +01:00
Pavel Laptev
07b501f6a5 Codereview fixes 2023-12-08 15:07:49 +01:00
Pavel Laptev
9dcf5b49aa Merged origin/master into Improve label editing using keyboard 2023-12-08 14:54:41 +01:00
Nikita Galaiko
14254fe23c fix: ensure known_hosts is up to date 2023-12-08 14:51:16 +01:00
Nikita Galaiko
9e57b90f7d
Merge pull request #1957 from gitbutlerapp/smarter-credentials-helper 
smarter credentials helper
 2023-12-08 12:28:45 +01:00
Nikita Galaiko
f1fd6e6a59 hint absolute path 2023-12-08 11:13:35 +01:00
Mattias Granlund
56537d428c Create ScrollableContainer component 
- use it for all scrollable containers other than board
- commit got too big, includes github PR stuff (not active)
 2023-12-08 10:04:11 +00:00
Nikita Galaiko
a1d8b8cb8c test all the keys 2023-12-08 11:02:17 +01:00
Pavel Laptev
2d12e953ea Fixes 2023-12-07 17:29:56 +01:00
Pavel Laptev
6dfc9203fa Fix 2023-12-07 17:24:56 +01:00
Pavel Laptev
39d4b5f861 Wip 2023-12-07 17:22:19 +01:00
Pavel Laptev
f6f9d57520 Update 2023-12-07 14:03:22 +01:00
Pavel Laptev
935376ed8c Wip 2023-12-07 13:14:37 +01:00
Nikita Galaiko
346685cc64 if we know which auth to use, only use that 2023-12-07 11:13:49 +01:00
Nikita Galaiko
287fe9d3db smarter credentials helper 2023-12-06 17:24:48 +01:00
Pavel Laptev
0cc4e089a8 new icons 2023-12-06 17:20:18 +01:00
Pavel Laptev
f53c3ca66d Merged origin/master into Add new components 2023-12-06 16:37:53 +01:00
Pavel Laptev
daa2187ca3 radio and toggle added 2023-12-06 16:37:46 +01:00
Nikita Galaiko
177a5f9772 retry posthog 2023-12-06 14:20:20 +01:00
Pavel Laptev
6ba0982e56 Merged origin/master into Add new components 2023-12-06 13:16:57 +01:00
Pavel Laptev
a0952810c4 checkbox added 2023-12-06 13:16:44 +01:00
extrawurst
70ea19745a
GB-587: add credential helper support (#1946) 2023-12-06 11:00:50 +01:00
Mattias Granlund
4ffad7a466 Use textbox components in settings page 2023-12-05 23:09:15 +00:00
Nikita Galaiko
5c739aa88e
Merge pull request #1944 from gitbutlerapp/remove-unused-modules 
Remove unused modules
 2023-12-05 17:00:12 +01:00
Mattias Granlund
8f67de5cbe Some small nits 
- remove app drag region from branch lane
- remove unused variable
- remove unused css class
 2023-12-05 15:53:33 +00:00
Pavel Laptev
89f03a6701 Merged origin/master into Margin fix 2023-12-05 16:49:30 +01:00
Pavel Laptev
16b3545c12 fixed ListItem height for the dropdown menu 2023-12-05 16:49:22 +01:00
Nikita Galaiko
d434b8d6d4 remove butler leftovers 2023-12-05 16:48:27 +01:00
Mattias Granlund
49f2cfd63d Fix resizing while zoomed in 
- take into account zoom factor when converting to rem units
 2023-12-05 15:47:16 +00:00
Nikita Galaiko
0e047c33d2
Merge pull request #1941 from gitbutlerapp/refactor-repo-open-error-handling 
Refactor repo open error handling
 2023-12-05 16:45:27 +01:00
Pavel Laptev
8d83a9279c Merged origin/master into Margin fix 2023-12-05 16:44:06 +01:00
Pavel Laptev
a035e9a4fa fix 2023-12-05 16:43:08 +01:00
Nikita Galaiko
85143e0848 rm id from error title 2023-12-05 16:41:10 +01:00
Nikita Galaiko
4696fcf492 retry for file watcher start 2023-12-05 16:38:37 +01:00
Mattias Granlund
95449584f9 Rename /user to /settings in frontend 2023-12-05 15:34:02 +00:00
Nikita Galaiko
0810b3b69b
Merge pull request #1921 from gitbutlerapp/dependabot/cargo/byteorder-1.5.0 
chore(deps): bump byteorder from 1.4.3 to 1.5.0
 2023-12-05 16:15:28 +01:00
Nikita Galaiko
df1e2250c2
Merge pull request #1918 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.3 
chore(deps): bump ssh-key from 0.6.2 to 0.6.3
 2023-12-05 16:15:05 +01:00
Nikita Galaiko
2bbcef7653
Merge pull request #1937 from gitbutlerapp/add-rate-limiter 
Add rate limiter
 2023-12-05 16:14:26 +01:00
dependabot[bot]
1a5f2567d8 chore(deps-dev): bump eslint-config-prettier from 9.0.0 to 9.1.0 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.0.0 to 9.1.0.
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v9.0.0...v9.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:14:03 +00:00
dependabot[bot]
7e76cc148d chore(deps-dev): bump @typescript-eslint/eslint-plugin 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.7.3 to 6.13.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.2/packages/eslint-plugin)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:13:27 +00:00
dependabot[bot]
805792f276 chore(deps-dev): bump @codemirror/language from 6.9.0 to 6.9.3 
Bumps [@codemirror/language](https://github.com/codemirror/language) from 6.9.0 to 6.9.3.
- [Changelog](https://github.com/codemirror/language/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/language/compare/6.9.0...6.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:11:14 +00:00
dependabot[bot]
0501ef6646 chore(deps-dev): bump eslint from 8.54.0 to 8.55.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.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.54.0...v8.55.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-12-05 15:10:42 +00:00
dependabot[bot]
a7dbc68288 chore(deps-dev): bump nanoevents from 8.0.0 to 9.0.0 
Bumps [nanoevents](https://github.com/ai/nanoevents) from 8.0.0 to 9.0.0.
- [Changelog](https://github.com/ai/nanoevents/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoevents/compare/8.0.0...9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:10:34 +00:00
Nikita Galaiko
ff4e236038 Merged origin/master into Add rate limiter 2023-12-05 16:08:53 +01:00
Qix
615c333ade
Merge pull request #1931 from gitbutlerapp/rename-mod-modules-to-named-modules 
rename `.mod` modules to named modules
 2023-12-05 16:03:54 +01:00
Nikita Galaiko
6a70c0c4f7
Merge pull request #1934 from gitbutlerapp/remove-unused-commands 
Remove unused commands
 2023-12-05 16:01:56 +01:00
Nikita Galaiko
a2d4934e88 recalculate vbranches after fetch 2023-12-05 16:01:24 +01:00
Mattias Granlund
dc6fa34ee5 Update external link icon 2023-12-05 14:59:34 +00:00
Josh Junon
e9869013d3 rename mod.rs files to named modules 2023-12-05 15:58:43 +01:00
Mattias Granlund
a4e3623530 Remove class property from Icon component 
- we discussed and decided to phase out className props
 2023-12-05 14:56:40 +00:00
Nikita Galaiko
5347ddbb05 remove butler 2023-12-05 15:44:10 +01:00
Nikita Galaiko
234b31cf59 drop jsonlines 2023-12-05 15:31:15 +01:00
Nikita Galaiko
65fc2d1cc3
Merge pull request #1930 from gitbutlerapp/refactor-delete-branch-function 
support deletion of applied branches
 2023-12-05 15:26:32 +01:00
Nikita Galaiko
65fd1c9ac3 test more init test cases 2023-12-05 15:18:34 +01:00
Mattias Granlund
c4b76f5811 Allow lane drag from header background in addition to handle 2023-12-05 13:59:41 +00:00
Nikita Galaiko
ef9aa747a4 fix deletion of applied branches 2023-12-05 11:35:41 +01:00
Nikita Galaiko
3097087b45 fix branch lane delete dialog 2023-12-05 10:37:23 +01:00
Nikita Galaiko
556c775e35
Merge pull request #1928 from gitbutlerapp/refactor-get-current-deltas 
Refactor get current deltas
 2023-12-04 17:39:28 +01:00
Nikita Galaiko
cbe2c86c02 make sure only one vbranch calculation is run at the same time 2023-12-04 17:29:33 +01:00
Nikita Galaiko
6c00b8d822 fix extra session read 2023-12-04 17:13:16 +01:00
dependabot[bot]
11eb8af0f5
chore(deps): bump byteorder from 1.4.3 to 1.5.0 
Bumps [byteorder](https://github.com/BurntSushi/byteorder) from 1.4.3 to 1.5.0.
- [Changelog](https://github.com/BurntSushi/byteorder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BurntSushi/byteorder/compare/1.4.3...1.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-04 15:17:09 +00:00
dependabot[bot]
6445285c01
chore(deps): bump ssh-key from 0.6.2 to 0.6.3 
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.2 to 0.6.3.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.2...ssh-key/v0.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-04 15:14:51 +00:00
dependabot[bot]
85c52a2da6 Bump prettier-plugin-svelte from 3.0.3 to 3.1.2 
Bumps [prettier-plugin-svelte](https://github.com/sveltejs/prettier-plugin-svelte) from 3.0.3 to 3.1.2.
- [Changelog](https://github.com/sveltejs/prettier-plugin-svelte/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/prettier-plugin-svelte/compare/v3.0.3...v3.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-04 14:46:18 +00:00
dependabot[bot]
1e89cbbaf8 Bump crypto-js and @types/crypto-js 
Bumps [crypto-js](https://github.com/brix/crypto-js) and [@types/crypto-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/crypto-js). These dependencies needed to be updated together.

Updates `crypto-js` from 4.1.1 to 4.2.0
- [Commits](https://github.com/brix/crypto-js/compare/4.1.1...4.2.0)

Updates `@types/crypto-js` from 4.1.1 to 4.2.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/crypto-js)

---
updated-dependencies:
- dependency-name: crypto-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@types/crypto-js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-04 14:46:05 +00:00
Mattias Granlund
10f09dea6f Show gh username when no email present in authors icon list 2023-12-04 14:40:35 +00:00
Mattias Granlund
1a266f7bd1 Refactor resizing of branches list in sidebar 
- remove dependency on userSettings.ts (we're working to remove it)
- use rem units over pixels
 2023-12-04 14:40:09 +00:00
Mattias Granlund
d0e391ab82 Add conflict markers to file list view 2023-12-04 10:52:12 +00:00
Mattias Granlund
d4a025e6b8 style: update flex-shrink value in branch container to allow it to shrink if necessary 2023-12-04 09:37:49 +00:00
Kiril Videlov
ecb6eb9aed 🐛 fix: sort contributions by modifiedAt date, handling cases where modifiedAt is undefined 2023-12-03 23:31:46 +01:00
Kiril Videlov
c2e32ced04 🔨 chore: add conditional rendering for branch icon in item component 2023-12-03 23:31:46 +01:00
Kiril Videlov
fdbbd48033 🔨 chore: update author and modifiedAt properties to return optional values 2023-12-03 23:31:46 +01:00
Pavel Laptev
8792f6eafb
Merge pull request #1911 from gitbutlerapp/code-cleanup 
Tokens updates and code cleanup
 2023-12-03 22:36:32 +01:00
Mattias Granlund
c39b04474a Update branch filter type names 
- all, pr, remote & unapplied
 2023-12-03 21:34:08 +00:00
PavelLaptev
f8d24c1775 Merged origin/master into Code cleanup 2023-12-03 22:31:25 +01:00
PavelLaptev
69734de262 Tokens updated 2023-12-03 22:31:09 +01:00
Mattias Granlund
aa8f7fff29 Make zooming in better by persisting rem units 2023-12-03 21:22:59 +00:00
PavelLaptev
278a08e6fe removed unnesessery color modes from InfoMessage 2023-12-03 22:10:48 +01:00
PavelLaptev
b52a32f256 tokens updated 2023-12-03 21:40:10 +01:00
PavelLaptev
d4f395f496 Commits list header vertical centered 2023-12-03 20:55:05 +01:00
PavelLaptev
41a693b3c2 stashed branches — icon shrink fixed 2023-12-03 20:51:13 +01:00
Mattias Granlund
1d5da80125 Combine all branches in a single sidebar section 
- the sidebar resizing overflow problem is now fixed
 2023-12-03 19:47:46 +00:00
Kiril Videlov
58269340b4 ✨ feat: add delete confirmation modal for branch deletion in branch menu 2023-12-03 19:37:35 +01:00
Mattias Granlund
33908a292f Fix loading status tooltip 2023-12-03 18:04:56 +00:00
Mattias Granlund
50209b4bf7 Separate out AuhtorIcon component from list component 2023-12-03 18:04:11 +00:00
Mattias Granlund
444b15631a Add scrollbar to project selector 2023-12-03 18:04:02 +00:00
Mattias Granlund
4af41d639d feat: add delete functionality to branch popup menu item 2023-12-03 17:55:20 +00:00
Kiril Videlov
2246bb4805 refactor: change parameter type from PathBuf to Path in virtual_hunks_by_filepath function 2023-12-03 18:17:55 +01:00
Kiril Videlov
331302ec9c chore: update virtual_hunks_by_filepath function to use project path instead of git repository path 2023-12-03 18:17:55 +01:00
PavelLaptev
4f59715f52 simplified list item layout 2023-12-03 17:12:56 +01:00
Scott Chacon
a93ef1dd71 🔨 chore: add hover effect to clickable tag elements 2023-12-03 16:25:18 +01:00
Kiril Videlov
290ff33657 style: update loading status margin in left-btns container 2023-12-03 16:11:53 +01:00
PavelLaptev
4822b143cf Wip 2023-12-03 15:41:56 +01:00
PavelLaptev
ee107750a6 new styles 2023-12-03 15:38:04 +01:00
PavelLaptev
b4433ce630 Text styles updated 2023-12-03 12:29:52 +01:00
PavelLaptev
115eef2eab info message fix 2023-12-03 11:54:57 +01:00
PavelLaptev
3fc932f387 Merged origin/master into Fix file name and path stylesCSS fixes 2023-12-03 11:33:55 +01:00
PavelLaptev
82815d8595 updated wide mode for dropdown 2023-12-03 11:33:36 +01:00
PavelLaptev
1fa04db713 file list item updated 2023-12-03 11:26:00 +01:00
Mattias Granlund
3d73de1113 Fix css bug folding of commit list component 2023-12-03 10:19:22 +00:00
PavelLaptev
6b86a6ee56 update 2023-12-03 11:06:48 +01:00
Mattias Granlund
45dae4197d fix: fix the calculation of the justpath property in the File class 
The `justpath` property in the File class was previously returning an incorrect value. The calculation was splitting the `path` string by '/' and then selecting a range of elements to join together. The range was specified as `slice(1, -2)`, which resulted in excluding the first element and including the second-to-last element. 

The fix updates the range to `slice(0, -1)`, which includes all elements except for the last one. This ensures that the `justpath` property correctly represents the path without the filename.
 2023-12-03 01:07:32 +00:00
Mattias Granlund
080773be9f Fix commit mistake from settings UI update 2023-12-03 01:06:59 +00:00
Mattias Granlund
d2fd7ac092 Give global settings page a max width and facelift 2023-12-03 01:00:26 +00:00
PavelLaptev
315ebbfd6c Wip 2023-12-03 01:19:17 +01:00
PavelLaptev
fef690abb2 Updated Dropdown 2023-12-03 01:15:13 +01:00
PavelLaptev
beab7b947e Merged origin/master into CSS updates 2023-12-03 01:14:32 +01:00
Mattias Granlund
bcfd84f33c Revert settings page changes from earlier today to broken ui 2023-12-02 23:54:49 +00:00
Mattias Granlund
974055dc85 Fix font size bug in tag component 
- an inherited large font size makes the icon shift vertically
 2023-12-02 23:48:42 +00:00
Mattias Granlund
2f24c3eca6 Fix commit card drag image 
- removes white container that was present during drag
 2023-12-02 23:48:30 +00:00
Mattias Granlund
d8b8d2c558 Make pr and branch preview into cards 2023-12-02 23:48:09 +00:00
Mattias Granlund
de86920eb4 Use shared css classes for cards 
Going with bem notation since simple names for nested objects are impossible to grep for.
 2023-12-02 23:47:57 +00:00
Mattias Granlund
611bd60078 Fix commit list expand / collapse 2023-12-02 23:47:33 +00:00
PavelLaptev
4c1fb0567a centered icons in Segemented control 2023-12-02 23:16:09 +01:00
Mattias Granlund
84179133bc Fix scrolling of files and enable scrolling of commits 2023-12-02 16:51:00 +00:00
Mattias Granlund
65d9b3ba7a Add window dragging by pulling on the board background. 
- does not work over the new branch dropzone.
 2023-12-02 13:14:11 +00:00
Mattias Granlund
703472368a Show clear home button if repo fails to load 2023-12-02 13:11:53 +00:00
dependabot[bot]
cfc0cd1c49 Bump posthog-js from 1.84.2 to 1.93.2 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.84.2 to 1.93.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.84.2...v1.93.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 16:28:41 +00:00
Scott Chacon
936cb20892 🔨 chore: update project sync status handling and UI 
- Refactored the `onSyncChange` function to handle the project sync status update.
- Added a checkbox to allow users to enable or disable project sync.
- Added conditional rendering for the project sync section based on the user's role.
- Updated the `User` struct in both Rust and TypeScript to include the `role` field.
 2023-12-01 15:06:50 +00:00
Mattias Granlund
e286c528b8 chore: drop unused resizer 2023-12-01 13:41:31 +00:00
Mattias Granlund
3c7e098da1 chore: update (force push button to have a wide layout 2023-12-01 13:36:34 +00:00
extrawurst
78a8ef489a
pushing all remotes (#1867) 
* split up massive function to make it easier to follow
* push remotes to gb-server plus test
 2023-12-01 10:17:34 +01:00
Mattias Granlund
c153e2f457 Make resizing and scrolling great 
- resizers should now be absolutely positioned within the thing they are resizing
- scrollbar now works for horizontal mode as well (board)
 2023-11-30 23:36:52 +00:00
Kiril Videlov
0703a8cc82 fix: update user name display logic in button component to prioritize given_name and email if name is not available 2023-11-30 22:26:23 +01:00
Nikita Galaiko
0bed078a09
Merge pull request #1866 from gitbutlerapp/handle-fetch-errors 
Handle fetch errors
 2023-11-30 18:42:32 +01:00
Kiril Videlov
7b95d2097b
Merge pull request #1874 from gitbutlerapp/update-summary-generation-label 
Update summary generation label
 2023-11-30 18:26:10 +01:00
Kiril Videlov
a6dd5fcde2 chore: update label and description for AI integration option in UI 2023-11-30 18:22:53 +01:00
Kiril Videlov
41c4139555
Merge pull request #1873 from gitbutlerapp/filter-out-default-target-branch 
Filter out default target branch
 2023-11-30 18:16:20 +01:00
Kiril Videlov
04afdc47e0 fix: exclude default target branch from the list of remote branches 2023-11-30 18:12:05 +01:00
Kiril Videlov
7faebcd9ec
Merge pull request #1871 from gitbutlerapp/add-annotate-warning-back 
Add annotate warning back
 2023-11-30 18:04:31 +01:00
Kiril Videlov
56a0d652fc feat: add cloudEnabled prop to SyncButton component to conditionally call syncToCloud based on project's API sync status 2023-11-30 17:58:49 +01:00
Mattias Granlund
0a426013da
Merge pull request #1870 from gitbutlerapp/remove-resizer-1 
Remove resizer 1
 2023-11-30 16:55:15 +00:00
Scott Chacon
71adb5e435 add back the annotate commits warning 2023-11-30 17:54:47 +01:00
Mattias Granlund
e3b30fa3df Remove resizer from BranchFiles.svelte 2023-11-30 17:52:43 +01:00
Mattias Granlund
eb7f2674a5
Merge branch 'master' into refactor-project-setup-page 2023-11-30 16:48:48 +00:00
Mattias Granlund
f9415c937b Make the project setup page great again 🤘 2023-11-30 17:47:12 +01:00
Nikita Galaiko
66e4d6ddfd fix: handle different types of remote errors in fetch calls 2023-11-30 16:01:43 +01:00
Kiril Videlov
225de46e6f fix lint 2023-11-30 15:41:37 +01:00
Kiril Videlov
2046df3a43 fix: prevent default behavior only when drag handle id is not 'drag-handle' 2023-11-30 15:41:37 +01:00
Kiril Videlov
e9828a605e fix: adjust drop position calculation in drag and drop functionality 2023-11-30 15:41:37 +01:00
Nikita Galaiko
dbe84e117f do not fail vbranch calculations on wrong branch 2023-11-30 15:23:12 +01:00
Nikita Galaiko
a56de709a1
Merge pull request #1863 from gitbutlerapp/remove-ignored-files-from-wd-tree 
Remove ignored files from wd tree
 2023-11-30 14:20:17 +01:00
Nikita Galaiko
0f29b62b79 when calculating files to remove, use session data only 2023-11-30 14:15:42 +01:00
Kiril Videlov
5008de035e refactor: remove filtering of branches based on default target branch 2023-11-30 13:41:57 +01:00
Kiril Videlov
ef6c6afa8a refactor: simplify code for getting user name in configure_scope function 2023-11-30 13:40:23 +01:00
Kiril Videlov
f7945a5294 refactor: simplify code for configuring user scope and creating git signature 2023-11-30 13:40:23 +01:00
Kiril Videlov
41d0494b73 feat: update user name field to be optional in User struct and User type to handle cases where name or given_name is not available 2023-11-30 13:40:23 +01:00
Nikita Galaiko
0976cd294a
Merge pull request #1857 from gitbutlerapp/try-to-rebase-when-applying-branch 
optimize wd flushing
 2023-11-30 13:32:35 +01:00
Nikita Galaiko
65f7bbbbd1 test with sub directories 2023-11-30 13:18:04 +01:00
Nikita Galaiko
10b325732f bring back build_wd_tree optimization 2023-11-30 12:54:01 +01:00
Mattias Granlund
6e64d3fbcc Wait for prs to reload after creating pr 2023-11-30 10:07:48 +00:00
Nikita Galaiko
e25cd28c9f list files can filter by prefix 2023-11-30 10:41:47 +01:00
Mattias Granlund
7e6e26d4e1 🔨 chore: fix scrollable check in client script 2023-11-30 09:41:37 +00:00
Mattias Granlund
08f23df1b9 Make pr creation even more reliable 
- do both pushing and pr creation in pr service
- no discontinuity in "loading"
- wait for branch to have upstream (10s timeout)
 2023-11-30 08:42:12 +00:00
Mattias Granlund
8726e27e39 Make PR creation more reliable 
- can't be exact atm as we can't "wait" for upstream data to be sent to front end
- will talk to Kiril about this
 2023-11-29 23:23:43 +00:00
Mattias Granlund
593eb9e717 Split out commit list header and footer 2023-11-29 22:33:22 +00:00
Mattias Granlund
74aac963f7 Renaming a vairable to test push 2023-11-29 21:56:52 +00:00
Mattias Granlund
46909a3a25 🚀 feat: add state management for PR service and update createPullRequest method 2023-11-29 21:54:25 +00:00
Mattias Granlund
915426ea4e Truncate long branch names in commit list item header 2023-11-29 20:32:13 +00:00
Kiril Videlov
4fd8c890c9 chore: increase z-index value for .popup element to prevent it from being overlapped by other elements 2023-11-29 20:31:50 +00:00
Mattias Granlund
1c2073b980 🔨 chore: remove badge count in applied branches component 2023-11-29 20:30:58 +00:00
Mattias Granlund
55f6130a95 Fix image copy when dragging a lane 2023-11-29 18:14:43 +00:00
Mattias Granlund
41634e1ae5 Fix duplicate PR bug 2023-11-29 17:51:50 +00:00
Mattias Granlund
3eafd5af42 Show number of applied branches in sidebar 
- Pavel will think about this still
 2023-11-29 17:51:38 +00:00
Mattias Granlund
8b22c518bc Enforce use of drag handle with branches 2023-11-29 17:27:44 +00:00
Mattias Granlund
cdbeba18c7 🔧 fix: add default color to SVG icons for better styling consistency 2023-11-29 16:17:48 +00:00
Mattias Granlund
7ffbcf51b3 Refactor the project selection page 2023-11-29 15:54:28 +00:00
Nikita Galaiko
448fcea28e feat: add support for merging or rebasing out-of-date branch before applying changes 2023-11-29 15:29:39 +01:00
Nikita Galaiko
9e9d2b5ecc more test assertions 2023-11-29 15:28:21 +01:00
Nikita Galaiko
325d5b6539 remote duplicated test 2023-11-29 15:01:10 +01:00
Nikita Galaiko
619f40cf68 trigger async push and flush 2023-11-29 13:41:28 +01:00
Nikita Galaiko
798e736276
Merge pull request #1837 from gitbutlerapp/update-base-branch 
GB-674: simplify update base branch
 2023-11-29 13:27:54 +01:00
Nikita Galaiko
c513de478c simplify update branch logic 2023-11-29 13:11:47 +01:00
Mattias Granlund
6cd9f9b2d9 Make eslint fail lint on unused variables 2023-11-29 10:50:34 +00:00
Mattias Granlund
42ca5c5952 Fix lint warnings 2023-11-29 10:50:26 +00:00
Mattias Granlund
ad11d82ae9 Update styling for base branch view 2023-11-29 10:48:39 +00:00
Mattias Granlund
9f2d4f2359 Display PR body as markdown 2023-11-29 10:26:22 +00:00
Mattias Granlund
7d99ac6b52 ✨ feat: add support for readonly mode in commit card 2023-11-29 10:18:48 +00:00
Mattias Granlund
24ecfabf57 Improve the PR preview page a bit 2023-11-29 10:17:23 +00:00
Mattias Granlund
8213e0628c 🔥 refactor: remove crossfade transition from commit boxes 2023-11-29 09:38:23 +00:00
Mattias Granlund
fb96d91164 Rename LocalCommits to CommitList 2023-11-29 09:30:28 +00:00
Mattias Granlund
4f35b90508 Drop unused remote/integrated commits code 2023-11-29 09:30:28 +00:00
Mattias Granlund
a372f3b5cf 🔧 fix: decrease timeout for tooltip to improve user experience 2023-11-29 09:25:06 +00:00
Mattias Granlund
65d1c0e629 🔨 chore: add readonly prop to Commit component to prevent actions when in readonly mode 2023-11-29 09:24:43 +00:00
Nikita Galaiko
20782cec64
Merge pull request #1826 from gitbutlerapp/fix-conflict-markers 
test apply after update base
 2023-11-29 10:21:23 +01:00
Mattias Granlund
2548ced85c Improve UI for stashed branch header 2023-11-29 09:19:23 +00:00
Nikita Galaiko
7c7fe88453 test apply after update base 2023-11-29 10:14:25 +01:00
Mattias Granlund
e9bb16488f 🐛 fix: handle sync status properly when fetching and reloading data 2023-11-29 09:14:20 +00:00
Mattias Granlund
547fb02d13 🔨 chore: increase sleep time before creating PR to accommodate for GitHub's processing time 2023-11-29 09:14:12 +00:00
Mattias Granlund
f1c49b2d51 Goto board after apply/delete 2023-11-29 09:13:16 +00:00
Nikita Galaiko
83d1edcc71 fix warning condition 2023-11-29 09:54:11 +01:00
Mattias Granlund
57ef71fd0c Fix the UI bug when dragging file card 2023-11-29 00:51:42 +00:00
Mattias Granlund
00dbf95444 Fix scrolling/resizing in files section of branch 2023-11-29 00:41:48 +00:00
Mattias Granlund
1fa737e40f Await reload of prs before loading is set to false 2023-11-29 00:05:59 +00:00
PavelLaptev
5172ca2b07 Wip 2023-11-29 00:59:40 +01:00
PavelLaptev
96c1fb0064 Test undo 2023-11-29 00:46:57 +01:00
PavelLaptev
874e8f2e4b Test 2023-11-29 00:46:18 +01:00
PavelLaptev
2caddf48c1 Test 2023-11-29 00:45:43 +01:00
PavelLaptev
4e5567391e body background update, commit card update 2023-11-29 00:45:17 +01:00
PavelLaptev
6abcf57057 merged upstream 2023-11-29 00:38:42 +01:00
PavelLaptev
d3a8e9c3fb very long commit message just to test how it works and if it 2023-11-29 00:38:29 +01:00