gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,029 Commits 148 Branches 1,032 Tags 66 MiB
6089678198
Commit Graph

4029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
87e8108af3
Merge pull request #1961 from gitbutlerapp/improve-label-editing-using-keyboard 
Improve label editing using keyboard
 2023-12-08 15:17:18 +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
6ded5a39a6
Merge pull request #1959 from gitbutlerapp/update-color-variables 
Update color variables
 2023-12-07 14:05:57 +01:00
Pavel Laptev
f6f9d57520 Update 2023-12-07 14:03:22 +01:00
Pavel Laptev
8e027d13b6
Merge pull request #1958 from gitbutlerapp/improve-header-left-styling-sdfsdfsdf-sdfsdf 
Improve header left styling sdfsdfsdf sdfsdf
 2023-12-07 13:17:25 +01:00
Pavel Laptev
935376ed8c Wip 2023-12-07 13:14:37 +01:00
Pavel Laptev
1f4d20e510
Merge pull request #1956 from gitbutlerapp/add-search-and-filter-icons 
Add search and filter icons
 2023-12-07 11:22:41 +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
d1d479b307
Merge pull request #1955 from gitbutlerapp/add-new-components 
Add new components
 2023-12-06 16:40:05 +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
cc27099b75
Merge pull request #1954 from gitbutlerapp/refactor-posthog-client 
Refactor posthog client
 2023-12-06 14:27:08 +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
Qix
1e66a6eec8
Merge pull request #1947 from gitbutlerapp/ui-server-prelaunch-task 
Make the UI dev server run prior to debugging in vs code
 2023-12-05 17:54:36 +01:00
github@josh.junon.me
edde0d45fd make the UI dev server run prior to debugging in vs code 2023-12-05 17:53:54 +01: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
15a2905587
Merge pull request #1942 from gitbutlerapp/margin-fix 
Margin fix between items in branches
 2023-12-05 16:52:10 +01: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
fdd6cb5ac0
Merge pull request #1939 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-899c626 
chore(deps): bump tauri-plugin-single-instance from `6a19fec` to `899c626`
 2023-12-05 16:46:21 +01: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
dependabot[bot]
cf9a54a552
chore(deps): bump tauri-plugin-single-instance 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `6a19fec` to `899c626`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](6a19feca1d...899c6262f8)

---
updated-dependencies:
- dependency-name: tauri-plugin-single-instance
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:15:51 +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
3217448ffa
Merge pull request #1920 from gitbutlerapp/dependabot/cargo/serde-1.0.193 
chore(deps): bump serde from 1.0.190 to 1.0.193
 2023-12-05 16:15:20 +01:00