Albert Astals Cid
903cdec02b
GIT_SILENT fix version
...
need to figure out a way to make this work :/
6 years ago
Christoph Feck
8fd53e5674
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit c8dcf1fdea )
6 years ago
Christoph Feck
c8dcf1fdea
GIT_SILENT Update Appstream for new release
6 years ago
Nicolas Fella
7d24a51e6a
Launch okularkirigami directly instead of via kpackagelauncherqml
6 years ago
Christoph Feck
a7876ca013
GIT_SILENT Update Appstream for new release
6 years ago
Albert Astals Cid
5ecbb51f77
Enable modernize-use-nullptr
6 years ago
l10n daemon script
a26dd5118a
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"
6 years ago
l10n daemon script
0d5bd0bc43
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"
6 years ago
Christoph Feck
a18c013932
GIT_SILENT Update Appstream for new release
6 years ago
l10n daemon script
79de5d3958
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"
6 years ago
l10n daemon script
a5eda6348f
GIT_SILENT made messages (after extraction)
6 years ago
Christoph Feck
475652a990
Update Appstream for new release
6 years ago
Albert Astals Cid
78cf6bd910
CI: enable more modernize checks
...
Since unfortunately some of the autogenerated includes don't pass the
checks we do a trick of building out of source and then specifying the
.*/okular/.* path as the only includes we care about
6 years ago
Albert Astals Cid
f7f2b3105f
Increase version here too
6 years ago
Christoph Feck
7974aa1d36
Update Appstream for new release
6 years ago
l10n daemon script
d40d89a029
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"
6 years ago
l10n daemon script
1f0048c125
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"
6 years ago
l10n daemon script
1850e8d1ec
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
cf07a44f27
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
9e4c6cfb68
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"
6 years ago
l10n daemon script
35b7d057a2
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
6aecd5d5db
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"
6 years ago
l10n daemon script
8d1dbe5041
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
b16dcf41aa
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"
7 years ago
l10n daemon script
bf7a53d62b
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"
7 years ago
Laurent Montel
cb691f70dc
Fix some clazy warning
...
Summary: fix clazy warning
Reviewers: aacid
Reviewed By: aacid
Subscribers: nicolasfella, okular-devel
Tags: #okular
Differential Revision: https://phabricator.kde.org/D20832
7 years ago
l10n daemon script
a7742d4604
GIT_SILENT made messages (after extraction)
7 years ago
Yuri Chornoivan
6722052380
Remove extra include
7 years ago
Albert Astals Cid
fe0c8ad7c9
MarkDown: Enable option to disable smartypants formatting
...
BUGS: 404616
Subscribers: okular-devel
Tags: #okular
Differential Revision: https://phabricator.kde.org/D19405
7 years ago
l10n daemon script
aaa176041d
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
5e01eff352
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
241bc6525a
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"
7 years ago
l10n daemon script
6bcf22da75
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
802e8814aa
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
33a5f67eb2
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"
8 years ago
l10n daemon script
4e9bbfddb0
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"
8 years ago
Yuri Chornoivan
c04ca1fa96
Fix minor EBN issues
8 years ago
l10n daemon script
d85fe1df64
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"
8 years ago
l10n daemon script
bae0e13719
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
f1d3c68115
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"
8 years ago
l10n daemon script
5f93a0b90e
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
c4570f7e40
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
2e73a6d76f
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"
8 years ago
l10n daemon script
879a46ac55
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"
8 years ago
Sune Vuorela
3e48663fb7
Use a target in FindDiscount (modern cmake) rather than variables
...
Test Plan: Things still builds
Reviewers: kde-buildsystem, apol
Reviewed By: apol
Subscribers: apol, aacid, #okular
Tags: #okular
Differential Revision: https://phabricator.kde.org/D12672
8 years ago
l10n daemon script
ee57925c57
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
26c40ab7bd
GIT_SILENT made messages (after extraction)
8 years ago
Sune Vuorela
13bdb97084
Don't crash if fopen fails
...
Summary:
If we have a qrc url, all checks so far fails, and this one returns null.
It might also be possible to get here in some race condition.
Reviewers: aacid
Reviewed By: aacid
Subscribers: #okular
Tags: #okular
Differential Revision: https://phabricator.kde.org/D12643
8 years ago
l10n daemon script
b9a392d6b8
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"
8 years ago
l10n daemon script
d82ca473d5
GIT_SILENT made messages (after extraction)
8 years ago