Pavel Laptev
99ecbd19bf
Merge pull request #2245 from gitbutlerapp/icons-updated
...
iocns updated
2024-01-14 15:23:53 +01:00
Pavel Laptev
410e54f512
iocns updated
2024-01-14 15:21:09 +01:00
Pavel Laptev
858a57d1c9
Merge pull request #2244 from gitbutlerapp/branch-header-updated
...
Branch header updates
2024-01-14 14:53:52 +01:00
Pavel Laptev
7c5e4a7360
Branch header updates
2024-01-14 14:50:46 +01:00
Mattias Granlund
456906d2e7
Make welcome screen responsive
...
- missed in earlier commit
2024-01-14 14:13:10 +01:00
Mattias Granlund
bec89c61fa
New design for first experience and errors
...
- new welcome screen
- default to last opened project
- show decorated view when branch changed
- show decorated error view when repo can't be loaded
This commit became a bit too big, with many interdependent changes. Keep an eye out for regressions.
2024-01-14 13:59:28 +01:00
Pavel Laptev
219897bf30
Merge pull request #2241 from gitbutlerapp/project-setup-illustration-update
...
Project setup illustration update
2024-01-14 00:41:31 +01:00
Pavel Laptev
ce9750bacc
Project setup illustration update
2024-01-13 23:40:37 +01:00
Kiril Videlov
3419240e19
fix a bug where dragover and drop events dont fire
...
this happens when the webview is chromium (widnows, linux)
2024-01-14 00:30:00 +02:00
Kiril Videlov
5b7f63739b
🔨 chore: update remote URLs in tests to match new repository location
2024-01-13 17:40:47 +01:00
Scott Chacon
83dfef1409
Merge pull request #2236 from gitbutlerapp/remove-bundled-size
...
Remove bundled size
2024-01-12 11:18:00 +01:00
Scott Chacon
8c77f1c994
Remove bundled size
...
It is vastly different for different builds
2024-01-12 11:17:36 +01:00
Scott Chacon
09a4fc07b9
Merge pull request #2235 from gitbutlerapp/updated-readme
...
Update README.md
2024-01-12 11:07:55 +01:00
Scott Chacon
76904ca350
Update README.md
2024-01-12 11:07:26 +01:00
Nikita Galaiko
ab7e4eb73f
Merge pull request #2234 from gitbutlerapp/push-all-refs
...
Push all refs
2024-01-12 09:04:25 +01:00
Nikita Galaiko
43b071fb18
do not hide network error
2024-01-12 08:56:29 +01:00
Nikita Galaiko
d123832636
Merge pull request #2226 from gitbutlerapp/add-is-default-to-branch
...
GB-781 Add is default to branch
2024-01-12 08:13:34 +01:00
Pavel Laptev
3984307fa4
Merge pull request #2233 from gitbutlerapp/split-screen-component-updates
...
split screen styles updates
2024-01-12 02:00:20 +01:00
Pavel Laptev
945157c8c5
- styles updated
2024-01-12 01:58:26 +01:00
Pavel Laptev
60208e3428
Merge pull request #2232 from gitbutlerapp/split-screen-component-updates
...
split screen component updates
2024-01-12 01:26:46 +01:00
Pavel Laptev
1523d5f8cf
- added imgThemed — for images that have dark and light themes
...
- styles updated
2024-01-12 01:24:59 +01:00
Scott Chacon
6bdf274930
Merge pull request #2231 from gitbutlerapp/prep-open-source-docs
...
Prep Open Source docs
2024-01-11 19:54:05 +01:00
Scott Chacon
718643022b
add a bunch of basic docs that we need for open sourcing this bad boy
2024-01-11 19:52:52 +01:00
Mattias Granlund
77dd15f7d2
Add PP Editorial New serif font
2024-01-11 17:21:41 +01:00
Mattias Granlund
1579728fde
Add IconLink component
2024-01-11 17:21:33 +01:00
Pavel Laptev
cde7a5750d
Merge pull request #2228 from gitbutlerapp/update-svg-icons
...
Update svg icons
2024-01-11 16:04:15 +01:00
Pavel Laptev
9b58c53636
new icons
2024-01-11 16:02:19 +01:00
Nikita Galaiko
fd3b443899
avoid race conditions by using timestamp instead of bool
2024-01-11 15:39:30 +01:00
Nikita Galaiko
38647d20a5
refactor: is_default -> selected_for_changes
2024-01-11 14:58:57 +01:00
Pavel Laptev
8db28ea0e3
Merge pull request #2227 from gitbutlerapp/update-svg-icons
...
Update svg icons
2024-01-11 14:46:33 +01:00
Pavel Laptev
c2c5d7e9d0
new icons
2024-01-11 14:44:47 +01:00
Nikita Galaiko
dbe83d5f2d
cargo fmt
2024-01-11 12:40:35 +01:00
Nikita Galaiko
3fd0936f54
fix: distribute hunks to the correct virtual branch based on default branch position
2024-01-11 12:37:50 +01:00
Nikita Galaiko
c376549a1f
feat: add support for setting a virtual branch as the default branch
2024-01-11 10:38:22 +01:00
Mattias Granlund
b3664cb462
Refactor project setup page
2024-01-11 00:30:32 +01:00
Kiril Videlov
e8259a54d0
🎨 style: update resizer styles for better user experience
2024-01-11 00:25:06 +01:00
Pavel Laptev
586c5b3ffe
Merge pull request #2223 from gitbutlerapp/update-theme-container-colors
...
Updated tokens
2024-01-10 22:09:01 +01:00
Pavel Laptev
50ede9188c
Updated tokens
2024-01-10 22:07:07 +01:00
Kiril Videlov
a5fca009a1
🔥 refactor: remove unused summarizeHunk function and its usage
2024-01-10 19:42:06 +01:00
Kiril Videlov
548a5b8f56
💄 style: add hover effect to resizer in CSS
2024-01-10 18:22:08 +01:00
Mattias Granlund
fb339aa8a8
fix: handle case when no files are selected for branch creation
2024-01-10 16:15:32 +01:00
Mattias Granlund
85fbbf428f
fix: properly handle commit completion and reset commit message
2024-01-10 14:38:12 +01:00
Nikita Galaiko
dd420176ec
Merge pull request #2217 from gitbutlerapp/test-integrate-work-while-being-behind
...
fix integrating fully merge branch while being behind
2024-01-10 13:19:23 +01:00
Nikita Galaiko
e1ee69a348
fix integrating fully merge branch while being behind
2024-01-10 12:37:23 +01:00
dependabot[bot]
e082b3006b
chore(deps-dev): bump @codemirror/state from 6.3.1 to 6.4.0
...
Bumps [@codemirror/state](https://github.com/codemirror/state ) from 6.3.1 to 6.4.0.
- [Changelog](https://github.com/codemirror/state/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/state/compare/6.3.1...6.4.0 )
---
updated-dependencies:
- dependency-name: "@codemirror/state"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-10 10:49:01 +00:00
Kiril Videlov
4247d71294
Revert "chore(deps-dev): bump @codemirror/lang-vue from 0.1.2 to 0.1.3"
...
This reverts commit 8eeadb1da0
2024-01-10 11:46:07 +01:00
Kiril Videlov
df63e15017
Revert "chore(deps-dev): bump @codemirror/lang-html from 6.4.6 to 6.4.7"
...
This reverts commit 8d4a41892b
2024-01-10 11:46:07 +01:00
Nikita Galaiko
31a101fff1
Merge pull request #2215 from gitbutlerapp/rrrrr
...
revert some more reverts
2024-01-10 11:42:26 +01:00
Kiril Videlov
2f2f2b5eba
Revert "Revert "remove sentry api key from source code""
...
This reverts commit 72e6df813f
2024-01-10 10:48:19 +01:00
Kiril Videlov
52ee682185
Revert "Revert "chore: add SENTRY_AUTH_TOKEN environment variable to script""
...
This reverts commit 462815c0af
2024-01-10 10:48:03 +01:00
