office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
10894 commits 137 branches 359 tags 75 MiB
Commit graph

558 commits

Author SHA1 Message Date
Christoph Feck 02c3bd691a GIT_SILENT Update Appstream for new release 2020-10-31 18:08:36 +01: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
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 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 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
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
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
Albert Astals Cid 8d6109de65 Merge remote-tracking branch 'origin/release/19.12' 2019-12-24 11:13:36 +01:00
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
 2019-12-18 12:51:13 +01:00
Albert Astals Cid f7f2b3105f Increase version here too 2019-12-05 23:50:27 +01:00
Christoph Feck 7974aa1d36 Update Appstream for new release 2019-12-05 22:05:15 +01:00
l10n daemon script 7f97880667 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"
 2019-09-09 05:09:03 +02:00
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"
 2019-08-12 05:10:27 +02:00
l10n daemon script a7742d4604 GIT_SILENT made messages (after extraction) 2019-05-22 03:10:30 +02:00
l10n daemon script aaa176041d GIT_SILENT made messages (after extraction) 2019-02-16 03:14:15 +01:00
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"
 2019-02-10 05:27:14 +01:00
Albert Astals Cid 58038fed18 Do not crash in files without title-info 
BUGS: 402558
 2018-12-26 12:02:31 +01:00
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"
 2018-10-24 05:59:57 +02:00
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"
 2018-10-10 06:37:12 +02:00
l10n daemon script 96f4f27ba6 GIT_SILENT made messages (after extraction) 2018-10-10 04:08:48 +02:00
Yuri Chornoivan 39b6e8147d Fix minor EBN issues 2018-09-01 11:25:57 +03:00
Yuri Chornoivan c04ca1fa96 Fix minor EBN issues 2018-08-31 12:23:45 +03:00
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"
 2018-08-04 05:43:46 +02:00
l10n daemon script 5f93a0b90e GIT_SILENT made messages (after extraction) 2018-08-04 03:45:00 +02:00
l10n daemon script c4570f7e40 GIT_SILENT made messages (after extraction) 2018-07-16 03:26:51 +02:00
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"
 2018-07-07 05:17:35 +02:00
l10n daemon script 26c40ab7bd GIT_SILENT made messages (after extraction) 2018-05-06 03:31:04 +02:00
Abdel-Rahman Abdel-Rahman ce7fa7b9d8 Fictionbook: Add support for code, superscript, & subscript tags 
Summary: BUG: 387426

Test Plan: Open a book with the code, superscript, & subscript tags. Verify that the code is visible in a mono-space font, & superscripts & subscripts are formatted appropriately.

Reviewers: #okular, aacid

Reviewed By: #okular, aacid

Subscribers: aacid, cfeck, ngraham

Tags: #okular

Differential Revision: https://phabricator.kde.org/D10566
 2018-02-18 23:29:02 +01:00
l10n daemon script 29b1dec92b 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"
 2018-01-29 05:04:25 +01:00
l10n daemon script 066805c550 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"
 2017-12-01 04:51:24 +01:00
l10n daemon script 22885c00b0 GIT_SILENT made messages (after extraction) 2017-12-01 03:10:28 +01:00
l10n daemon script 02a4cfb26a 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"
 2017-11-28 06:52:56 +01:00
l10n daemon script 0ef249b5a5 GIT_SILENT made messages (after extraction) 2017-11-28 05:48:07 +01:00
l10n daemon script 1883a06614 GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
l10n daemon script 72abe6f85a GIT_SILENT made messages (after extraction) 2017-10-11 06:41:11 +02:00
Kevin Funk a53a2402ca clang-tidy: modernize-use-nullptr run 
Semi-ACK'd by Albert :)
 2017-09-06 00:19:48 +02:00
Albert Astals Cid 69982161e7 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-30 23:08:20 +02:00
Albert Astals Cid 9a25ea41dc Fix warning about TRANSLATION_DOMAIN being defined twice 2017-08-30 23:07:03 +02:00
Luigi Toscano d9584b30d8 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-30 01:29:21 +02:00
Luigi Toscano e858ecdd7c Fix translations: add translation domain for generators 
Generators are libraries, so define the proper TRANSLATION_DOMAIN
for each for them.

Thanks Albert for spotting this.
 2017-08-30 01:27:35 +02:00
l10n daemon script 3349c9fff7 GIT_SILENT made messages (after extraction) 2017-08-27 05:21:29 +02:00
l10n daemon script 3422520a5c GIT_SILENT made messages (after extraction) 2017-08-27 03:08:01 +02:00
l10n daemon script 0b85b7c138 GIT_SILENT made messages (after extraction) 2017-08-26 05:23:57 +02:00
l10n daemon script e279e26b40 GIT_SILENT made messages (after extraction) 2017-08-26 03:18:37 +02:00
l10n daemon script 36c60741fb 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"
 2017-07-30 04:54:11 +02:00
l10n daemon script 19406fdf57 GIT_SILENT made messages (after extraction) 2017-07-30 03:25:35 +02:00
l10n daemon script 767a1c0eac 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"
 2017-05-21 04:36:10 +02:00
l10n daemon script bfe1f62eb5 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"
 2017-05-12 04:21:17 +02:00
l10n daemon script ef9ea64bc3 GIT_SILENT made messages (after extraction) 2017-05-12 02:59:10 +02:00
l10n daemon script 94fbca1c95 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"
 2017-04-22 04:06:38 +02:00
l10n daemon script a25642c178 GIT_SILENT made messages (after extraction) 2017-04-22 02:52:16 +02:00
l10n daemon script 91e740c236 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"
 2017-04-17 04:01:59 +02:00
l10n daemon script cce5cf2592 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"
 2017-04-09 04:02:44 +02:00
Albert Astals Cid 191a37fb52 Q_DECL_OVERRIDE -> override 2017-03-02 20:39:24 +01:00
Albert Astals Cid 4072eb0c3a Add override 2017-03-02 20:38:50 +01:00
l10n daemon script c55c44ed95 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"
 2017-02-07 12:50:18 +01:00
l10n daemon script 2a0bdca687 GIT_SILENT made messages (after extraction) 2017-02-07 08:56:11 +01:00
l10n daemon script 7381616690 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"
 2017-02-06 06:04:23 +01:00
l10n daemon script 53a6cde141 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"
 2017-02-04 06:23:35 +01:00
l10n daemon script 0922f2f524 GIT_SILENT made messages (after extraction) 2017-02-04 03:59:15 +01:00
l10n daemon script 0cbf1d24e7 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"
 2017-02-02 05:57:03 +01:00
l10n daemon script e44b17080a 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"
 2017-01-09 06:00:41 +01:00
l10n daemon script 93b824de9e GIT_SILENT made messages (after extraction) 2017-01-09 03:54:16 +01:00
l10n daemon script 30993aa3f1 GIT_SILENT made messages (after extraction) 2016-12-26 03:41:57 +01:00
l10n daemon script fb77e0d1fd 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"
 2016-12-20 13:06:28 +01:00
l10n daemon script 006cb782a2 GIT_SILENT made messages (after extraction) 2016-12-20 09:19:46 +01:00
l10n daemon script 20f6524016 GIT_SILENT made messages (after extraction) 2016-12-13 02:45:16 +01:00
l10n daemon script 4952893372 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"
 2016-12-12 03:58:04 +01:00
l10n daemon script e798a92c06 GIT_SILENT made messages (after extraction) 2016-12-12 02:39:28 +01:00
l10n daemon script 0d6f6edf60 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"
 2016-12-09 03:56:48 +01:00
l10n daemon script 31da71cdec GIT_SILENT made messages (after extraction) 2016-12-09 02:36:45 +01:00
l10n daemon script dcb3edcf30 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"
 2016-12-02 04:33:12 +01:00
l10n daemon script 4c8280e461 SVN_SILENT made messages (after extraction) 2016-12-02 03:21:51 +01:00
l10n daemon script fa74d6eea7 SVN_SILENT made messages (after extraction) 2016-12-01 02:51:26 +01:00
l10n daemon script 297795d40d 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"
 2016-11-30 04:27:22 +01:00
l10n daemon script fe628b9dbf 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"
 2016-11-29 04:25:46 +01:00
l10n daemon script 96fd8111c1 SVN_SILENT made messages (after extraction) 2016-11-29 03:09:19 +01:00
l10n daemon script 3fe1bef3d6 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"
 2016-11-28 04:07:25 +01:00
l10n daemon script f505e51b32 SVN_SILENT made messages (after extraction) 2016-11-28 02:53:18 +01:00
l10n daemon script da42e4b166 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"
 2016-11-25 05:01:26 +01:00
l10n daemon script 5a7f11927f 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"
 2016-11-23 04:21:05 +01:00
l10n daemon script d075df4eb0 SVN_SILENT made messages (after extraction) 2016-11-23 02:56:17 +01:00
l10n daemon script 151a8f7e78 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"
 2016-11-21 04:18:14 +01:00
l10n daemon script 2e65d70f63 SVN_SILENT made messages (after extraction) 2016-11-21 03:03:57 +01:00
l10n daemon script 66cba6e293 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"
 2016-11-09 09:19:08 +00:00
l10n daemon script 3f484b44a9 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"
 2016-11-08 10:00:59 +00:00
l10n daemon script 92efe12446 SVN_SILENT made messages (after extraction) 2016-11-08 07:35:23 +00:00
l10n daemon script a673dca880 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"
 2016-11-07 09:47:04 +00:00
l10n daemon script dcb51a7f26 SVN_SILENT made messages (after extraction) 2016-11-07 07:22:48 +00:00
l10n daemon script b1bb8bfc61 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"
 2016-11-06 09:39:30 +00:00
l10n daemon script 466a6ae8c2 SVN_SILENT made messages (after extraction) 2016-11-06 07:17:39 +00:00
Friedrich W. H. Kossebau 37aafeba93 Remove no longer existing include dir 
--warnings
 2016-11-05 20:14:26 +01:00
l10n daemon script 3a16c16a17 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"
 2016-11-05 10:00:05 +00:00
Burkhard Lück 4c1a44bc40 add missing metainfo.xml files 2016-11-04 22:59:04 +01:00
Burkhard Lück 9ae16afd97 use reverse domain-name scheme for metainfo.xml files 2016-11-04 22:47:28 +01:00
Burkhard Lück 1c9a9ce947 use reverse domain-name for component ID 2016-11-04 22:22:54 +01:00
Burkhard Lück 8666cacb92 add appdata file + metadata for chm, comicbook, djvu, dvi, epub, fax, fictionbook 
REVIEW:128404
 2016-11-04 14:56:55 +01:00
l10n daemon script 191e10300d 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"
 2016-11-04 09:43:54 +00:00
Albert Vaca c71f308252 Fixes suggested by Clazy 2016-10-29 16:33:05 +02:00
Albert Astals Cid 62eea3336b Merge remote-tracking branch 'origin/master' into frameworks 2016-10-29 11:13:24 +02:00
Olivier CHURLAUD 3b608a66c9 Preview functions again. 
I added again the okularXXX.desktop

Correct the mess done by review 126193
 2016-07-21 23:05:54 +02:00
Martin T. H. Sandsmark 004f67410d Use proper qvariant cast 2016-07-11 22:14:11 +02:00
Martin T. H. Sandsmark 2b473fedbd generators: Fix build without implicit cast to/from ascii 
See previous commit for details.
 2016-07-11 21:59:14 +02:00
l10n daemon script bae370462c 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"
 2016-06-25 03:22:57 +00:00
Albert Vaca 67f69c8871 Merge branch 'master' into frameworks 
# Conflicts:
#	CMakeLists.txt
#	active/app/package/metadata.desktop
#	conf/widgetannottools.cpp
#	core/version.h
#	generators/poppler/libokularGenerator_poppler.desktop
#	generators/txt/libokularGenerator_txt.desktop
#	generators/xps/libokularGenerator_xps.desktop
#	ui/annotationwidgets.cpp
#	ui/presentationwidget.cpp
 2016-02-22 03:50:54 -08:00
l10n daemon script 119bb0ecd2 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"
 2016-01-18 04:45:59 +00:00
l10n daemon script 57c5cbfde0 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"
 2016-01-09 03:25:47 +00:00
l10n daemon script a2fd918ad9 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"
 2016-01-05 04:07:32 +00:00
Alex Richardson 00b15528a4 Add the Copyright information back to the JSON files 
REVIEW: 126193
 2016-01-04 15:59:07 +01:00
Alex Richardson 2f9246ae42 Port to new JSON plugin loading system 
This means Okular can now work without ksycoca and KDELibs4Support.

REVIEW: 126193
 2016-01-04 15:59:07 +01:00
l10n daemon script 2fee136339 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"
 2015-12-08 03:41:42 +00:00
l10n daemon script 16f0780688 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"
 2015-11-22 03:43:12 +00:00
l10n daemon script 9a5c82a411 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"
 2015-11-05 04:21:47 +00:00
Montel Laurent 466eb79615 Use QStringLiteral 2015-10-29 13:37:11 +01:00
Albert Astals Cid 8445660539 Merge remote-tracking branch 'origin/master' into frameworks 2015-10-18 22:29:00 +02:00
l10n daemon script 98ac941316 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"
 2015-10-18 04:25:21 +00:00
l10n daemon script 8c141cc2fc 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"
 2015-10-12 04:04:13 +00:00
l10n daemon script cd34059f53 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"
 2015-10-08 04:21:25 +00:00
l10n daemon script 7b8f0a7459 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"
 2015-09-26 04:04:15 +00:00
l10n daemon script 22ba4596fa 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"
 2015-09-21 03:49:52 +00:00
l10n daemon script 558b4bb765 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"
 2015-09-15 05:00:52 +00:00
l10n daemon script dde68921b6 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"
 2015-09-13 04:04:10 +00:00
l10n daemon script f6d4b45650 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"
 2015-09-10 05:23:01 +00:00
l10n daemon script 2669a2f354 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"
 2015-09-08 05:32:59 +00:00
l10n daemon script 2b1cf29728 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"
 2015-09-06 04:39:34 +00:00
l10n daemon script 6a2b5fc7b8 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"
 2015-09-04 03:59:45 +00:00
l10n daemon script 79fa933c73 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"
 2015-09-03 04:18:26 +00:00
l10n daemon script ef99f17efb 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"
 2015-09-02 03:58:51 +00:00
l10n daemon script 8703484e63 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"
 2015-09-01 05:00:47 +00:00
l10n daemon script 7be388fa0f 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"
 2015-08-31 04:47:52 +00:00
Albert Astals Cid ab8944dcce Add Comment 
BUGS: 351973
 2015-08-30 16:43:39 +02:00
Montel Laurent 014b712359 Use explicit. Q_DECL_OVERRIDE 2015-08-18 15:27:20 +02:00
Marco Martin 1dd033d914 rename all the active specific desktop files 2015-08-05 16:54:48 +02:00
Alex Richardson 1049dc188a Add Q_INTERFACES( Okular::Generator ) to all plugins 
This seems to be required with KPluginFactory and Qt5 since without it
KPluginFactory::create<Okular::Generator>() always returns null.

For some reason this requires a complete rebuild before generatorstest
passes.

REVIEW: 123466
 2015-05-22 16:33:09 +01:00
Alex Richardson cfc82ee9b0 Be explicit about the target dependencies 2015-04-14 20:04:26 +01:00
Marco Martin af3b4cba17 use the new kpackage-based runtime for the QML app 
remove old dead code, the okular active app is now completely
qml and KPackage based
 2015-04-03 16:56:00 +02:00
Montel Laurent 629882497b Rename icons 2015-03-19 08:48:11 +01:00
Montel Laurent 5e984303a4 Use new KDE_ macro 2015-03-04 07:52:20 +01:00
Montel Laurent 5c85b83a8f Fix includes 2015-02-07 13:16:07 +01:00
Montel Laurent 61628e5bc7 Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	part.cpp
 2015-02-07 13:12:59 +01:00
Lukáš Tinkl e9ae1d99af port away from KLocale 2015-01-29 21:48:47 +01:00
l10n daemon script 557b5447a5 SVN_SILENT made messages (.desktop file) 2015-01-21 03:53:40 +00:00
l10n daemon script 9a3672b255 SVN_SILENT made messages (.desktop file) 2014-12-26 04:18:45 +00:00
l10n daemon script e6ef3cb64b SVN_SILENT made messages (.desktop file) 2014-12-25 04:05:24 +00:00
Montel Laurent 8f5e86cec5 Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	core/version.h
 2014-11-30 12:56:10 +01:00
l10n daemon script be1ad62df7 SVN_SILENT made messages (.desktop file) 2014-11-15 04:10:57 +00:00
Montel Laurent 98eb283364 Fix icons 2014-10-19 18:23:14 +02:00
Montel Laurent 17a55c6dab Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	CMakeLists.txt
	core/document.cpp
	generators/poppler/CMakeLists.txt
	generators/poppler/generator_pdf.cpp
	generators/poppler/generator_pdf.h
 2014-10-09 07:34:35 +02:00
l10n daemon script d9a48c888a SVN_SILENT made messages (.desktop file) 2014-10-09 04:05:29 +00:00
Montel Laurent 3b4ee788b8 Fix includes 2014-10-08 13:37:04 +02:00
Jeremy Whiting 83299b9532 Remove %i from .desktop files which added --icon to exec line. 
Since Okular no longer uses KApplication it no longer handles --icon parameters.
 2014-10-07 16:41:59 -06:00
Montel Laurent 6300c30fea Fix cmakelists.txt 2014-10-06 09:00:20 +02:00
Montel Laurent 89bb5562ac Reactivate some generator 2014-10-02 13:43:03 +02:00
Montel Laurent 927e7a9a19 Merge remote-tracking branch 'origin/KDE/4.14' into frameworks 2014-10-01 07:29:17 +02:00
Montel Laurent 378f6847a2 Remove some deprecated kdelibs4support 2014-10-01 07:27:09 +02:00
l10n daemon script 3588634833 SVN_SILENT made messages (.desktop file) 2014-09-30 09:11:55 +00:00
l10n daemon script 8365cf2873 SVN_SILENT made messages (.desktop file) 2014-09-30 04:39:47 +00:00
Raymond Wooninck f4badbc117 Port the aboutData to the new methods. Next would be to bring back 
to About Backend dialog
 2014-09-18 22:17:10 +02:00
Frederik Gladhorn f7d1dd9312 Remove -caption %c from .desktop files 
BUGS: 338264
 2014-09-17 20:16:49 +02:00
Yuri Chornoivan b98f1e9338 Add FB2 icons (design by Vladimir Prohorenkov, allowed to use under free license by the author). 
REVIEW: 118862
 2014-08-16 07:18:01 +03:00
Frederik Gladhorn 7261d5d45a Generator porting (mostly kaboutdata) 2014-08-09 21:29:06 +02:00
l10n daemon script 896de56ef0 SVN_SILENT made messages (.desktop file) 2014-07-25 05:38:42 +00:00
l10n daemon script 1b5cbbea59 SVN_SILENT made messages (.desktop file) 2014-07-24 04:51:37 +00:00
l10n daemon script d62def2323 SVN_SILENT made messages (.desktop file) 2014-07-06 04:29:52 +00:00
l10n daemon script 6a46dd7447 SVN_SILENT made messages (.desktop file) 2014-06-30 04:40:38 +00:00
l10n daemon script c6de0ba3a5 SVN_SILENT made messages (.desktop file) 2014-04-02 07:37:55 +00:00