office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-28 19:28:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
8851 commits 138 branches 360 tags 104 MiB
Commit graph

283 commits

Author SHA1 Message Date
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
Albert Astals Cid
46d1ba0e20 Enable clazy missing-qobject-macro 2020-02-21 17:09:46 +01:00
Albert Astals Cid
1a05112be1 CI: enable clazy incorrect-emit 2020-02-19 23:44:41 +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
Albert Astals Cid
8d6109de65 Merge remote-tracking branch 'origin/release/19.12' 2019-12-24 11:13:36 +01:00
Ahmad Samir
54494cc3d4 [generators/*] Replace deprecated foreach with range-for 2019-12-23 06:06:25 +00: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
Albert Astals Cid
da21543a50 Small performance improvements 2019-10-05 22:16:43 +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
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
 2019-05-27 08:02:57 +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
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