Mattias Granlund
9d99fb6fdf
Fix new filecard dark mode
2023-07-19 17:27:41 +02:00
Kiril Videlov
13ce43ee84
touchups
2023-07-19 16:39:24 +02:00
Mattias Granlund
4eb0d6ea9a
Introduce new file card
...
This builds on work done by Kiril, now making FileCardNext the default
viewing component.
- hunks are currently not abbreviated to one line
- right click on hunk for context menu
- double click on hunk to toggle wide mode
- open in vs code is almost accurate
2023-07-19 16:23:13 +02:00
Kiril Videlov
94ff9506e3
different icon for dev mode
2023-07-19 15:12:16 +02:00
Nikita Galaiko
8028eaaa67
do not show target branch in the tray
2023-07-19 14:45:14 +02:00
Kiril Videlov
351e4a5037
flattening
2023-07-19 14:20:19 +02:00
Nikita Galaiko
345c74ba62
include left lines into hash caclulation
2023-07-19 12:46:14 +02:00
Scott Chacon
59b0604d7e
Formatting
2023-07-19 11:33:04 +02:00
Scott Chacon
56ba838334
tests and symlinks
2023-07-19 11:33:04 +02:00
GitButler
a02e2e1c82
Formatting
2023-07-19 11:33:04 +02:00
GitButler
62bc434869
Check if a file is executable and use that mode
2023-07-19 11:33:04 +02:00
Nikita Galaiko
b810a73d2f
stop assuming push remote name
2023-07-19 10:45:52 +02:00
Nikita Galaiko
7ce2428304
rm unused printlns
2023-07-19 10:45:52 +02:00
Nikita Galaiko
c7f29f5cb8
cargo fmt
2023-07-19 10:45:52 +02:00
Nikita Galaiko
2b5e981e28
use branch::Name for virtual_branches
2023-07-19 10:45:52 +02:00
Nikita Galaiko
e458bfd077
cargo fmt
2023-07-19 10:45:52 +02:00
Nikita Galaiko
11730aa7af
create git branch name module
2023-07-19 10:45:52 +02:00
Nikita Galaiko
4299d63074
rm unused parameter
2023-07-19 10:45:52 +02:00
GitButler
c4c8d2c703
bringing back bottom bar
2023-07-18 17:04:12 +02:00
GitButler
971955c77a
add a flag on HunkSection to signify when a hunk has conflict markers
2023-07-18 14:37:34 +02:00
Nikita Galaiko
edb05f5cbf
chmod +x scripts/release.sh
2023-07-18 13:38:01 +02:00
GitButler
5000c577a6
use git config if it exists
2023-07-18 13:11:27 +02:00
GitButler
2f1bc32363
get default user from git config if we’re not logged in
2023-07-18 13:11:27 +02:00
nikita@galaiko.rocks
4b38e8b75d
fix actions condition
2023-07-18 12:59:45 +02:00
nikita@galaiko.rocks
f2cdf79439
do not flush session/wd tree
2023-07-18 12:54:55 +02:00
nikita@galaiko.rocks
ffc2a993f1
--verbose build
2023-07-18 12:54:33 +02:00
nikita@galaiko.rocks
a837895a86
do not cache pnpm in berlin
2023-07-18 10:27:54 +02:00
nikita@galaiko.rocks
5ca9a644d2
cargo fmt
2023-07-18 09:28:01 +02:00
nikita@galaiko.rocks
3c579ef577
consider adding the same hunk an update
2023-07-18 09:28:01 +02:00
GitButler
16b70977c4
file card next basic styling
2023-07-18 01:12:41 +02:00
Ian Donahue
c1e90b5ed5
Merge pull request #732 from gitbutlerapp/ian/card-and-hunk-space-adjustment
...
Ian/card and hunk space adjustment
2023-07-17 17:26:34 +02:00
idonahue
1b761b15e3
pnpm format
2023-07-17 17:22:10 +02:00
idonahue
76ef62cfa7
Card and hunk space adjustment
2023-07-17 17:17:45 +02:00
nikita@galaiko.rocks
1c71dfd511
proxy remote branch autors avatars
2023-07-17 16:13:16 +02:00
nikita@galaiko.rocks
922046d9c3
singleton assets proxy
2023-07-17 16:13:16 +02:00
GitButler
1300888d82
rm assets mod
2023-07-17 14:49:26 +02:00
GitButler
2ebb1438c9
store singleton zipper in a state
2023-07-17 14:49:26 +02:00
Ian Donahue
09a8c78c1a
Merge pull request #705 from gitbutlerapp/ian/button-fixes-july-13
...
Ian/button fixes july 13
2023-07-17 14:43:13 +02:00
GitButler
18f1e0f265
styling FileCardNext (copying from the onld one)
2023-07-17 14:41:40 +02:00
Nikita Galaiko
d4ea56e38e
cleanup tauri deps
2023-07-17 13:41:58 +02:00
Nikita Galaiko
d1fc5d23e0
move butler to another crate
2023-07-17 13:41:58 +02:00
Nikita Galaiko
f0f615c150
refactor cmd
2023-07-17 10:47:22 +02:00
Nikita Galaiko
f23ff295fc
fix merge conflicts
2023-07-17 10:42:57 +02:00
Nikita Galaiko
c923722cad
make upstream optional
2023-07-17 09:12:20 +02:00
Nikita Galaiko
b2fb64c071
use merge name & branch, remove description
2023-07-17 09:12:20 +02:00
Nikita Galaiko
a985bc9769
set bump type inside the pipeline
2023-07-17 08:07:11 +02:00
Nikita Galaiko
1b5525fd8e
separate builds by channel inside the s3 bucket
2023-07-17 08:07:11 +02:00
Kiril Videlov
5d49f59f48
add syntax highliting
2023-07-16 22:05:54 +02:00
Kiril Videlov
22abebc056
rendering of file sections
2023-07-16 22:05:54 +02:00
Kiril Videlov
96079c52a5
fixes
2023-07-16 22:05:54 +02:00