office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-12 20:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
8765 commits 136 branches 359 tags 153 MiB
Commit graph

271 commits

Author SHA1 Message Date
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 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
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 c8dcf1fdea GIT_SILENT Update Appstream for new release 2020-04-15 11:06:58 +02: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
l10n daemon script 26c40ab7bd GIT_SILENT made messages (after extraction) 2018-05-06 03:31:04 +02: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
Albert Astals Cid f621cd0c42 Add a few overrides 2017-11-03 15:20:01 +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
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