Christoph Feck
02c3bd691a
GIT_SILENT Update Appstream for new release
5 years ago
Laurent Montel
486e05b270
If include is define in .h remove it if it's defined in .cpp too (scripted)
5 years ago
l10n daemon script
dc74ffa68c
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"
5 years ago
l10n daemon script
6abe9fcdfd
GIT_SILENT made messages (after extraction)
5 years ago
Christoph Feck
6a31bfc7e3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 0abdab924d )
6 years ago
Christoph Feck
0abdab924d
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
b3101774cf
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4b9e50a1ed )
6 years ago
Christoph Feck
4b9e50a1ed
GIT_SILENT Update Appstream for new release
6 years ago
Markus Brenneis
89cf21b222
Add support for image sizes in markdowns
...
The discount markdown parser supports parsing explicit image sizes in markdown, but we ignore them and replace them with the actual image dimensions. With this patch, any specified image sizes are respected.
6 years ago
Christoph Feck
f6ce4a57d8
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
d0b9d83946
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit f6ce4a57d8 )
6 years ago
l10n daemon script
36a6010c4f
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
8f81af09e2
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
8563aa45cb
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
685ae66b45
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
3ef3de28c8
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
Albert Astals Cid
19d98d6a74
Run clang-format
...
find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format -i {} \;
If you reached this file doing a git blame, please see README.clang-format (added 2 commits in the future of this one)
6 years ago
Laurent Montel
516fb89d94
Use camelcase include. (scripted)
6 years ago
Christoph Feck
182e2791d7
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 13dc58655a )
6 years ago
l10n daemon script
7254c56886
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
e5f4a0d6da
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
90502b2961
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
f046034c69
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
1f50b2a6b4
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
c8fee988f4
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
2857dc241f
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
6cd2e32e64
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
35e43602d4
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
ef53790eba
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
cc452498e5
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
6bb75da566
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 884b082aea )
6 years ago
Christoph Feck
884b082aea
GIT_SILENT Update Appstream for new release
6 years ago
Albert Astals Cid
b1c02b7e79
Markdown: Support internal links
...
When processing the <a> elements, store in two maps those that contain
an href="#Something" and those with name="Something" then once we've
processed them all, go over the first map trying to find itself in the
second
BUGS: 421163
6 years ago
Christoph Feck
3d148bd570
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
5e1f2c9a47
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 3d148bd570 )
6 years ago
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