Commit Graph

1743 Commits

Author SHA1 Message Date
Martin Marmsoler
5a3e27ea8a revert date
Reason: so it can be merged and at the end only the date must be changed
2024-04-20 20:15:34 +02:00
Martin Marmsoler
883930b339 fix 2024-04-20 19:34:07 +02:00
Martin Marmsoler
8c863b4f98 remove section because not handled correctly 2024-04-20 19:07:31 +02:00
Martin Marmsoler
3145a3f936 fix appdata file 2024-04-20 18:32:46 +02:00
Martin Marmsoler
82b2b36257 update changelog for upcomming release 2024-04-20 18:10:21 +02:00
Murmele
db7daf90e8
Merge pull request #741 from Murmele/flatpak_sdk_version
update flatpak runtime version
2024-04-20 17:55:36 +02:00
Murmele
9c20e60e8d
Merge pull request #713 from siforrer/fix-drop-pop-stash-crashes
Set head/stash reference after pop/drop stash
2024-04-20 17:43:54 +02:00
Martin Marmsoler
13db99408b update git lfs 2024-04-20 17:23:23 +02:00
Martin Marmsoler
22f656a626 install correct versions and remove sdk because it will be installed automatically by the flatpak-builder plugin 2024-04-20 17:18:44 +02:00
Martin Marmsoler
b573da616b use system openssl 2024-04-20 16:58:16 +02:00
Murmele
64cecfadaf
Merge pull request #719 from monks-dev/master
Add option to always show window maximized
2024-04-20 16:39:12 +02:00
Martin Marmsoler
896bd6e2e0 update flatpak runtime version 2024-04-20 16:29:19 +02:00
siforrer
744dc13551 Update src/ui/RepoView.cpp
Co-authored-by: Ryan Jensen <jensenr30@gmail.com>
2024-04-20 16:24:21 +02:00
Silvan Forrer
1cb74d17e1 Select "Uncommitted changes" after "Pop Stash" 2024-04-20 16:24:20 +02:00
Silvan Forrer
659776f938 Revert the refresh behavior 2024-04-20 16:24:20 +02:00
Silvan Forrer
0515491197 Set head reference after pop stash or refresh
When executing "Stash->Pop Stash" from the menu bar or when popping a
specific stash from the commit list then the repo view is set to the head
revision and the commit list is updated with the content from the head
revision. 

Before the when doing a "Refresh" and being on the stash view the commit list 
stayed on the stashes but the head revision was selected. Now the commit list 
contains the commits from the head revision.
2024-04-20 16:24:19 +02:00
Silvan Forrer
778715ae9f Set head/stash reference after pop/drop stash
Fixes the issue  "Dropping multiple stashs in a row segfaults #637".
The cause of the crash was that the commit list was not properly
updated after pop/drop stash actions.  With this change the commit
list is updated or when the stash gets empty (after last pop/drop) 
then the head is selected as current reference.
2024-04-20 16:24:19 +02:00
Murmele
ed47229ac9
Merge pull request #740 from Murmele/flatpak
move flatpak manifest into the repository
2024-04-20 16:23:17 +02:00
Murmele
05deb976fe
Merge pull request #732 from ysalmon/gitdirfix
fix cdUp logic
2024-04-20 16:22:57 +02:00
Martin Marmsoler
c59da64ca9 add changelog entry 2024-04-20 16:04:05 +02:00
Martin Marmsoler
cdf1352405 move flatpak manifest into the repository
Reason: so it can be modified without any issues on the stable flatpak. After the release the package must be update in the flathub repository
2024-04-20 15:50:40 +02:00
monks-dev
6e0ae4c339 Clang format 2024-04-20 15:37:48 +02:00
monks-dev
7fa407d900 Added a checkbox in the settings "Tools>Options>Window>View>Show Maximized".
Added a check for the checkbox when the window opens to show maximized if checked.
2024-04-20 15:37:47 +02:00
monks-dev
26e92309cb I made the window show maximized when opened. 2024-04-20 15:37:47 +02:00
Yann Salmon
de7704a1b1 fix cdUp logic 2024-04-20 15:36:40 +02:00
Murmele
ef6984cdae
Merge pull request #739 from Murmele/ci_update_ninja
update ninja
2024-04-20 15:25:31 +02:00
Martin Marmsoler
c4c553be9e update to latest ninja version 2024-04-20 15:02:37 +02:00
Martin Marmsoler
6c895fdd53 update ninja 2024-04-20 14:59:13 +02:00
Murmele
ec9980f699
Merge pull request #721 from jensenr30/navigation-hotkeys
Add Hotkeys for Navigating CommitList
2024-03-28 11:19:21 +01:00
Murmele
063099a208
Merge pull request #720 from jensenr30/hunk-header
Hunk header does not interfere with line wrapping
2024-03-28 11:16:11 +01:00
Ryan Jensen
611052da32 Add hotkeys D and U move DiffView down/up by half page 2024-03-24 21:54:54 -05:00
Ryan Jensen
7e182735e2 Add selectCommitRelative() 2024-03-21 01:17:47 -05:00
Ryan Jensen
770ac3c7a5 Add hotkeys: nextCommit and prevCommit 2024-03-20 22:07:04 -05:00
Ryan Jensen
5e124bd363 Simplify HunkLabel 2024-03-20 01:24:45 -05:00
Ryan Jensen
cec48ca95d Move HunkLabel.cpp into HunkWidget.cpp 2024-03-20 01:24:45 -05:00
Ryan Jensen
d4dc0f57b2 HunkHeader resizes itself to not interfere with line wrapping 2024-03-20 01:24:45 -05:00
Murmele
dac06473c0
Enable line wrapping
Merge pull request #709 from jensenr30/line-wrapping
2024-03-16 08:05:07 +01:00
Ryan Jensen
794347c279 Replace line wrap .webm with .gif
GitHub doesn't support webm yet
2024-03-15 20:35:20 -05:00
Ryan Jensen
a5be371509
Update docs/changelog.md - remove '->'
Co-authored-by: Murmele <Murmele@users.noreply.github.com>
2024-03-16 01:25:33 +00:00
Ryan Jensen
8b0973c8ea Line wrapping is disabled by default 2024-03-07 20:51:53 -06:00
Ryan Jensen
a6238e9f85 Add video of line wrapping to website; Add note to changelog 2024-03-07 20:32:18 -06:00
Ryan Jensen
0c50146f47 Add a check box in Settings->DiffPanel to enable line wrapping 2024-03-07 01:32:14 -06:00
Ryan Jensen
800a4c79c5 Enable line wrapping 2024-03-07 00:48:23 -06:00
Murmele
5d8091811d
Merge pull request #701 from jensenr30/fix-commit-highlighting
Fix commit highlighting
2024-02-27 10:26:49 +01:00
Ryan Jensen
22d81be025 Render 'Uncommitted changes' in italics 2024-02-25 17:18:33 -06:00
Ryan Jensen
1508333316 Highlight selected commit's backgrounds with painter->fillRect
Qt was adding additional highlighting that was distracting.  This commit
fixes that issue by manually drawing the highlighted background color
instead of relying on Qt to do that.
See
https://github.com/Murmele/Gittyup/issues/699
2024-02-25 17:06:10 -06:00
Murmele
fca7ee6b50
Merge pull request #700 from jensenr30/move-name-in-commit-list
Compact commit list: move commit message closer to commit graph
2024-02-24 06:49:16 +01:00
Ryan Jensen
3be4b5f96a Move commit messages closer to commit graph (compact mode)
also fix incorrect file name in README.md
2024-02-23 19:31:59 -06:00
Murmele
d37a32fddb
Merge pull request #693 from wolfseifert/delete-timeline-causes-crash-on-windows-#680
Delete timeline causes crash on windows #680
2024-02-20 14:04:13 +01:00
wolfseifert
3cd3ddba59
Update RepoView.cpp
reformatted
2024-02-14 12:47:15 +01:00