Commits · b3e941e73604f6dbd106ae9fe25368b24be5cbbf · Graphics / Okular

27 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b3e941e7

Script Kiddy authored Sep 27, 2017

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"

b3e941e7

26 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f6424adc

Script Kiddy authored Sep 26, 2017

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"

f6424adc

25 Sep, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f4504f47
  Script Kiddy authored Sep 25, 2017
```
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"
```
  f4504f47
- GIT_SILENT made messages (after extraction) · e47a5432
  Script Kiddy authored Sep 25, 2017
  
  e47a5432
22 Sep, 2017 1 commit
- GIT_SILENT made messages (after extraction) · 715a948a
  Script Kiddy authored Sep 22, 2017
  
  715a948a
21 Sep, 2017 1 commit
- Fix string: no exclamation mark, add article · e93cb789
  Luigi Toscano authored Sep 21, 2017
```
Exclamation marks should not be used according the guidelines.
```
  e93cb789
16 Sep, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 62ce3db9
  Script Kiddy authored Sep 16, 2017
```
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"
```
  62ce3db9
- GIT_SILENT made messages (after extraction) · f81b6603
  Script Kiddy authored Sep 16, 2017
  
  f81b6603
13 Sep, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 127ce16b
  Script Kiddy authored Sep 13, 2017
```
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"
```
  127ce16b
- GIT_SILENT made messages (after extraction) · 1444a2d6
  Script Kiddy authored Sep 13, 2017
  
  1444a2d6
12 Sep, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9d406705
  Script Kiddy authored Sep 12, 2017
```
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"
```
  9d406705
- GIT_SILENT made messages (after extraction) · 193ecf76
  Script Kiddy authored Sep 12, 2017
  
  193ecf76
04 Sep, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4be86a4b
  Script Kiddy authored Sep 04, 2017
```
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"
```
  4be86a4b
- GIT_SILENT made messages (after extraction) · e56e08a7
  Script Kiddy authored Sep 04, 2017
  
  e56e08a7
01 Sep, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · dbb801f2
  Script Kiddy authored Sep 01, 2017
```
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"
```
  dbb801f2
- GIT_SILENT made messages (after extraction) · 910c06e4
  Script Kiddy authored Sep 01, 2017
  
  910c06e4
30 Aug, 2017 3 commits
- Fix warning about TRANSLATION_DOMAIN being defined twice · e18783f7
  Albert Astals Cid authored Aug 30, 2017
  
  e18783f7
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7e5e26a1
  Script Kiddy authored Aug 30, 2017
```
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"
```
  7e5e26a1
- GIT_SILENT made messages (after extraction) · 74679c36
  Script Kiddy authored Aug 30, 2017
  
  74679c36
29 Aug, 2017 2 commits
- Fix translation also for the new Markdown generator · 007030a6
  Luigi Toscano authored Aug 30, 2017
```
Define the translation domain for it as well.
```
  007030a6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0f010126
  Script Kiddy authored Aug 29, 2017
```
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"
```
  0f010126
27 Aug, 2017 3 commits
- markdown: Obey the font size set in the settings · 39c76da6
  Albert Astals Cid authored Aug 27, 2017
  
  39c76da6
- SVN_SILENT made messages (.desktop file) - always resolve ours · a6731c0e
  Script Kiddy authored Aug 27, 2017
```
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"
```
  a6731c0e
- GIT_SILENT made messages (after extraction) · 3422520a
  Script Kiddy authored Aug 27, 2017
  
  3422520a
26 Aug, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 92a08d9a
  Script Kiddy authored Aug 26, 2017
```
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"
```
  92a08d9a
- GIT_SILENT made messages (after extraction) · e279e26b
  Script Kiddy authored Aug 26, 2017
  
  e279e26b
25 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 003d46e9

Script Kiddy authored Aug 25, 2017

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"

003d46e9

24 Aug, 2017 2 commits

Small rework for the markdown converter · 551f0b62

Albert Astals Cid authored Aug 25, 2017

Don't have the textdocument and dir as members, pass them along
This is to make clear that this is a "one off stateless conversion",
i.e. after convert returns the converter doesn't own the textdocument
anymore, so better don't keep a pointer to it

551f0b62

add markdown support · 49313857

Julian Wolff authored Aug 25, 2017

Summary:
Adds support for Markdown documents

BUG: 360603

Test Plan: Open a Markdown (.md) document in Okular

Reviewers: #okular, aacid

Reviewed By: #okular, aacid

Subscribers: michaelweghorn, aacid

Tags: #okular

Differential Revision: https://phabricator.kde.org/D7382

49313857