Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-11-05 02:46:56 +03:00
Code Issues Projects Releases Wiki Activity
1,698 Commits 89 Branches 20 Tags 80 MiB
1508333316
Commit Graph

1698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Marmsoler
196b8c643d increase version again 2023-01-22 19:02:10 +01:00
Martin Marmsoler
a29ad94a73 format 2023-01-22 18:42:56 +01:00
Martin Marmsoler
8b66d81c04 assume yes otherwise the application will not be deleted 2023-01-22 18:32:07 +01:00
Martin Marmsoler
25f40e4612 Revert "set correct version" 
This reverts commit 1ffcdced34.
 2023-01-22 18:31:35 +01:00
Martin Marmsoler
1ffcdced34 set correct version 2023-01-22 18:30:51 +01:00
Martin Marmsoler
4fc5eca08f missing version separator 2023-01-22 18:10:40 +01:00
Martin Marmsoler
3d0ede46d6 decrease version for testing 2023-01-22 17:54:25 +01:00
Martin Marmsoler
e1f8ec18df increase version 2023-01-22 17:52:51 +01:00
Martin Marmsoler
fc0f53482e uninstall Gittyup versions before installing a new one 2023-01-22 17:51:21 +01:00
Murmele
f364ff0a33
Release1.2.1 2023-01-22 15:22:16 +01:00
Martin Marmsoler
be9d173624 set release date and add changelogs 2023-01-22 11:58:34 +01:00
Martin Marmsoler
590d15ecd3 Add changelog entry 2023-01-22 11:58:33 +01:00
Murmele
17198263a2 Update docs/changelog.md 2023-01-22 11:58:32 +01:00
Murmele
5109ad9d96 Update docs/changelog.md 2023-01-22 11:58:31 +01:00
Martin Marmsoler
87f2f88e6a add missing hash 2023-01-22 11:58:30 +01:00
Martin Marmsoler
e51b8afcd1 change date to today 2023-01-22 11:58:30 +01:00
Martin Marmsoler
42d89fc8ed Add changelogs 2023-01-22 11:58:29 +01:00
Murmele
5168244b14
Merge pull request #424 from Murmele/crashBrokenRepo 
do not crash if objects are invalid
 2023-01-22 11:53:05 +01:00
Murmele
851d1e1d49
Merge pull request #431 from 0verEngineer/macOS_checkbox_fix 
Fixes SingleInstance checkbox shown on MacOS
 2023-01-22 11:31:17 +01:00
Murmele
eee6452af3
Merge pull request #412 from Murmele/rebaseInitialization 
return if initializing a rebase fails.
 2023-01-22 11:19:54 +01:00
Murmele
fa7cc5cd4f
Merge pull request #411 from Murmele/fixSubmoduleConflictedNotVisible 
Fix submodule/conflicted files not visible
 2023-01-22 11:19:44 +01:00
Murmele
3a04de7038
Merge pull request #253 from Murmele/changeStartupWMClass 
change startup wmclass
 2023-01-22 11:19:27 +01:00
0verEngineer
94a5f6d3e8 Fixes SingleInstance checkbox on macOS 2023-01-18 09:25:34 +01:00
Martin Marmsoler
d7b73b853c do not crash if objects are invalid 2023-01-11 19:15:54 +01:00
Murmele
6cc7ad43e1
Update rsrc/linux/com.github.Murmele.Gittyup.desktop 2023-01-02 16:50:51 +01:00
Martin Marmsoler
0636e05c25 show logentry if a conflict happens, so the user knows what to do 2022-12-30 10:51:54 +01:00
Martin Marmsoler
9b54ba3282 return if initializing a rebase fails. 2022-12-30 10:13:04 +01:00
Murmele
8580fd8073
Do not let files steal focus from commit list 
Merge pull request #406 from codeschrat/dont-let-changed-files-steal-focus
 2022-12-29 16:19:45 +00:00
Martin Marmsoler
dcf9b33473 fix problem 2022-12-29 16:59:41 +01:00
Martin Marmsoler
774285d606 add test for conflicted files 2022-12-29 16:59:31 +01:00
Martin Marmsoler
fad1f45252 add test 2022-12-29 16:40:40 +01:00
Murmele
2bbb770b28
Merge pull request #391 from Murmele/FileContextMenu 
FileContextMenu: Show context menu when a commit is selected && show correct context menu entries when commit is selected
 2022-12-29 13:34:17 +00:00
jens
ae87b45e10 Do not set focus on file tree view 2022-12-21 17:32:37 +01:00
Martin Marmsoler
5bb85e9d6d fix formatting 2022-12-16 11:03:12 +01:00
Murmele
8569757b98
Merge pull request #400 from exactly-one-kas/flatpak-build 
Use customized flatpak builder Docker image
 2022-12-16 11:00:18 +01:00
kas
70c2584ed6 Use customized flatpak builder Docker image 2022-12-16 07:35:48 +01:00
Martin Marmsoler
8d3d4c2c30 use statusDiff to determine if the file has to be added or not. The problem is, that stageState is git::Index::Staged for commits, but for the committed changes the uncommitted treeview is used and then the files were not added and then no context menu will be shown 2022-12-12 18:56:48 +01:00
Martin Marmsoler
4adf8aff75 FileContextMenu: do not show discard actions if a commit is selected in the commitlist. To get a better overview, move the handles into dedicated functions 2022-12-10 19:59:21 +01:00
Murmele
3b69f6f5a0
Replace settings strings by ids 
Merge pull request #383 from codeschrat/replace-settings-strings-by-ids
 2022-12-06 09:06:25 +01:00
jens
ead51fdb97 Format code 2022-12-05 18:59:03 +01:00
jens
975633c94f Make methods private 2022-12-05 18:59:03 +01:00
jens
05718e5329 Delete now unused methods 2022-12-05 18:59:03 +01:00
jens
c8f69b6e45 Introduce convenience methods to set/get hotkeys 2022-12-05 18:59:03 +01:00
jens
bd5a28aa73 Replace settings keys by ids for settings w/o a group 2022-12-05 18:59:03 +01:00
jens
902b516213 Replace settings keys by ids for 'doubletreeview' group 2022-12-05 18:59:03 +01:00
jens
19b234de0c Replace settings keys by ids for 'ssh' group 2022-12-05 18:59:03 +01:00
jens
f53f07fbe4 Replace settings keys by ids for 'update' group 2022-12-05 18:59:03 +01:00
jens
e5e4925a4f Replace settings keys by ids for 'terminal' group 2022-12-05 18:59:03 +01:00
jens
d1ff9a0909 Replace settings keys by ids for 'collapse' group 2022-12-05 18:59:03 +01:00
jens
5bdc769d35 Replace settings keys by ids for 'window' group 2022-12-05 18:59:03 +01:00