Commits on Jan 16, 2022

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jan 16, 2022
    Configuration menu
    Copy the full SHA
    2b8e03e View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2022

  1. Fix build with HDF5-1.12

    @MaxBrazhnikov
    MaxBrazhnikov committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    40cdf2d View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    c62a8cb View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    5d734f4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed May 31, 2022
    Configuration menu
    Copy the full SHA
    083734c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    2ab14ad View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    748ffdf View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    65fe992 View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    cd6df3f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2022

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    0f0e52f View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Fix build with new HDF5 (1.10.8+ or 1.12.1+) 

    Newer HDF5 changes hdf5.h from _HDF_H to HDF_H [1] therefore it collides
with hdf5.h from kst [2].

[1] https://github.com/HDFGroup/hdf5/blob/hdf5-1_10_8/src/hdf5.h#L20
    https://github.com/HDFGroup/hdf5/blob/hdf5-1_12_1/src/hdf5.h#L20
[2] https://invent.kde.org/graphics/kst-plot/-/blob/master/src/datasources/hdf5/hdf5.h#L15
    @sunpoet
    sunpoet committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    0a066ed View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    139ec47 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2022

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    7b5c793 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    4f19c04 View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    070e378 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    b1082f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    3580475 View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    5fdd819 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    de1348e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    873e673 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    5386c0c View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    6123455 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    7f7cf8b View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    bfbbfb3 View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    7750363 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    ab7d3bb View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    4d4021f View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    1048879 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    02366d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    59e066d View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    12f40e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    6a370ec View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. src/widgets/labelbuilder.cpp (showHelp) : Address nits in html (missi… 

    …ng <P> terminations, <br/> instead of <br>)
    @okellogg
    okellogg committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ae90eef View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
    l10n daemon script committed May 4, 2024
    Configuration menu
    Copy the full SHA
    e91af37 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Fix a bunch of compiler warnings.

    Barth Netterfield committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    aea52b3 View commit details
    Browse the repository at this point in the history

  2. Fix change npts svg icon.

    Barth Netterfield committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6bf8837 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. fix file dialog to work with files and dirfiles.

    Barth Netterfield committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    b99ad2b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Ascii files are re-read if they get smaller. 

    Also fix some compiler warnings.
    Barth Netterfield committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    5852c5b View commit details
    Browse the repository at this point in the history