kas
|
4232f006f9
|
Create new GittyUp branded DMG background
|
2022-09-24 21:20:52 +02:00 |
|
kas
|
4ff2958ccf
|
Create logotype SVG version using paths instead of text so it can be rendered without the font installed
|
2022-09-24 21:20:52 +02:00 |
|
Murmele
|
ba79e6410d
|
Binary/ Full file Merge conflict solving
Also show full file conflict solving buttons when there's no hunks
|
2022-09-23 14:36:02 +02:00 |
|
kas
|
9119d41c25
|
Also show full file conflict solving buttons when there's no hunks (happens with binary files)
|
2022-09-23 13:30:09 +02:00 |
|
Kas
|
722f1b0506
|
Merge pull request #245 from exactly-one-kas/updater-window-error
Fix updater not closing all main windows
|
2022-09-23 13:04:01 +02:00 |
|
Kas
|
378f548ad4
|
Merge pull request #271 from Murmele/fixReferenceView
Fix reference view
|
2022-09-20 21:28:39 +02:00 |
|
Kas
|
31a22e9fe0
|
Merge pull request #266 from HNKNTA/add_homebrew
Add info about macOS Homebrew installation method
|
2022-09-20 21:24:05 +02:00 |
|
kas
|
cb391df85f
|
Only update automatically when configured to do so
Before this, updates were downloaded automatically if the new version was "just" a minor version change regardless of the user's setting
|
2022-09-20 21:14:28 +02:00 |
|
Murmele
|
0dca6ababd
|
Merge pull request #274 from CodeFreer/patch-1
Update gittyup_zh_CN.ts
|
2022-09-19 20:05:54 +02:00 |
|
CodeFreer
|
c75b15eea7
|
Update gittyup_zh_CN.ts
|
2022-09-19 21:44:13 +08:00 |
|
Martin Marmsoler
|
ea2c3732b0
|
implement installer for flatpak
|
2022-09-19 07:17:37 +02:00 |
|
kas
|
9a8edbfc86
|
Inform CMake about new dependencies
|
2022-09-19 07:17:36 +02:00 |
|
kas
|
3737be4154
|
Fix updater not closing all main windows
For some reason, using QCoreApplication::notify() with a QCloseEvent never reaches any MainWindow, so now they get closed explicitly
|
2022-09-19 07:17:35 +02:00 |
|
Martin Marmsoler
|
60a3278545
|
add also for macOS the stable URL if someone wants to download directly the dmg
|
2022-09-18 13:49:38 +02:00 |
|
Martin Marmsoler
|
9c5553bd8f
|
use URL to github release only for windows. For linux point to flathub and for macOS to homebrew
|
2022-09-18 13:46:16 +02:00 |
|
Martin Marmsoler
|
6db9b72dac
|
write directly 1 instead of 0 + 1 because now it is more clear
|
2022-09-13 13:16:13 +02:00 |
|
HNKNTA
|
29840bd3d6
|
change homebrew info to image
|
2022-09-08 22:39:09 +03:00 |
|
HNKNTA
|
46e97e0b10
|
Add homebrew info to index.md
|
2022-09-07 21:03:58 +03:00 |
|
Murmele
|
c69ff54a4a
|
Merge pull request #270 from exactly-one-kas/create-branch-with-detached-head
Fix new branch dialog showing the wrong starting point
|
2022-09-07 14:59:33 +02:00 |
|
Martin Marmsoler
|
c4d7f1bebe
|
if ref is not valid, use the current commit. If commit not set an invalid commit will be returned.
|
2022-09-07 14:55:19 +02:00 |
|
kas
|
25cec28316
|
Fix new branch dialog showing the current detached head as starting point irrespective of the selected start commit
|
2022-09-07 14:25:43 +02:00 |
|
Martin Marmsoler
|
6c02f83585
|
Remote can also contain an invalid referce
|
2022-09-07 10:20:04 +02:00 |
|
Murmele
|
33db52a7d9
|
Merge pull request #184 from Murmele/DoubleTreeView_KeyPress_Segfault
implement keypress otherwise a segfault occurs
|
2022-09-07 08:53:14 +02:00 |
|
Murmele
|
9a717c08bf
|
Merge pull request #242 from exactly-one-kas/full-file-conflict-solving
Implement solving merge conflicts for whole files
|
2022-09-07 08:52:15 +02:00 |
|
HNKNTA
|
3fcceb542d
|
Add Mac OS Homebrew installation method
|
2022-09-04 20:51:18 +03:00 |
|
Murmele
|
68a7923241
|
Merge pull request #262 from exactly-one-kas/windows-recent-list
Canonicalize repository paths on Windows
|
2022-09-02 17:59:58 +02:00 |
|
kas
|
d32235816c
|
Fix error with non-existant paths
|
2022-09-01 21:35:50 +02:00 |
|
kas
|
4e85bd3868
|
Only show full file conflict solver if there are multiple hunks / conflicts
|
2022-09-01 14:05:20 +02:00 |
|
kas
|
005d57ba02
|
Canonicalize repository paths on Windows
Use case insensitive comparisons for paths on Windows
|
2022-09-01 11:36:36 +02:00 |
|
kas
|
1e95978c4c
|
Use implicit cast
|
2022-09-01 10:08:51 +02:00 |
|
Murmele
|
f556b11017
|
Fix collapse counter
Merge pull request #257 from Murmele/bugCollapseCount
|
2022-09-01 08:20:29 +02:00 |
|
Martin Marmsoler
|
cc078fb430
|
fix the algorithm for the collapse counter
|
2022-09-01 07:46:54 +02:00 |
|
Kas
|
31cd44a014
|
Merge pull request #260 from rebeccasodergren/patch-1
Fixed the menubar color in Dark theme
|
2022-09-01 07:00:27 +02:00 |
|
Rebecca
|
4ff8682362
|
Fixed the menubar color in Dark theme
Fix for #126
|
2022-08-31 13:49:46 +02:00 |
|
Martin Marmsoler
|
a45e653714
|
select next item if the previous was staged
Co-authored-by: stefanknotzer <67198194+stefanknotzer@users.noreply.github.com>
|
2022-08-25 12:46:21 +02:00 |
|
Kas
|
1d6423fd5d
|
Merge pull request #206 from Murmele/rebaseMergeConflicts
Feature: Resolve rebase conflicts
|
2022-08-23 17:23:36 +02:00 |
|
Murmele
|
6b183def0c
|
Merge pull request #250 from exactly-one-kas/libssh2-update
Update libssh2 to current main branch
|
2022-08-22 11:43:15 +02:00 |
|
Murmele
|
e7d3f4c83d
|
Merge pull request #238 from Murmele/cleanup
Fix supportlink, remove video section and fix flatpak download url
|
2022-08-22 11:07:24 +02:00 |
|
kas
|
93bc1c78e1
|
Update libssh2 to current main branch
This allows connecting to SSH servers implementing RFC 8332 (Deprecating RSA-SHA-1 in favor of RSA-SHA-256 and RSA-SHA-512)
|
2022-08-20 10:09:36 +02:00 |
|
kas
|
b1aef5e190
|
Fix code formatting
|
2022-08-16 07:14:23 +02:00 |
|
kas
|
405e8c5586
|
Implement solving merge conflicts for whole files
|
2022-08-15 22:29:14 +02:00 |
|
Murmele
|
cfe3e93f95
|
Update src/ui/TreeView.cpp
|
2022-08-12 20:59:27 +02:00 |
|
Murmele
|
60a5547143
|
Update src/ui/TabWidget.cpp
|
2022-08-12 20:58:01 +02:00 |
|
Martin Marmsoler
|
f2b75f00a7
|
Add comment for the reason it was implemented
|
2022-08-12 16:20:27 +02:00 |
|
Martin Marmsoler
|
bbf74e1386
|
implement keypress otherwise a segfault occurs
|
2022-08-12 16:11:42 +02:00 |
|
Martin Marmsoler
|
4a09557309
|
show link
|
2022-08-12 15:42:05 +02:00 |
|
Martin Marmsoler
|
4d92fda91a
|
show download url if it was not able to install
|
2022-08-12 15:32:03 +02:00 |
|
Martin Marmsoler
|
85b88659fa
|
hide skip button on linux, because there it no binary can be downloaded
|
2022-08-12 15:14:31 +02:00 |
|
Martin Marmsoler
|
a7ab2594d5
|
Fix flatpak download link: remove dot because it is already in the kLinkFmt
|
2022-08-12 11:45:59 +02:00 |
|
Martin Marmsoler
|
38c076d8af
|
currently we don't have any videos
|
2022-08-12 11:45:43 +02:00 |
|