Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 10:45:39 +03:00
Code Issues Projects Releases Wiki Activity
1,777 Commits 87 Branches 20 Tags 80 MiB
e6e6aaf917
Commit Graph

193 Commits

Author SHA1 Message Date
Alf Henrik Sauge
d36eba172a Update zip dependency to fix GCC14 build error 
Change needed since zip contained a call to calloc where the argument
order was reversed. This results in calloc-transposed-args being raised.
 2024-05-11 14:47:46 +02:00
Martin Marmsoler
b4e9885b95 set original commit message as default 2023-12-10 13:12:01 +01:00
devnull
1d6d53ba00 Use columns for file name, directory, and state when files are shown as a list in TreeViews. Resolves Dense layout issue #547 2023-11-12 15:48:20 +01:00
Michael Werle
d729e630c3 chore: revert formatting changes of Setting.cpp 
We used v14 of clang-format in commit 2dfb5a483e2a3518cd0bb40f39a05915253d88b6 which introduced unwanted changes. Revert to the formatting enforced by v13 of clang-format.
 2023-08-31 09:43:15 +09:00
Micha WERLE
3ffdbac1da chore: clang-format recently modified files. 2023-08-31 09:43:14 +09:00
Micha WERLE
97accfa49b refactor: re-add support compiling with QT < 5.14 
The refactor to remove deprecated symbols also broke compatibility with versions of QT prior to QT5.14.  This commit adds back support for earlier versions of QT. Mostly this is via the new "qtsupport.h" header file, but for supporting the changed `QSet` constructor we had to put the changes into each source file. This is, of course, not optimal.
 2023-08-31 09:43:14 +09:00
Micha WERLE
e21bea8d15 chore: fix compiler warnings 
* add default to switch statements throwing an exception on unhandled
  case. This removes `control reaches end of non-void function` in many
  functions.
* fix QT5.14 deprecations, which will also make it easier to move to QT6
  - fix QSet initialization
  - rename `endl` -> `Qt::endl`
  - rename `QString::SkipEmptyParts` -> `Qt::SkipEmptyParts`
  - and more...
* Scintilla editor 
  - add missing `override`
  - replace deprecated functions
* Settings
  - fix deprecated QDir assignment
  - code-style: replace assignment with initializers (to match QDir in this file)
 2023-08-31 09:43:13 +09:00
Martin Marmsoler
1cc28554ae format 2023-02-25 16:21:57 +01:00
Martin Marmsoler
a318c6aa21 use higher waittime, because the CI fails, but offline it does not 2023-02-25 16:21:56 +01:00
Martin Marmsoler
c43784efac No need to wait that long 2023-02-25 16:21:56 +01:00
Martin Marmsoler
96704ade13 No need to always wait 1s 
Reason: 10ms is already enough
 2023-02-25 16:21:55 +01:00
Martin Marmsoler
5882fc7b68 Decrease wait time to original one 
Reason: No need to wait so long
 2023-02-25 16:21:54 +01:00
Martin Marmsoler
60fcf1d1b6 Fix tests 
Reason: it has to be waited until the detailview is updated
 2023-02-25 16:21:53 +01:00
Martin Marmsoler
20a371b22a Enable test 
Reason: Because it was commented out just for testing
 2023-02-25 16:21:53 +01:00
Martin Marmsoler
ad659ad583 fix test 2023-02-25 16:21:52 +01:00
Martin Marmsoler
1efd6206c7 Fix build 2023-02-25 16:21:51 +01:00
Martin Marmsoler
362bbdd1b3 Description: Enable tests again 
Reason: For some reason they were disabled, but they shouldn't
Files:
 2023-02-25 16:21:49 +01:00
Martin Marmsoler
ab94aed8c5 fix test 2023-02-25 16:21:47 +01:00
Martin Marmsoler
ed5a27267a wait (fix tests) 2023-02-25 16:21:39 +01:00
Martin Marmsoler
2e7b1ee082 wait until status is finished 2023-02-25 16:21:39 +01:00
Martin Marmsoler
b6b2c3187a Update CMakeLists.txt, Settings.cpp, Diff.cpp, and 27 more files 2023-02-25 16:21:35 +01:00
Kas
ee7c780217
Merge pull request #347 from H-4ND-H/credential-store 
Credential store
 2023-01-30 09:15:32 +01:00
Murmele
27c75f1346
Merge pull request #413 from Murmele/defaultMessage 
Implement automatic usage of template in commit message
 2023-01-27 12:48:56 +01:00
H-4ND-H
872965b987 Fix test resource not available in all builds 2023-01-26 14:30:19 +03:30
H-4ND-H
fdb64f9e6f Fix git credential instantiation problem 
Add a helper for git credential store.

Change SettingDialog.cpp so that it shows available git credential
stores and set it to git global config file.

Chagne the CredentialHelper.cpp so that it instantiate correct
store based on git global config rather than availability.
 2023-01-26 14:30:19 +03:30
Martin Marmsoler
1828a48411 Fix used wrong config in ConfigDialog.cpp the readconfig and the write config must be the same 2023-01-24 18:44:17 +01:00
Martin Marmsoler
e8c2f8d327 fix #398 2023-01-23 18:17:28 +01:00
Martin Marmsoler
54e2c2a846 add test 2023-01-23 07:54:39 +01:00
Martin Marmsoler
ba9d605734 add possibility to import and export templates 2023-01-23 07:54:38 +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
jens
ead51fdb97 Format code 2022-12-05 18:59:03 +01:00
jens
1bdeaa3cd9 Replace settings keys by ids for 'global' group 2022-12-05 18:59:03 +01:00
jens
11e86e5727 Include Prompt::Kind enum in unit tests 2022-12-05 18:59:03 +01:00
jens
e92d14d8ad Drop redundant 'Prompt' from PromptKind enum and its values 2022-12-05 18:59:03 +01:00
Martin Marmsoler
cc2d2b5a6e conflicted files are now only in the unstaged tree, anymore in both, so the number of files is only 3 2022-11-29 15:36:18 +01:00
Martin Marmsoler
8eb03783be change commit id, because tes repo was updated 2022-11-29 15:19:36 +01:00
Martin Marmsoler
2a327cf588 fix test 2022-11-29 15:19:35 +01:00
Martin Marmsoler
3803824b11 zip folder filename wrong 2022-11-29 15:19:34 +01:00
Martin Marmsoler
9f830a6022 implement discarding submodules test 2022-11-29 15:19:32 +01:00
Martin Marmsoler
27638f51d9 update repository, because the submodule was not set correctly 2022-11-29 15:19:32 +01:00
Martin Marmsoler
ff64db551d add testrepositories 2022-11-29 15:19:30 +01:00
Martin Marmsoler
d4db08ca72 do not exclude from all, but add option to disable tests 2022-11-29 15:19:29 +01:00
Martin Marmsoler
2bc8c32905 parent must be available, because discard calls the repoview to refresh 2022-11-29 15:19:29 +01:00
Martin Marmsoler
c57dfaa43e add test for adding new line to empty file 2022-11-29 15:19:28 +01:00
Martin Marmsoler
4885079ad3 add test to verify solution 2022-11-29 15:19:27 +01:00
Murmele
26a540abc7
Merge pull request #368 from Murmele/DefaultStagestateSubmodules 
Use unchecked (unstaged) for conflicted and disabled
 2022-11-29 15:18:37 +01:00
Murmele
3f4d0fa556
Merge pull request #375 from Murmele/crashMergeCollapseCounter 
Crash merge collapse counter
 2022-11-27 08:20:56 +01:00
Martin Marmsoler
3767d631be rename variable to a better name 2022-11-26 11:55:07 +01:00
jens
90e6e03f27 Properly name values of Prompt::PromptKind 2022-11-26 09:33:13 +01:00