Commit Graph

4534 Commits

Author SHA1 Message Date
Mattias Granlund
01da5bee3e Refactor error pages
- new switched away from page
- new problem loading repo page
2024-01-15 20:35:40 +01:00
Kiril Videlov
6d96b0bf23 🔨 chore: fix out of bounds error in context_before loop 2024-01-15 15:37:22 +02:00
Kiril Videlov
7d9360662f 🐛 fix: off-by-one error in context lines calculation 2024-01-15 15:22:39 +02:00
Kiril Videlov
f5da2f012d 🐛 fix: fix index out of bounds error in context line generation 2024-01-15 15:22:39 +02:00
Pavel Laptev
e69af1b620
Merge pull request #2249 from gitbutlerapp/update-color-variables-and-text-styles
Update color variables and text styles
2024-01-15 12:53:13 +01:00
Pavel Laptev
90ff0c970b Added Iosevka font 2024-01-15 12:51:18 +01:00
Pavel Laptev
91eef7cb73 new text style added, tokens updated 2024-01-15 12:36:26 +01:00
Nikita Galaiko
5cd3b88f5e
Merge pull request #2248 from gitbutlerapp/handle-preferred-key-validation
GB-754: Handle preferred key validation
2024-01-15 10:57:23 +01:00
Nikita Galaiko
1fd6b81c0f remove console.log 2024-01-15 10:31:10 +01:00
Nikita Galaiko
e70cf60cca ensure key is file 2024-01-15 09:45:40 +01:00
Nikita Galaiko
c75cf09bcf send local key update on change 2024-01-15 09:43:31 +01:00
Nikita Galaiko
cc17805694 validate preferred key on the backend 2024-01-15 08:19:54 +01:00
Pavel Laptev
74c495bc2a
Merge pull request #2247 from gitbutlerapp/update-welcome-page-and-tokens
Update welcome page and tokens
2024-01-14 23:28:57 +01:00
Pavel Laptev
9f89cfcb65 removed test variable 2024-01-14 23:25:27 +01:00
Pavel Laptev
8c24b321cf merged from upstream 2024-01-14 23:23:21 +01:00
Pavel Laptev
cd27581c45 updated welcome screen + tokens 2024-01-14 23:23:01 +01:00
Pavel Laptev
317347564d updated welcome screen + tokens 2024-01-14 23:22:52 +01:00
Kiril Videlov
90e71e6458 use zero context hunks internally
Use hunks with zero context lines for virtual branch ownership. Reconstruct the context lines before returning hunks to the frontend
working on tests WIP
handle new files
cleanup comments
skip binary files
🐛 fix: add trailing newline to diff string in hunk_with_context function
handle empty diffs
fix diff header expectations
2024-01-14 23:42:34 +02:00
Pavel Laptev
1ec3c3bfaa
Merge pull request #2246 from gitbutlerapp/icons-updated
images updated
2024-01-14 15:53:41 +01:00
Pavel Laptev
1192d4c912 merged from upstream 2024-01-14 15:51:42 +01:00
Pavel Laptev
b79128a382 images updated 2024-01-14 15:51:37 +01:00
Pavel Laptev
3f6b82b962 images updated 2024-01-14 15:51:09 +01:00
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