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 |
|