gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 16:41:32 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,415 Commits 157 Branches 1,064 Tags 61 MiB
f4a935c600
Commit Graph

889 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Mattias Granlund
6e64d3fbcc Wait for prs to reload after creating pr 2023-11-30 10:07:48 +00: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
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
Mattias Granlund
2548ced85c Improve UI for stashed branch header 2023-11-29 09:19:23 +00: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
Mattias Granlund
5973ce4364 🔧 fix: update getGithubContext to only emit distinct values when baseBranch remoteUrl changes 2023-11-28 23:30:04 +00:00
PavelLaptev
b7c5dc3e56 merged upstream 2023-11-29 00:14:00 +01:00
PavelLaptev
d1d20c063e Wip 2023-11-29 00:13:46 +01:00
Mattias Granlund
71cce6730e 🐛 fix: clear selected file ID when closing file modal 2023-11-28 23:01:13 +00:00
Mattias Granlund
8f1a8805a9 🔨 chore: update text alignment in branch card component 2023-11-28 23:00:54 +00:00
Mattias Granlund
66154ce440 🔨 chore: optimize PR loading by adding skipCache option and logging for debugging 2023-11-28 22:40:14 +00:00
PavelLaptev
898834a7ee new tag color, tokens typo fix 2023-11-28 23:15:52 +01:00
PavelLaptev
8e9725e856 Changed cursor for the branch label 2023-11-28 22:48:52 +01:00
PavelLaptev
f13b33e6e3 new icon 2023-11-28 22:39:23 +01:00
Mattias Granlund
1216c5e647 🔧 fix: center align h1 and p elements in new-branch section 2023-11-28 21:31:03 +00:00
Mattias Granlund
adacf168be Fix lint warnings 2023-11-28 21:30:14 +00:00
Mattias Granlund
fb3a1b4e49 🔧 fix: center align h1 in .no-changes class 2023-11-28 21:30:07 +00:00
Mattias Granlund
cc9a6a5b70 🔨 chore: update PrService to support injecting and retrieving additional Pull Requests 2023-11-28 21:10:48 +00:00
Mattias Granlund
2c08ae499a 🔧 fix: handle push failure gracefully and display error message 2023-11-28 20:59:03 +00:00
Mattias Granlund
e0d889dd85 ✨ feat: add sleep function to delay PR creation after pushing branch 2023-11-28 19:42:31 +00:00
Mattias Granlund
66c2e6f3ab ✨ feat: add support for creating pull requests when pushing commits 2023-11-28 19:38:49 +00:00
Mattias Granlund
ace186e6cf Testing create PR 2023-11-28 18:54:33 +00:00
Mattias Granlund
70938bdd4e 🔧 fix: try and fix create pr button 2023-11-28 18:54:16 +00:00
Mattias Granlund
93ce6917dd Fix clowny mistake 2023-11-28 18:53:59 +00:00
Mattias Granlund
b88030c81b 🔨 chore: add conditional rendering for update button based on base branch status 2023-11-28 18:43:28 +00:00
Mattias Granlund
87b9b2f3c4 🔨 chore: add clickable behavior to error Tag component 2023-11-28 18:34:09 +00:00
Mattias Granlund
999f7db224 Move sync and update buttons 2023-11-28 18:28:35 +00:00
Mattias Granlund
151924ea8a Make wide option for regular buttons 2023-11-28 18:15:06 +00:00
Mattias Granlund
3b0777fe4c Change PR tag to say "PR" 2023-11-28 18:15:06 +00:00
Kiril Videlov
516f3700a1 chore: update Prettier configuration files to use JSON format instead of JavaScript module format 2023-11-28 18:52:02 +01:00
Mattias Granlund
2b89f67040 Add back hacky reset head commit button 
- will be updated soon
 2023-11-28 17:33:24 +00:00
Mattias Granlund
7e7eac663f Show only "create pull request" for remote commits 2023-11-28 17:33:24 +00:00
Mattias Granlund
b6771b6018 Refactor and restyle commit boxes 2023-11-28 17:33:24 +00:00
Mattias Granlund
ea32af1022 Add a couple of icons 2023-11-28 16:14:53 +00:00
Kiril Videlov
86ccd3b4bd fix: automatically generate branch name for virtual branches with one-liner changes 2023-11-28 16:21:52 +01:00
Kiril Videlov
124aacef4e chore: update prettier configuration file paths and format 2023-11-28 15:53:31 +01:00
PavelLaptev
df6a31d9a4 Wip 2023-11-28 15:44:45 +01:00
PavelLaptev
7543609d62 Fixes 2023-11-28 15:42:59 +01:00
Mattias Granlund
652912a589 Make file tree files draggable 2023-11-28 14:30:13 +00:00
Mattias Granlund
1f7a03f59d Add new button for push/pr action 2023-11-28 14:27:46 +00:00
Kiril Videlov
3117769556 chore: add draggable region to window and update class order for offline status indicator 2023-11-28 15:04:58 +01:00
Kiril Videlov
c077bd965a chore: update file rendering logic and transition animation in Svelte component 2023-11-28 14:30:17 +01:00
PavelLaptev
83ba2188a4 merged upstream 2023-11-28 14:11:57 +01:00
PavelLaptev
7e44ea0df9 Fix 2023-11-28 14:11:46 +01:00
Kiril Videlov
9e37883aaa fix: update fetch order to first sync to cloud and then fetch from target 2023-11-28 13:56:56 +01:00
Kiril Videlov
3be483085a refactor: add readonly prop to BranchHeader component 2023-11-28 13:54:00 +01:00
PavelLaptev
a4f0f92e10 merged upstream 2023-11-28 13:42:18 +01:00
PavelLaptev
e31cee245a Css fixes 2023-11-28 13:42:03 +01:00
Kiril Videlov
4e466572c1 chore: update branch display layout and add tooltip for merge conflict information 2023-11-28 12:59:15 +01:00
Mattias Granlund
14d2e43294 Make file tree items selectable 2023-11-28 10:51:55 +00:00
Mattias Granlund
5240596ab0 🔨 chore: fix conditional statement for file lock tooltip in header component 2023-11-28 10:44:07 +00:00
Mattias Granlund
160c860425 Add modified lines and file status to file card 2023-11-28 09:58:24 +00:00
Mattias Granlund
5ba99206b9 Add loading status tooltip with spinner icon 2023-11-28 09:58:04 +00:00
Mattias Granlund
a54ed979f3 Remove concept of sessions from front end 2023-11-28 10:09:22 +01:00
PavelLaptev
666da83180 segment control css update 2023-11-28 01:40:45 +01:00
Mattias Granlund
48db234f2a Improve behaviour of file selection 2023-11-28 00:13:08 +00:00
Mattias Granlund
174e295f3a Improve no changes branch state 2023-11-28 00:13:08 +00:00
PavelLaptev
2d51fdcf1d css fixes 2023-11-28 00:55:23 +01:00
Pavel Laptev
352a626817
Merge branch 'master' into css-changes 2023-11-28 00:50:06 +01:00
PavelLaptev
0ebac9075d css fixes 2023-11-28 00:45:20 +01:00
Mattias Granlund
fb32a06d31 Make file card resizable 2023-11-27 22:39:41 +00:00
Mattias Granlund
ab29fd4e84 Add tags for file card 2023-11-27 23:08:59 +01:00
Mattias Granlund
42883198d0 Improve file selection in branch card 2023-11-27 22:28:43 +01:00
Mattias Granlund
344c24b702 Improve a bunch of stuff 2023-11-27 22:15:26 +01:00
Mattias Granlund
9e61bc05b0 Show file diff next to branch lane 2023-11-27 21:42:01 +01:00
Mattias Granlund
f2827b8978 fix: update dropdown component to include wrapper div for proper styling and positioning 2023-11-27 18:53:08 +00:00
Mattias Granlund
9471e8567a Move branch lane to branch card 2023-11-27 18:38:33 +00:00
Mattias Granlund
ca106bc3e4 Update navigation bar and selected states 2023-11-27 17:23:51 +00:00
Kiril Videlov
bb1928de1b fix lint issue 2023-11-27 18:18:44 +01:00
Kiril Videlov
fac45a2d6b chore: update styling and conditional rendering in branch component 2023-11-27 18:18:44 +01:00
PavelLaptev
61b09582f1 merged upstream 2023-11-27 18:02:01 +01:00
Mattias Granlund
5d3f2e7084 chore: update styling of input field to improve visibility and add placeholder color 2023-11-27 16:59:13 +00:00
Mattias Granlund
88526d237a Fix commit issue 
- selecting what to commit is currently unavailable
 2023-11-27 16:53:25 +00:00
PavelLaptev
22577c6d20 Update tokens 2023-11-27 17:47:39 +01:00
Mattias Granlund
efa80954f6 Refactor the commit box and dropdown button 2023-11-27 16:45:35 +00:00
Kiril Videlov
d1b73fe9cf chore: remove unused 'baseCurrent' property from Branch class and update its usage in applyBranch function 2023-11-27 14:28:43 +01:00
Kiril Videlov
927bc6c5c1 feat: rename activeBranches$ to stashedBranches$ in VirtualBranchService and update references in the component 2023-11-27 14:21:53 +01:00
Kiril Videlov
15e2c0eb2d chore: update branch conflict handling and apply button behavior 2023-11-27 14:07:17 +01:00
Mattias Granlund
5d3381cae9 Fix project selector 2023-11-27 11:45:29 +00:00
Mattias Granlund
da3516c31a Sync to cloud when clicking that button in the sidebar 2023-11-27 11:24:51 +00:00
Scott Chacon
dd8b7fd1b0
Merge pull request #1734 from gitbutlerapp/add-link-to-project-page 
Add link to project page
 2023-11-27 11:47:45 +01:00
Mattias Granlund
4a752ed086 Restyle button component and update all instances 2023-11-27 10:46:03 +00:00
Scott Chacon
1a1d7228ac
maybe formatted 2023-11-27 11:30:56 +01:00
Scott Chacon
6b950b3b16
add link to project page 2023-11-27 10:51:25 +01:00
Mattias Granlund
0c5bac544d Continue restyling branches 2023-11-27 00:56:53 +00:00
PavelLaptev
e7222250a1 input and textBox 2023-11-27 00:09:40 +01:00
PavelLaptev
c99a5f28d7 new icons 2023-11-26 21:14:45 +01:00
Mattias Granlund
dac321f3a0 Create components out of BranchLane stuff 2023-11-26 17:54:52 +00:00
Mattias Granlund
44a87b4001 Update branch lane header 2023-11-26 13:22:31 +00:00
PavelLaptev
9473d4b0fd fixes 2023-11-26 13:34:22 +01:00
Mattias Granlund
69a69788fb Create account link component and style it according to design 2023-11-26 11:54:15 +00:00
Mattias Granlund
032386e3cb Fix casing inconsistency in css tokens 2023-11-26 11:52:32 +00:00
Mattias Granlund
b23e5c1178 style: update loading state and styling for merge button 2023-11-26 11:51:27 +00:00
Mattias Granlund
58e4869998 Fix focus related bug in segmented control 2023-11-26 11:05:08 +00:00
PavelLaptev
d2f8610fb2 new icons 2023-11-26 03:29:22 +01:00
PavelLaptev
b198c64cab tokens update 2023-11-26 03:25:40 +01:00
Mattias Granlund
01efef77e0 Make segment controls equal width 2023-11-25 13:44:17 +00:00
Mattias Granlund
370b8f589b Update IconButton to reflect design 2023-11-25 13:41:39 +00:00
Mattias Granlund
cf3600a3f7 Auto close project selector 2023-11-25 12:24:43 +00:00
Mattias Granlund
d9f6249a55 Add branch filtering to sidebar 2023-11-25 12:23:14 +00:00
PavelLaptev
3687cf2d40 - updated sidebar paddings. Changed 16 to 12 spacers 2023-11-25 02:27:48 +01:00
PavelLaptev
a547df9b76 dark theme update 2023-11-25 02:09:51 +01:00
PavelLaptev
d398fa3d66 added new color tokens for accent outlines 2023-11-25 01:57:10 +01:00
PavelLaptev
4f7b8d68c3 styles updates 2023-11-25 00:48:46 +01:00
PavelLaptev
aa39b2c336 new profile icon 2023-11-24 16:00:58 +01:00
PavelLaptev
1c79b0cc73 busy icon added 2023-11-24 15:06:26 +01:00
PavelLaptev
ec588fef56 new-icons 2023-11-24 15:00:24 +01:00