Commits · 2fee1363392115b829860b91372b3cc054a023b0 · Joao Oliveira / Okular

08 Dec, 2015 1 commit

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

Script Kiddy authored Dec 08, 2015

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"

2fee1363

07 Dec, 2015 3 commits
- Merge remote-tracking branch 'origin/Applications/15.12' · 7ff9609d
  Albert Astals Cid authored Dec 07, 2015
  
  7ff9609d
- Increase version for KDE Applications 15.12.0 · 450fff88
  Albert Astals Cid authored Dec 07, 2015
```
And soversion of the core library sicne there's a new virtual in it
```
  450fff88
- SVN_SILENT made messages (.desktop file) · 9c7a558b
  Script Kiddy authored Dec 07, 2015
  
  9c7a558b
24 Nov, 2015 1 commit
- Make inline annotation border width customizable, using a spin widget to accept input · 3400f76d
  Sumit Sahrawat authored Nov 24, 2015
```
REVIEW: 125801
BUGS: 332887
```
  3400f76d
22 Nov, 2015 1 commit

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

Script Kiddy authored Nov 22, 2015

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"

16f07806

17 Nov, 2015 2 commits
- Increase version for master · fd203820
  Albert Astals Cid authored Nov 18, 2015
  
  fd203820
- Increase version for beta · 50b70c51
  Albert Astals Cid authored Nov 18, 2015
  
  50b70c51
15 Nov, 2015 1 commit
- Make presentation widget tool bar follow the lineedit height · 1e86855b
  Oliver Sander authored Nov 15, 2015
```
REVIEW: 126050
```
  1e86855b
05 Nov, 2015 1 commit

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

Script Kiddy authored Nov 05, 2015

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"

9a5c82a4

27 Oct, 2015 2 commits
- Merge remote-tracking branch 'origin/Applications/15.08' · 73677eaf
  Albert Astals Cid authored Oct 28, 2015
  
  73677eaf
- Save file attachments on left click · a675670d
  Albert Astals Cid authored Oct 28, 2015
```
Instead of having to right click on it and choosing save from the menu
BUGS: 354268
```
  a675670d
20 Oct, 2015 2 commits
- Optimize all those SettingsCore::paperColor().rgb() calls · c743eceb
  Albert Astals Cid authored Oct 21, 2015
```
Maybe the compiler can do it, but i can do it as well :D
```
  c743eceb
- Fix trimming margins when paperColor not white · 9d7533d2
  Lauri Lyly authored Oct 21, 2015
```
REVIEW: 125721
```
  9d7533d2
18 Oct, 2015 3 commits
- Make it pass both locally and on CI · 94b62614
  Albert Astals Cid authored Oct 19, 2015
  
  94b62614
- Test for internal link clicking · 354316f6
  Albert Astals Cid authored Oct 18, 2015
  
  354316f6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 98ac9413
  Script Kiddy authored Oct 18, 2015
```
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"
```
  98ac9413
17 Oct, 2015 2 commits
- Add a test that selects text with the mouse and checks it is what it should be · fe1325d6
  Albert Astals Cid authored Oct 18, 2015
  
  fe1325d6
- Make leaving the presentation area finish the drawing · 99667e4c
  Albert Astals Cid authored Oct 17, 2015
```
BUGS: 354016
```
  99667e4c
14 Oct, 2015 2 commits

Support for non-integer transition durations in PDF presentations · 76c1e944
Arseniy Lartsev authored Oct 15, 2015
```
REVIEW: 125329
```
76c1e944

Presentation: correct durations for "Fade" transition effect by doing 20 FPS... · 9f0ff21a

Arseniy Lartsev authored Oct 15, 2015

Presentation: correct durations for "Fade" transition effect by doing 20 FPS instead of 100 frames total

Right now, fade transition is always done in 100 frames. If the intended duration is, say, 1 second, the actual duration can easily be a few seconds instead, due to the limited CPU power (on my laptop with core i5, those 100 frames take 2 seconds).

I propose a patch that changes the number of frames to 20 * (duration in seconds). 20 FPS still looks completely smooth to me.

REVIEW: 125310
BUGS: 352876

9f0ff21a

12 Oct, 2015 1 commit

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

Script Kiddy authored Oct 12, 2015

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"

8c141cc2

08 Oct, 2015 3 commits
- Merge remote-tracking branch 'origin/Applications/15.08' · 8e366c81
  Albert Astals Cid authored Oct 09, 2015
  
  8e366c81
- Increase version for KDE Applications 15.08.2 · 56b9b89a
  Albert Astals Cid authored Oct 09, 2015
```
GIT_SILENT
```
  56b9b89a
- SVN_SILENT made messages (.desktop file) - always resolve ours · cd34059f
  Script Kiddy authored Oct 08, 2015
```
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"
```
  cd34059f
26 Sep, 2015 2 commits
- Repeat videos in PDFs automatically when needed · e9e5cb63
  Arseniy Lartsev authored Sep 26, 2015
```
REVIEW: 125341
BUGS: 353171
```
  e9e5cb63
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7b8f0a74
  Script Kiddy authored Sep 26, 2015
```
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"
```
  7b8f0a74
21 Sep, 2015 1 commit

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

Script Kiddy authored Sep 21, 2015

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"

22ba4596

17 Sep, 2015 1 commit
- Add some info about layers to docs · 37d59253
  Yuri Chornoivan authored Sep 17, 2015
  
  37d59253
16 Sep, 2015 2 commits
- Merge remote-tracking branch 'origin/gsoc2015_layer_feature' · d52a07c9
  Albert Astals Cid authored Sep 16, 2015
  
  d52a07c9
- Simplify KTreeviewSearchLine to only work on a treeview · 5b62bc71
  Albert Astals Cid authored Sep 16, 2015
```
Instead of many, allows for an easy fix of the case than children of root are ignored on search
```
  5b62bc71
15 Sep, 2015 2 commits
- Make the sidebar work on widget pointers and not ints · ce7f81fc
  Albert Astals Cid authored Sep 16, 2015
```
This way we don't need to worry if we add more widgets in the middle
```
  ce7f81fc
- SVN_SILENT made messages (.desktop file) - always resolve ours · 558b4bb7
  Script Kiddy authored Sep 15, 2015
```
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"
```
  558b4bb7
14 Sep, 2015 1 commit
- Small cleanup of the layer support feature · 1cd101b4
  Albert Astals Cid authored Sep 15, 2015
```
Tab replacing, function naming, include removal, @since addition, etc
```
  1cd101b4
13 Sep, 2015 3 commits
- Merge remote-tracking branch 'origin/Applications/15.08' · a475a757
  Albert Astals Cid authored Sep 13, 2015
  
  a475a757
- Do not --use when invoking kate anymore · 4fee5131
  Frederic Tronel authored Sep 13, 2015
```
BUGS: 352657
```
  4fee5131
- SVN_SILENT made messages (.desktop file) - always resolve ours · dde68921
  Script Kiddy authored Sep 13, 2015
```
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"
```
  dde68921
10 Sep, 2015 3 commits
- Remove useless VERSION file · 7ac2b9ac
  Albert Astals Cid authored Sep 10, 2015
```
we have core/version.h already

Tired of updating two files
```
  7ac2b9ac
- Merge remote-tracking branch 'origin/Applications/15.08' · 1e37e7ce
  Albert Astals Cid authored Sep 10, 2015
```
Conflicts:
	VERSION
	core/version.h
```
  1e37e7ce
- Increase version for KDE Applications 15.08.1 · 46ffe3e7
  Albert Astals Cid authored Sep 10, 2015
  
  46ffe3e7