gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,761 Commits 148 Branches 1,032 Tags 66 MiB
124aacef4e
Commit Graph

836 Commits

Author SHA1 Message Date
Kiril Videlov
124aacef4e chore: update prettier configuration file paths and format 2023-11-28 15:53:31 +01:00
PavelLaptev
df6a31d9a4 Wip 2023-11-28 15:44:45 +01:00
PavelLaptev
7543609d62 Fixes 2023-11-28 15:42:59 +01:00
Mattias Granlund
652912a589 Make file tree files draggable 2023-11-28 14:30:13 +00:00
Mattias Granlund
1f7a03f59d Add new button for push/pr action 2023-11-28 14:27:46 +00:00
Kiril Videlov
3117769556 chore: add draggable region to window and update class order for offline status indicator 2023-11-28 15:04:58 +01:00
Nikita Galaiko
fa5e9dad43 keep at most 14 log files 2023-11-28 14:53:29 +01:00
Nikita Galaiko
c0e70cc04d
Merge pull request #1777 from gitbutlerapp/fix-assertions-in-update-base-branch 
do not lose work on base branch update GB-674
 2023-11-28 14:33:17 +01:00
Kiril Videlov
c077bd965a chore: update file rendering logic and transition animation in Svelte component 2023-11-28 14:30:17 +01:00
PavelLaptev
83ba2188a4 merged upstream 2023-11-28 14:11:57 +01:00
PavelLaptev
7e44ea0df9 Fix 2023-11-28 14:11:46 +01:00
Nikita Galaiko
d6d8345685
Merge pull request #1748 from gitbutlerapp/dependabot/cargo/itertools-0.12.0 
Bump itertools from 0.11.0 to 0.12.0
 2023-11-28 14:00:57 +01:00
Nikita Galaiko
a614f79f1d
Merge pull request #1747 from gitbutlerapp/dependabot/cargo/tracing-appender-0.2.3 
Bump tracing-appender from 0.2.2 to 0.2.3
 2023-11-28 14:00:05 +01:00
Nikita Galaiko
cc0739f6aa fix losing work on base branch update 2023-11-28 13:59:17 +01:00
Kiril Videlov
9e37883aaa fix: update fetch order to first sync to cloud and then fetch from target 2023-11-28 13:56:56 +01:00
Kiril Videlov
3be483085a refactor: add readonly prop to BranchHeader component 2023-11-28 13:54:00 +01:00
PavelLaptev
a4f0f92e10 merged upstream 2023-11-28 13:42:18 +01:00
PavelLaptev
e31cee245a Css fixes 2023-11-28 13:42:03 +01:00
Kiril Videlov
4e466572c1 chore: update branch display layout and add tooltip for merge conflict information 2023-11-28 12:59:15 +01:00
Mattias Granlund
14d2e43294 Make file tree items selectable 2023-11-28 10:51:55 +00:00
Mattias Granlund
5240596ab0 🔨 chore: fix conditional statement for file lock tooltip in header component 2023-11-28 10:44:07 +00:00
Mattias Granlund
160c860425 Add modified lines and file status to file card 2023-11-28 09:58:24 +00:00
Mattias Granlund
5ba99206b9 Add loading status tooltip with spinner icon 2023-11-28 09:58:04 +00:00
Mattias Granlund
a54ed979f3 Remove concept of sessions from front end 2023-11-28 10:09:22 +01:00
Nikita Galaiko
cbb54ac72a
Merge pull request #1742 from gitbutlerapp/gb-674-2 
GB-674 (2)
 2023-11-28 08:02:10 +01:00
PavelLaptev
666da83180 segment control css update 2023-11-28 01:40:45 +01:00
Mattias Granlund
48db234f2a Improve behaviour of file selection 2023-11-28 00:13:08 +00:00
Mattias Granlund
174e295f3a Improve no changes branch state 2023-11-28 00:13:08 +00:00
PavelLaptev
2d51fdcf1d css fixes 2023-11-28 00:55:23 +01:00
Pavel Laptev
352a626817
Merge branch 'master' into css-changes 2023-11-28 00:50:06 +01:00
PavelLaptev
0ebac9075d css fixes 2023-11-28 00:45:20 +01:00
Mattias Granlund
fb32a06d31 Make file card resizable 2023-11-27 22:39:41 +00:00
Mattias Granlund
ab29fd4e84 Add tags for file card 2023-11-27 23:08:59 +01:00
Mattias Granlund
42883198d0 Improve file selection in branch card 2023-11-27 22:28:43 +01:00
Mattias Granlund
344c24b702 Improve a bunch of stuff 2023-11-27 22:15:26 +01:00
Mattias Granlund
9e61bc05b0 Show file diff next to branch lane 2023-11-27 21:42:01 +01:00
Mattias Granlund
f2827b8978 fix: update dropdown component to include wrapper div for proper styling and positioning 2023-11-27 18:53:08 +00:00
Mattias Granlund
9471e8567a Move branch lane to branch card 2023-11-27 18:38:33 +00:00
extrawurst
7350fc59d0
fix push code (#1714) 2023-11-27 18:25:50 +01:00
Mattias Granlund
ca106bc3e4 Update navigation bar and selected states 2023-11-27 17:23:51 +00:00
Kiril Videlov
bb1928de1b fix lint issue 2023-11-27 18:18:44 +01:00
Kiril Videlov
fac45a2d6b chore: update styling and conditional rendering in branch component 2023-11-27 18:18:44 +01:00
PavelLaptev
61b09582f1 merged upstream 2023-11-27 18:02:01 +01:00
Mattias Granlund
5d3f2e7084 chore: update styling of input field to improve visibility and add placeholder color 2023-11-27 16:59:13 +00:00
Mattias Granlund
88526d237a Fix commit issue 
- selecting what to commit is currently unavailable
 2023-11-27 16:53:25 +00:00
PavelLaptev
22577c6d20 Update tokens 2023-11-27 17:47:39 +01:00
Mattias Granlund
efa80954f6 Refactor the commit box and dropdown button 2023-11-27 16:45:35 +00:00
dependabot[bot]
d54c22a9e1
Bump itertools from 0.11.0 to 0.12.0 
Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.11.0 to 0.12.0.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.11.0...v0.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:37:58 +00:00
dependabot[bot]
66ec459423
Bump tracing-appender from 0.2.2 to 0.2.3 
Bumps [tracing-appender](https://github.com/tokio-rs/tracing) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-appender-0.2.2...tracing-appender-0.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-27 15:37:45 +00:00
Nikita Galaiko
646eedd06e more refactor 2023-11-27 15:32:22 +01:00