Commit Graph

4603 Commits

Author SHA1 Message Date
Kiril Videlov
32a65ae110 feat: add instrumentation for creating pull requests in GitHub service 2024-01-16 22:49:33 +02:00
Kiril Videlov
1fc6aabde2 more tests for injecting of hunk context 2024-01-16 18:12:28 +02:00
Pavel Laptev
d93f76189c
Merge pull request #2272 from gitbutlerapp/update-icons-and-tag-icons
Update icons and tag icons
2024-01-16 16:58:33 +01:00
Pavel Laptev
010d4f0706 merged from upstream 2024-01-16 16:56:53 +01:00
Pavel Laptev
f72f9b15b0 updated icons, “disabled” state for the Tag component 2024-01-16 16:56:49 +01:00
Pavel Laptev
7703ab4c64 updated icons, “disabled” state for the Tag component 2024-01-16 16:56:38 +01:00
Mattias Granlund
3fb9dacbee More "problem state" improvements
- show project name on problem pages
- improve project switcher
2024-01-16 16:33:30 +01:00
Kiril Videlov
c981a10abe test: add more tests for the hunk context injection 2024-01-16 13:14:54 +02:00
Kiril Videlov
d59a78aa52 unit tests for hunk context lines 2024-01-16 12:38:25 +02:00
Pavel Laptev
65e34d095a
Merge pull request #2268 from gitbutlerapp/tokens-updates
tokens updates
2024-01-16 07:56:48 +01:00
Pavel Laptev
c316d9f4f1 tokens updates 2024-01-16 01:07:17 +01:00
Kiril Videlov
310d80394b 🐛 fix: handle potential index out of bounds error in context lines generation 2024-01-15 23:34:33 +02:00
Pavel Laptev
15c84d9fce
Merge pull request #2266 from gitbutlerapp/new-icon-tokens
new icons and tokens
2024-01-15 22:27:26 +01:00
Pavel Laptev
8c6b18d584 merged from upstream 2024-01-15 22:25:33 +01:00
Pavel Laptev
ee4552e8ee new icons and tokens 2024-01-15 22:25:15 +01:00
Pavel Laptev
ffc3c67e3b new icons and tokens 2024-01-15 22:24:43 +01:00
Kiril Videlov
f26321065e safe usize subtraction 2024-01-15 23:15:46 +02:00
Kiril Videlov
45352e1a6a sanitize branch url 2024-01-15 22:34:45 +02:00
Kiril Videlov
acf487a907 fix line context for commit diffs
when a file is new, we cant expect the parent commit to have the file
2024-01-15 22:29:10 +02:00
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