gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-01 20:45:57 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,768 Commits 148 Branches 1,031 Tags 66 MiB
7ca7dfd3e2
Commit Graph

2768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
91647507b0
Merge pull request #1087 from gitbutlerapp/refactor 
extract is_integrated calculation
 2023-08-24 09:57:44 +02:00
Nikita Galaiko
d141446d18 extract is_integrated calculation 2023-08-24 09:54:06 +02:00
Mattias Granlund
1aafe95943 Renaming TrayNext -> Tray, and FileCardNext -> FileCard 2023-08-23 15:42:53 +01:00
Mattias Granlund
19a023f455 Fixes all current eslint warnings 2023-08-23 15:33:21 +01:00
Mattias Granlund
d9f9e36ba5 Drop redundant refreshes of stores 
- we rely on dependencies between stores for most updates
 2023-08-23 15:03:46 +01:00
Mattias Granlund
ec7ea4cb6b Refresh vbranches when trunk changes 
- this will make sure "branch is integrated" becomes visible when repo is fetched
 2023-08-23 15:03:46 +01:00
Nikita Galaiko
bfc6f9f9ee
Merge pull request #1084 from gitbutlerapp/refactor 
simplify branch list
 2023-08-23 15:36:22 +02:00
Nikita Galaiko
32fc7a3783 simplify branch list 2023-08-23 15:17:59 +02:00
Mattias Granlund
47dadf3903 Removes the "New virtual branch" button 
- looks quite ugly
- in empty state we do not show it
 2023-08-23 13:52:08 +01:00
Mattias Granlund
8c935f2844 Always unhighlight after mosueup 2023-08-23 13:39:03 +01:00
Nikita Galaiko
7d6fa7a165
Merge pull request #1081 from gitbutlerapp/pnpm-updates 
name all tasks
 2023-08-23 14:38:45 +02:00
Nikita Galaiko
e14b03b24d refactor init 2023-08-23 14:30:50 +02:00
Nikita Galaiko
4b928fed61 name all tasks 2023-08-23 14:14:53 +02:00
Nikita Galaiko
2ab3ca135a merged upstream 2023-08-23 14:14:39 +02:00
Nikita Galaiko
99211ea776
Merge pull request #1079 from gitbutlerapp/pnpm-updates 
pnpm updates
 2023-08-23 13:49:56 +02:00
Nikita Galaiko
28b2fa558e pnpm updates 2023-08-23 13:47:59 +02:00
Kiril Videlov
a13a425f65 make minimum lane width smaller 2023-08-23 13:38:41 +02:00
Nikita Galaiko
ce364516b8
Merge pull request #1060 from gitbutlerapp/dependabot/cargo/src-tauri/tauri-plugin-window-state-6647e6e 
Bump tauri-plugin-window-state from `700549a` to `6647e6e` in /src-tauri
 2023-08-23 13:30:49 +02:00
Nikita Galaiko
646c8f23f7
Merge pull request #1059 from gitbutlerapp/dependabot/cargo/src-tauri/tauri-plugin-websocket-6647e6e 
Bump tauri-plugin-websocket from `700549a` to `6647e6e` in /src-tauri
 2023-08-23 13:30:41 +02:00
Nikita Galaiko
e156385e15
Merge pull request #1033 from gitbutlerapp/dependabot/cargo/src-tauri/tokio-tungstenite-0.20.0 
Bump tokio-tungstenite from 0.19.0 to 0.20.0 in /src-tauri
 2023-08-23 13:30:25 +02:00
Nikita Galaiko
355c9678b0
Merge pull request #1031 from gitbutlerapp/dependabot/cargo/src-tauri/urlencoding-2.1.3 
Bump urlencoding from 2.1.2 to 2.1.3 in /src-tauri
 2023-08-23 13:29:49 +02:00
Nikita Galaiko
b5bc83d88c
Merge pull request #1029 from gitbutlerapp/dependabot/cargo/src-tauri/filetime-0.2.22 
Bump filetime from 0.2.21 to 0.2.22 in /src-tauri
 2023-08-23 13:29:37 +02:00
Nikita Galaiko
519dddc18b
Merge pull request #1077 from gitbutlerapp/push-after-flush 
emit push after flush
 2023-08-23 13:02:28 +02:00
Nikita Galaiko
0b5bbcbd14 emit push after flush 2023-08-23 12:58:46 +02:00
Nikita Galaiko
4260d186d3
Merge pull request #1076 from gitbutlerapp/separate-pushing 
separate gitbutler data push
 2023-08-23 12:33:50 +02:00
Nikita Galaiko
5ad41123f9 separate gitbutler data push 2023-08-23 11:09:54 +02:00
Nikita Galaiko
7691c7294d
Merge pull request #1075 from gitbutlerapp/watcher-split-events 
Watcher split events
 2023-08-23 08:59:25 +02:00
Nikita Galaiko
374d3c7187 emit dedicated fetch events 2023-08-23 08:35:18 +02:00
Nikita Galaiko
527a21633b rm extra spans 2023-08-23 08:24:28 +02:00
dependabot[bot]
aa12e7e288
Bump urlencoding from 2.1.2 to 2.1.3 in /src-tauri 
Bumps [urlencoding](https://github.com/kornelski/rust_urlencoding) from 2.1.2 to 2.1.3.
- [Commits](https://github.com/kornelski/rust_urlencoding/commits)

---
updated-dependencies:
- dependency-name: urlencoding
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-22 13:17:58 +00:00
dependabot[bot]
a54ceb015a
Bump tokio-tungstenite from 0.19.0 to 0.20.0 in /src-tauri 
Bumps [tokio-tungstenite](https://github.com/snapview/tokio-tungstenite) from 0.19.0 to 0.20.0.
- [Changelog](https://github.com/snapview/tokio-tungstenite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/snapview/tokio-tungstenite/compare/v0.19.0...v0.20.0)

---
updated-dependencies:
- dependency-name: tokio-tungstenite
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-22 13:17:57 +00:00
dependabot[bot]
c0a6703493
Bump filetime from 0.2.21 to 0.2.22 in /src-tauri 
Bumps [filetime](https://github.com/alexcrichton/filetime) from 0.2.21 to 0.2.22.
- [Commits](https://github.com/alexcrichton/filetime/compare/0.2.21...0.2.22)

---
updated-dependencies:
- dependency-name: filetime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-22 13:17:57 +00:00
Nikita Galaiko
2a5fcf1a62
Merge pull request #1074 from gitbutlerapp/flock 
use scope based file lock
 2023-08-22 15:17:09 +02:00
Nikita Galaiko
4fd04a83fd use scope based file lock 2023-08-22 15:06:03 +02:00
Nikita Galaiko
e82e473828
Merge pull request #1073 from gitbutlerapp/blocking-handlers 
avoid parallel fetching
 2023-08-22 13:39:13 +02:00
Nikita Galaiko
8abcd565f6 avoid parallel fetching 2023-08-22 13:34:38 +02:00
Nikita Galaiko
bd19e23b7a merged upstream 2023-08-22 13:34:17 +02:00
Nikita Galaiko
4d19ee1969
Merge pull request #1072 from gitbutlerapp/blocking-handlers 
run handlers on blocking threads
 2023-08-22 13:34:05 +02:00
Nikita Galaiko
22f231334c fix build 2023-08-22 12:55:07 +02:00
Nikita Galaiko
944d2a272e run handlers on blocking threads 2023-08-22 12:41:29 +02:00
Nikita Galaiko
f85a8a2814
Merge pull request #1071 from gitbutlerapp/fix-1 
rm test message
 2023-08-22 09:56:57 +02:00
Nikita Galaiko
bc2a8e391a rm test message 2023-08-22 09:55:21 +02:00
Nikita Galaiko
1a5d34f92e
Merge pull request #1070 from gitbutlerapp/readme 
update readme
 2023-08-22 09:51:28 +02:00
Nikita Galaiko
b51ab52ba6 fix typo 2023-08-22 09:47:31 +02:00
Nikita Galaiko
5769477065 update readme 2023-08-22 09:46:48 +02:00
Nikita Galaiko
8f9f483ef8
Merge pull request #1068 from gitbutlerapp/logs 
Logs
 2023-08-22 09:23:54 +02:00
Nikita Galaiko
1210a37b13 log errors 2023-08-22 09:03:08 +02:00
Nikita Galaiko
f30d1aa886 cargo clippy fix 2023-08-22 09:01:16 +02:00
Nikita Galaiko
85908b5cbf fetch logs 2023-08-22 08:59:42 +02:00
Nikita Galaiko
966b982a90
Merge pull request #1066 from gitbutlerapp/tokio-console 
Tokio console
 2023-08-22 08:58:54 +02:00