Commit Graph

4392 Commits

Author SHA1 Message Date
Nikita Galaiko
6fe7fbda95
Merge pull request #2152 from gitbutlerapp/dependabot/cargo/bstr-1.9.0
chore(deps): bump bstr from 1.8.0 to 1.9.0
2024-01-08 12:16:46 +01:00
Mattias Granlund
a19939ea39 Fix zoom shortcuts on Linux 2024-01-08 10:24:45 +01:00
Nikita Galaiko
644359b821
Merge pull request #2187 from gitbutlerapp/refactor-session-writer-and-reader
refactor: with_reader for readers, open for writers
2024-01-08 10:04:52 +01:00
Nikita Galaiko
6503a15309 refactor: with_reader for readers, open for writers 2024-01-08 10:00:38 +01:00
Pavel Laptev
da5bacb4d3
Merge pull request #2186 from gitbutlerapp/experementing-with-app-icons
Experementing with app icons
2024-01-08 00:03:02 +01:00
Pavel Laptev
44e02739c9 - updated app icons 2024-01-07 23:57:21 +01:00
Pavel Laptev
c227b7dd39
Merge pull request #2185 from gitbutlerapp/experementing-with-app-icons
experementing with app icons
2024-01-07 23:09:37 +01:00
Pavel Laptev
12f05dbca6 - updated app icons 2024-01-07 23:03:57 +01:00
Mattias Granlund
f3a84e42dd Show button spinner while committing 2024-01-07 21:47:22 +01:00
Mattias Granlund
b13132b4a6 Slugify branch names differently
- user requested / in branch names
2024-01-07 15:24:21 +01:00
Mattias Granlund
29bacad3d9 Bugfix for context menu item disabled state 2024-01-07 15:02:57 +01:00
Mattias Granlund
f7c062eb7d Disable branch rename when it has integrated commits 2024-01-07 14:03:33 +01:00
Mattias Granlund
4381bdc196 Show gap between selected files in tree view 2024-01-06 13:28:08 +01:00
Mattias Granlund
f1a8617c92 Enabme shift + click for multiple drag & drop
- utilises .selected css class for knowing what elements are being dragged
- deselects list if dragging not selected item
2024-01-06 12:57:34 +01:00
Pavel Laptev
fda52f91fd
Merge pull request #2178 from gitbutlerapp/add-svg-icons
Updated svg icons
2024-01-05 16:32:00 +01:00
Pavel Laptev
2862dce977 updated assets 2024-01-05 16:30:27 +01:00
Pavel Laptev
5097eac2e2
Merge pull request #2177 from gitbutlerapp/virtual-branch-1
Branch header CSS tweaks
2024-01-05 15:34:19 +01:00
Pavel Laptev
59d9039119 a few CSS updates to the Branch header 2024-01-05 15:32:08 +01:00
Pavel Laptev
942d757374
Merge pull request #2176 from gitbutlerapp/update-new-branch-styling
Update new branch styling
2024-01-05 15:25:32 +01:00
Pavel Laptev
1cc0787983 - branch header fixes 2024-01-05 15:23:34 +01:00
Pavel Laptev
46f093fdba - dragzone updates
- dialog cancel button style updates
2024-01-05 15:11:13 +01:00
Pavel Laptev
8d762f88d0 Merged origin/master into Update new branch styling 2024-01-05 14:34:17 +01:00
Pavel Laptev
ab0a19338e - new icons
- dropzone overlay component added
2024-01-05 14:34:13 +01:00
Mattias Granlund
f09563061e Add branch and pr links to header 2024-01-05 14:14:43 +02:00
Mattias Granlund
55ae30f62f Fix duplicate list_remote_branches call
- give head and fetches streams an initial value
2024-01-05 13:25:46 +02:00
Pavel Laptev
2c9270eee9 Merged origin/master into Update new branch styling 2024-01-05 12:00:29 +01:00
Pavel Laptev
4858d41606 changed the illustration images 2024-01-05 12:00:24 +01:00
Mattias Granlund
0fcf6877f7 Fix file status determination
- this broke when we stopped loading full file contents
2024-01-05 12:32:27 +02:00
Pavel Laptev
b5e04b8bca merged from upstream 2024-01-05 00:09:18 +01:00
Pavel Laptev
2cf90b2218 empty state - approach with svelte components 2024-01-05 00:08:53 +01:00
Pavel Laptev
715e3548aa empty state - approach with svelte components 2024-01-05 00:08:43 +01:00
Mattias Granlund
1b02c240b1 Show deleted instead of pending if branch has integrated commit(s) 2024-01-04 19:24:25 +02:00
Mattias Granlund
54773d0bfe Enable remote branch naming 2024-01-04 19:13:00 +02:00
Pavel Laptev
c92a25c335
Merge pull request #2170 from gitbutlerapp/line-height-fixing-some-css-updates
line-height fixing, some css updates
2024-01-04 12:34:38 +01:00
Pavel Laptev
b731d19c69 - Line height fixes
- branch header button size update
2024-01-04 12:29:19 +01:00
Pavel Laptev
493213be74
Merge pull request #2169 from gitbutlerapp/console-log-removed
console.log removed
2024-01-04 11:54:51 +01:00
Pavel Laptev
b377f37d29 removed console.log() 2024-01-04 11:53:06 +01:00
Mattias Granlund
7a3ba7324d Add new type of toast along with controller
- not hooked up to anything yet
- we need to catch specific errors and provide copy (plus action)
2024-01-04 11:21:09 +02:00
Pavel Laptev
1cafc36611
Merge pull request #2167 from gitbutlerapp/css-lineheight-and-changes-list-updated
CSS: lineheight and changes list updated
2024-01-04 01:24:59 +01:00
Pavel Laptev
5809ab86bd refactor: remove unused code and styles 2024-01-04 01:23:25 +01:00
Pavel Laptev
955d21ab38 - Updated changes list CSS
- Updated default line-height to 120%
- Commitbox line-height updated
2024-01-04 01:20:24 +01:00
Qix
d70c6a970b
Merge pull request #2154 from gitbutlerapp/dependabot/npm_and_yarn/typescript-eslint/parser-6.16.0
chore(deps-dev): bump @typescript-eslint/parser from 6.14.0 to 6.16.0
2024-01-03 21:25:26 +01:00
Qix
4fcce6a0be
Merge pull request #2155 from gitbutlerapp/dependabot/cargo/reqwest-0.11.23
chore(deps): bump reqwest from 0.11.22 to 0.11.23
2024-01-03 21:25:05 +01:00
Qix
879ac5f245
Merge pull request #2156 from gitbutlerapp/dependabot/cargo/thiserror-1.0.53
chore(deps): bump thiserror from 1.0.50 to 1.0.53
2024-01-03 21:24:53 +01:00
Qix
867e1870d6
Merge pull request #2164 from gitbutlerapp/gitbutler-core-lib-docs
add core lib module docs
2024-01-03 20:23:22 +01:00
Qix
e29ab41b46
Merge pull request #2165 from gitbutlerapp/id-newtype-docs
add core lib id docs
2024-01-03 20:13:52 +01:00
Josh Junon
2a21bd5880 add core lib module docs 2024-01-03 20:11:22 +01:00
Josh Junon
354afedea2 add core lib id docs 2024-01-03 20:02:39 +01:00
Pavel Laptev
e67e1b983f
Merge pull request #2163 from gitbutlerapp/update-virtual-branch-svg
Update virtual branch svg
2024-01-03 17:54:18 +01:00
Pavel Laptev
cd2cfad353 fix: adjust position of virtual branch icon in UI 2024-01-03 17:52:09 +01:00