office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-11-05 18:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
7670 commits 138 branches 360 tags 104 MiB
Commit graph

7670 commits

This branch
This branch
All branches
Author SHA1 Message Date
l10n daemon script
b6614c4da4 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 05:17:25 +01:00
l10n daemon script
6bc9feaba4 GIT_SILENT made messages (after extraction) 2016-12-12 04:38:06 +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
Albert Astals Cid
34a26a1703 Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-09 23:01:04 +01:00
Albert Astals Cid
a3e0e630e2 Update version 
GIT_SILENT
 2016-12-09 23:00:22 +01:00
l10n daemon script
4ed39dfc16 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 05:11:11 +01:00
l10n daemon script
8c2120e2d3 GIT_SILENT made messages (after extraction) 2016-12-09 04:31:33 +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
Albert Astals Cid
533c0044bf Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-09 00:36:44 +01:00
Albert Astals Cid
964e3eb2e5 Test: Be really patient 
just to make sure it's not the machine being slow and it's the test that actually is failing
 2016-12-09 00:35:52 +01:00
Albert Astals Cid
ef860fb1d8 Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-08 23:39:47 +01:00
Albert Astals Cid
ecf54e4203 Try other generators if opening fails with one generator 
This is not very common but would happen so be a bit stubborner
 2016-12-08 23:35:04 +01:00
Miklós Máté
e81fb3d639 Check all supported mime types the generator supports 
Stopping on the first inherit match can prevent finding a perfect match, and thus we might enter a competition of inherit matches from other generators.

Example: spectre supports application/postscript and image/x-eps. When opening an eps the app/ps is an inherit match, but so is text/plain from the txt generator. Thanks to stable_sort() the txt generator is deterministically selected from the above two inherit matches. Unless we continue and find the perfect match, which is spectre:image/x-eps.

REVIEW: 129610
 2016-12-08 22:42:44 +01:00
Albert Astals Cid
1747b8b662 Match the spring actually push things up 2016-12-08 22:34:50 +01:00
Albert Astals Cid
6e1d3bb1bc GIT_SILENT Upgrade KDE Applications version to 16.12.0. 2016-12-06 20:57:55 +01:00
Pino Toscano
a936c7bf3f dox: the 'interfaces' subdir contains public API as well 2016-12-04 19:04:53 +01:00
l10n daemon script
55f69270ca GIT_SILENT made messages (after extraction) 2016-12-03 13:56:24 +01:00
l10n daemon script
9f34f51ec1 GIT_SILENT made messages (after extraction) 2016-12-03 02:50:03 +01:00
l10n daemon script
5282d434ee 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 05:48:46 +01:00
l10n daemon script
56759cd0b3 SVN_SILENT made messages (after extraction) 2016-12-02 05:11:22 +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
Albert Astals Cid
d248be4173 GIT_SILENT Upgrade KDE Applications version to 16.11.90. 2016-11-29 22:16:51 +01:00
l10n daemon script
e65f2c6f62 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 05:41:48 +01:00
l10n daemon script
fecf0a8de6 SVN_SILENT made messages (after extraction) 2016-11-29 05:04:44 +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
Burkhard Lück
0e2c93fa74 replace common settings + help menu items with link to fundamentals 
REVIEW:129570
 2016-11-29 02:22:59 +01:00
l10n daemon script
5527fe1d44 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 05:28:46 +01:00
l10n daemon script
43cde01ced SVN_SILENT made messages (after extraction) 2016-11-28 04:44: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
Hrvoje Senjan
50aa7d41d6 Compile with poppler < 0.50.0 
CCMAIL: aacid@kde.org
 2016-11-27 14:03:17 +01:00
Albert Astals Cid
6e4bccc7a0 Compile++ 2016-11-26 16:46:55 +01:00
Albert Astals Cid
ae69198454 wops, extra "a" 2016-11-26 16:26:16 +01:00
Albert Astals Cid
2868e3e5ca Support SetOCGState links 
Needs a very recent poppler

BUGS: 368402
REVIEW: 129216
 2016-11-26 16:00:46 +01:00
l10n daemon script
5d3508c112 SVN_SILENT made messages (after extraction) 2016-11-25 05:48:54 +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
854d997fd5 SVN_SILENT made messages (after extraction) 2016-11-25 03:12:40 +01:00
l10n daemon script
5ddc51b6c3 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 05:41:42 +01:00
l10n daemon script
6aaf19e884 SVN_SILENT made messages (after extraction) 2016-11-23 04:59:06 +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
7cb74091e3 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-22 06:10:26 +01:00
l10n daemon script
a1fbd54673 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 05:41:15 +01:00
l10n daemon script
41ca35870f SVN_SILENT made messages (after extraction) 2016-11-21 05:02:16 +01:00