Pavel Laptev
522e0546f5
Filter popup menu checkbox and toggle size updated
2023-12-13 20:59:01 +01:00
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
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
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
Pavel Laptev
75b8216918
loader hight fixed
2023-12-12 17:31:59 +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
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
9be36ef6af
add descritpion to force pushing preference
2023-12-12 12:15:19 +01:00
Nikita Galaiko
08e41f46d1
reflect squashing rules in ui
2023-12-12 10:18:34 +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
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
9c157ae0af
do not show create pr button for pushed branches
2023-12-11 14:00:51 +01:00
Nikita Galaiko
a1e4e651cc
ui for ok with force pushing
2023-12-11 11:17:20 +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
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
0e98acd370
Wip
2023-12-08 17:03:22 +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
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
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
Pavel Laptev
0cc4e089a8
new icons
2023-12-06 17:20:18 +01:00
Pavel Laptev
daa2187ca3
radio and toggle added
2023-12-06 16:37:46 +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
Mattias Granlund
4ffad7a466
Use textbox components in settings page
2023-12-05 23:09:15 +00: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
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
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
Mattias Granlund
95449584f9
Rename /user to /settings in frontend
2023-12-05 15:34:02 +00: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
Mattias Granlund
dc6fa34ee5
Update external link icon
2023-12-05 14:59:34 +00: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
65fc2d1cc3
Merge pull request #1930 from gitbutlerapp/refactor-delete-branch-function
...
support deletion of applied branches
2023-12-05 15:26:32 +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
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
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