l10n daemon script
c9440a9160
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"
2020-11-25 06:34:22 +01:00
l10n daemon script
a752711872
GIT_SILENT made messages (after extraction)
2020-11-25 02:20:39 +01:00
David Hurka
055d5709c1
Merge branch 'release/20.08' into master
2020-11-08 02:05:10 +01:00
Christoph Feck
02c3bd691a
GIT_SILENT Update Appstream for new release
2020-10-31 18:08:36 +01:00
Laurent Montel
486e05b270
If include is define in .h remove it if it's defined in .cpp too (scripted)
2020-10-23 07:32:28 +02:00
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"
2020-10-17 06:04:22 +02:00
l10n daemon script
6abe9fcdfd
GIT_SILENT made messages (after extraction)
2020-10-17 02:16:46 +02:00
Christoph Feck
6a31bfc7e3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 0abdab924d
)
2020-10-03 14:20:24 +02:00
Christoph Feck
0abdab924d
GIT_SILENT Update Appstream for new release
2020-10-03 14:20:23 +02:00
Christoph Feck
b3101774cf
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4b9e50a1ed
)
2020-08-31 21:02:07 +02:00
Christoph Feck
4b9e50a1ed
GIT_SILENT Update Appstream for new release
2020-08-31 21:02:06 +02:00
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.
2020-08-22 23:32:27 +00:00
Christoph Feck
f6ce4a57d8
GIT_SILENT Update Appstream for new release
2020-08-05 09:52:57 +02:00
Christoph Feck
d0b9d83946
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit f6ce4a57d8
)
2020-08-05 09:52:57 +02:00
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"
2020-07-30 09:32:05 +02:00
l10n daemon script
8f81af09e2
GIT_SILENT made messages (after extraction)
2020-07-30 07:58:09 +02:00
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"
2020-07-30 05:49:55 +02:00
l10n daemon script
685ae66b45
GIT_SILENT made messages (after extraction)
2020-07-30 02:13:37 +02:00
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"
2020-07-25 05:29:31 +02:00
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)
2020-07-11 09:17:33 +02:00
Laurent Montel
516fb89d94
Use camelcase include. (scripted)
2020-07-08 13:54:37 +02:00
Christoph Feck
182e2791d7
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 13dc58655a
)
2020-07-03 23:03:22 +02:00
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"
2020-06-18 05:35:59 +02:00
l10n daemon script
f046034c69
GIT_SILENT made messages (after extraction)
2020-06-18 02:14:44 +02:00
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"
2020-06-17 14:03:40 +02:00
l10n daemon script
6cd2e32e64
GIT_SILENT made messages (after extraction)
2020-06-17 11:28:48 +02:00
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"
2020-06-10 05:21:36 +02:00
Nate Graham
4ee6b5066d
Merge branch 'release/20.04'
2020-06-09 13:16:33 -06:00
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"
2020-06-09 09:16:32 +02:00
Christoph Feck
6bb75da566
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 884b082aea
)
2020-06-08 19:53:17 +02:00
Christoph Feck
884b082aea
GIT_SILENT Update Appstream for new release
2020-06-08 19:53:16 +02:00
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
2020-05-12 22:21:15 +00:00
Christoph Feck
3d148bd570
GIT_SILENT Update Appstream for new release
2020-05-11 23:14:44 +02:00
Christoph Feck
5e1f2c9a47
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 3d148bd570
)
2020-05-11 23:14:44 +02:00
Albert Astals Cid
d8e4796830
Merge remote-tracking branch 'origin/release/20.04'
2020-04-16 00:06:40 +02:00
Albert Astals Cid
903cdec02b
GIT_SILENT fix version
...
need to figure out a way to make this work :/
2020-04-16 00:06:00 +02:00
Christoph Feck
8fd53e5674
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit c8dcf1fdea
)
2020-04-15 11:06:58 +02:00
Christoph Feck
c8dcf1fdea
GIT_SILENT Update Appstream for new release
2020-04-15 11:06:58 +02:00
Nicolas Fella
7d24a51e6a
Launch okularkirigami directly instead of via kpackagelauncherqml
2020-03-29 12:39:19 +00:00
Albert Astals Cid
4964e7e42d
Merge remote-tracking branch 'origin/release/19.12'
2020-03-02 22:22:06 +01:00
Christoph Feck
a7876ca013
GIT_SILENT Update Appstream for new release
2020-03-01 10:37:27 +01:00
Albert Astals Cid
af35ef4fbf
Merge remote-tracking branch 'origin/release/19.12'
2020-02-23 22:33:56 +01:00
Albert Astals Cid
5ecbb51f77
Enable modernize-use-nullptr
2020-02-19 18:10:05 +01:00
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"
2020-02-04 10:04:28 +01:00
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"
2020-02-04 06:09:17 +01:00
Christoph Feck
a18c013932
GIT_SILENT Update Appstream for new release
2020-02-04 00:16:27 +01:00
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"
2020-01-28 05:42:48 +01:00
l10n daemon script
a5eda6348f
GIT_SILENT made messages (after extraction)
2020-01-28 03:10:03 +01:00
Albert Astals Cid
88e5775f34
Merge remote-tracking branch 'origin/release/19.12'
2020-01-07 23:28:40 +01:00
Christoph Feck
475652a990
Update Appstream for new release
2020-01-06 14:55:05 +01:00