branches with status:
Name Status Last Modified Last Commit
lp:konsole Development 2018-07-18 07:34:50 UTC 2 hours ago
6144. Use QTabBar: drop tons of code Summa...

Author: Tomaz Canabrava
Revision Date: 2018-07-18 07:34:50 UTC

Use QTabBar: drop tons of code

Summary:
this is a WIP, I don't plan to merge this yet, there are many thigns to solve.

Drop the handmade TabWidget used inside of konsole in favor of Qt's QTabWidget
This drops tons of code we manually did, but it also drops a bit of functionality.

Everything besides detach should be working.
I'm now trying to finish detach.

a nice overvie:
 15 files changed, 314 insertions(+), 1609 deletions(-)

Missing features:
- Detach

and lots of testing.

Reviewers: hindenburg, #konsole, ngraham

Reviewed By: ngraham

Subscribers: ngraham, konsole-devel

Tags: #konsole

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

lp:~neon/project-neon/plasma-mediacenter Development 2018-07-18 03:31:15 UTC 6 hours ago
2006. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-07-18 03:31:15 UTC

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"

lp:~neon/extra-cmake-modules/master Development 2018-07-17 23:16:31 UTC 10 hours ago
833. Fix variable definition check Summar...

Author: Aleix Pol
Revision Date: 2018-07-17 23:16:31 UTC

Fix variable definition check

Summary:
We'd check if the variable's value is defined, which is wrong and prevented us
from properly initialising using these deprecated variables.
It would also ignore the value we're passing to the actually right variable when
using it.

Test Plan: Built kstars which needs -DCMAKE_ANDROID_API=24

Reviewers: #frameworks, vkrause

Reviewed By: vkrause

Subscribers: kde-frameworks-devel, kde-buildsystem

Tags: #frameworks, #build_system

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

lp:~neon/project-neon/kscreen Development 2018-07-17 19:04:43 UTC 15 hours ago
457. Remove ref from returned QString Sum...

Author: Frederik Gladhorn
Revision Date: 2018-07-17 19:04:43 UTC

Remove ref from returned QString

Summary:
Let's leave it up to the compiler to eliminate the ref.
Suggested by zzag.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: zzag, plasma-devel

Tags: #plasma

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

lp:~neon/kolourpaint/master Development 2018-07-17 18:48:19 UTC 15 hours ago
1984. Merge remote-tracking branch 'origin/...

Author: Albert Astals Cid
Revision Date: 2018-07-17 18:48:19 UTC

Merge remote-tracking branch 'origin/Applications/18.08'

lp:~neon/kcachegrind/master Development 2018-07-17 15:04:56 UTC 19 hours ago
893. Remove long-time deprecated Encoding=...

Author: Friedrich W. H. Kossebau
Revision Date: 2018-07-17 15:04:56 UTC

Remove long-time deprecated Encoding=UTF-8 from desktop format file

lp:~neon/kalgebra/master Development 2018-07-17 13:29:25 UTC 20 hours ago
1666. Fix clazy warnings

Author: Aleix Pol
Revision Date: 2018-07-17 13:29:25 UTC

Fix clazy warnings

lp:~neon/project-neon/libkscreen Development 2018-07-17 05:27:13 UTC 2018-07-17
874. Fix spaces in error messages Summary...

Author: Frederik Gladhorn
Revision Date: 2018-07-17 05:27:13 UTC

Fix spaces in error messages

Summary: Unlike qDebug there is no automatic space added in QTextStream/stderr.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

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

lp:~neon/okteta/master Development 2018-07-16 23:41:35 UTC 2018-07-16
3274. Merge branch '0.25'

Author: Friedrich W. H. Kossebau
Revision Date: 2018-07-16 23:41:35 UTC

Merge branch '0.25'

lp:~neon/dragon/master Development 2018-07-16 18:03:12 UTC 2018-07-16
736. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-07-16 18:03:12 UTC

GIT_SILENT Upgrade KDE Applications version to 18.11.70.

lp:~neon/kgpg/master Development 2018-07-16 18:02:40 UTC 2018-07-16
2363. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-07-16 18:02:40 UTC

GIT_SILENT Upgrade KDE Applications version to 18.11.70.

lp:~neon/kdf/master Development 2018-07-16 18:02:32 UTC 2018-07-16
641. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-07-16 18:02:32 UTC

GIT_SILENT Upgrade KDE Applications version to 18.11.70.

lp:~neon/filelight/master Development 2018-07-16 18:02:14 UTC 2018-07-16
656. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-07-16 18:02:14 UTC

GIT_SILENT Upgrade KDE Applications version to 18.11.70.

lp:~neon/kamera/master Development 2018-07-16 18:01:18 UTC 2018-07-16
490. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-07-16 18:01:18 UTC

GIT_SILENT Upgrade KDE Applications version to 18.11.70.

lp:~neon/parley/master Development 2018-07-16 18:01:01 UTC 2018-07-16
3262. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-07-16 18:01:01 UTC

GIT_SILENT Upgrade KDE Applications version to 18.11.70.

lp:~neon/kde-dev-utils/master Development 2018-07-16 03:21:43 UTC 2018-07-16
415. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-07-16 03:21:43 UTC

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"

lp:~neon/marble/master Development 2018-07-16 03:20:46 UTC 2018-07-16
12059. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-07-16 03:20:46 UTC

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"

lp:~neon/ktuberling/master Development 2018-07-15 01:28:38 UTC 2018-07-15
861. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-15 01:28:38 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kmouth/master Development 2018-07-15 01:26:44 UTC 2018-07-15
556. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-15 01:26:44 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kmousetool/master Development 2018-07-15 01:26:42 UTC 2018-07-15
297. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-15 01:26:42 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kmag/master Development 2018-07-15 01:26:41 UTC 2018-07-15
513. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-15 01:26:41 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/analitza/master Development 2018-07-13 15:40:43 UTC 2018-07-13
2015. Fix clazy warnings

Author: Aleix Pol
Revision Date: 2018-07-13 15:40:43 UTC

Fix clazy warnings

lp:~neon/lokalize/master Development 2018-07-12 09:51:09 UTC 2018-07-12
1239. Add .arcconfig file Summary: Add .ar...

Author: Simon Depiets
Revision Date: 2018-07-12 09:51:09 UTC

Add .arcconfig file

Summary: Add .arcconfig file to point arcanist to the KDE Phabricator instance.

Reviewers: aacid, ltoscano, shaforostoff, #localization

Reviewed By: ltoscano

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

lp:~neon/kruler/master Development 2018-07-11 14:27:26 UTC 2018-07-11
559. Remove unneeded QT definitions * QT_...

Author: Friedrich W. H. Kossebau
Revision Date: 2018-07-11 14:27:26 UTC

Remove unneeded QT definitions

* QT_USE_FAST_OPERATOR_PLUS is subset of already set QT_USE_QSTRINGBUILDER
* QT_USE_FAST_CONCATENATION got dropped pre-Qt5

lp:~neon/audiocd-kio/master Development 2018-07-11 07:29:20 UTC 2018-07-11
803. generate and use a local cdda_interfa...

Author: RJVB
Revision Date: 2018-07-11 07:29:20 UTC

generate and use a local cdda_interface headerfile copy

Summary:
Generates and uses a local copy of the cdda_interface.h header file that
works with C++ instead of using the previous workaround based on
preprocessor macros. That was a hack that breaks the build when
cdda_interface.h includes other header files that use the `private`
keyword.

Test Plan: works as intended.

Reviewers: #frameworks, dfaure

Reviewed By: dfaure

Subscribers: dfaure

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

lp:~neon/kmines/master Development 2018-07-11 03:26:21 UTC 2018-07-11
1117. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-07-11 03:26:21 UTC

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"

lp:~neon/kturtle/master Development 2018-07-11 03:26:06 UTC 2018-07-11
888. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-07-11 03:26:06 UTC

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"

lp:~neon/kubrick/master Development 2018-07-11 01:32:50 UTC 2018-07-11
202. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-11 01:32:50 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/ksudoku/master Development 2018-07-11 01:32:47 UTC 2018-07-11
776. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-11 01:32:47 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/lskat/master Development 2018-07-10 01:37:58 UTC 2018-07-10
614. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-10 01:37:58 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/ksquares/master Development 2018-07-10 01:37:41 UTC 2018-07-10
395. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-10 01:37:41 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kspaceduel/master Development 2018-07-10 01:37:38 UTC 2018-07-10
508. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-10 01:37:38 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/ksirk/master Development 2018-07-10 01:37:32 UTC 2018-07-10
690. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-10 01:37:32 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kactivities/master Development 2018-07-08 22:06:58 UTC 2018-07-08
937. Honor BUILD_TESTING Only build tests...

Author: Antonio Rojas
Revision Date: 2018-07-08 22:06:58 UTC

Honor BUILD_TESTING

Only build tests if BUILD_TESTING is on

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

lp:~neon/ktimer/master Development 2018-07-08 03:14:53 UTC 2018-07-08
295. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-07-08 03:14:53 UTC

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"

lp:~neon/kcharselect/master Development 2018-07-08 01:26:16 UTC 2018-07-08
330. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-08 01:26:16 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/project-neon/prison Development 2018-07-07 21:54:09 UTC 2018-07-07
139. GIT_SILENT Upgrade ECM and KF5 versio...

Author: l10n daemon script
Revision Date: 2018-07-07 21:54:09 UTC

GIT_SILENT Upgrade ECM and KF5 version requirements for 5.48.0 release.

lp:~neon/kdnssd/master Development 2018-07-07 21:52:27 UTC 2018-07-07
183. GIT_SILENT Upgrade ECM and KF5 versio...

Author: l10n daemon script
Revision Date: 2018-07-07 21:52:27 UTC

GIT_SILENT Upgrade ECM and KF5 version requirements for 5.48.0 release.

lp:~neon/project-neon/attica Development 2018-07-07 21:51:40 UTC 2018-07-07
644. GIT_SILENT Upgrade ECM and KF5 versio...

Author: l10n daemon script
Revision Date: 2018-07-07 21:51:40 UTC

GIT_SILENT Upgrade ECM and KF5 version requirements for 5.48.0 release.

lp:~neon/kreversi/master Development 2018-07-07 01:26:19 UTC 2018-07-07
959. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-07 01:26:19 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/knavalbattle/master Development 2018-07-07 01:26:09 UTC 2018-07-07
1176. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-07 01:26:09 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kmahjongg/master Development 2018-07-07 01:26:04 UTC 2018-07-07
1021. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-07 01:26:04 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/klines/master Development 2018-07-07 01:26:02 UTC 2018-07-07
616. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-07 01:26:02 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kgoldrunner/master Development 2018-07-07 01:25:50 UTC 2018-07-07
900. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-07 01:25:50 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/project-neon/polkit-kde-agent-1 Development 2018-07-06 12:50:22 UTC 2018-07-06
335. Merge remote-tracking branch 'origin/...

Author: Pino Toscano
Revision Date: 2018-07-06 12:50:22 UTC

Merge remote-tracking branch 'origin/Plasma/5.13'

lp:~neon/libksane/master Development 2018-07-03 12:33:40 UTC 2018-07-03
416. Make finding Sane required on all pla...

Author: Kåre Särs
Revision Date: 2018-07-03 12:33:40 UTC

Make finding Sane required on all platforms except Windows

ksanetwain is Windows only and cannot be used on Linux or Mac.

One could think about making it possible to compile the Sane based
KSane also on Windows as long as it is possible to compile Sane for
Winwods.

lp:~neon/kiten/master Development 2018-07-03 05:02:20 UTC 2018-07-03
857. Fix warning

Author: Laurent Montel
Revision Date: 2018-07-03 05:02:20 UTC

Fix warning

lp:~neon/bovo/master Development 2018-07-03 01:27:57 UTC 2018-07-03
608. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-07-03 01:27:57 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kdenetwork-filesharing/master Development 2018-07-02 07:21:18 UTC 2018-07-02
699. Support desktop:/ protocol This is a...

Author: 8p-k26-gj
Revision Date: 2018-07-02 07:21:18 UTC

Support desktop:/ protocol

This is a local folder as well. Use KFileItem::mostLocalUrl() instead of the property dialog's URL

BUG: 394316

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

lp:~neon/kfloppy/master Development 2018-06-29 17:36:31 UTC 2018-06-29
611. Remove unneeded moc includes

Author: Friedrich W. H. Kossebau
Revision Date: 2018-06-29 17:36:31 UTC

Remove unneeded moc includes

lp:~neon/kdegraphics-thumbnailers/master Development 2018-06-29 14:37:00 UTC 2018-06-29
144. Use NO_POLICY_SCOPE with KDECompilerS...

Author: Friedrich W. H. Kossebau
Revision Date: 2018-06-29 14:37:00 UTC

Use NO_POLICY_SCOPE with KDECompilerSettings

lp:~neon/kajongg/master Development 2018-06-23 11:18:21 UTC 2018-06-23
3712. Fix application icon under Wayland. ...

Author: Andrius Štikonas
Revision Date: 2018-06-23 11:18:21 UTC

Fix application icon under Wayland.

BUG: 395770

lp:~neon/klettres/master Development 2018-06-20 06:02:52 UTC 2018-06-20
765. Fix out of sync

Author: Laurent Montel
Revision Date: 2018-06-20 06:02:52 UTC

Fix out of sync

lp:~neon/kapptemplate/master Development 2018-06-20 03:49:12 UTC 2018-06-20
740. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-06-20 03:49:12 UTC

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"

lp:~neon/kolf/master Development 2018-06-20 03:47:59 UTC 2018-06-20
1201. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-06-20 03:47:59 UTC

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"

lp:~neon/kiriki/master Development 2018-06-19 11:20:40 UTC 2018-06-19
311. Do not duplicate work of KAboutData::...

Author: Laurent Montel
Revision Date: 2018-06-19 11:20:40 UTC

Do not duplicate work of KAboutData::setupCommandLine()

lp:~neon/kcron/master Development 2018-06-18 03:29:57 UTC 2018-06-18
634. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-06-18 03:29:57 UTC

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"

lp:~neon/kompare/master Development 2018-06-12 03:41:45 UTC 2018-06-12
951. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-06-12 03:41:45 UTC

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"

lp:~neon/kig/master Development 2018-06-06 06:51:34 UTC 2018-06-06
2446. Warning--

Author: Laurent Montel
Revision Date: 2018-06-06 06:51:34 UTC

Warning--

lp:~neon/kopete/master Development 2018-05-31 12:11:23 UTC 2018-05-31
13421. Merge branch 'Applications/18.04'

Author: Luca Beltrame
Revision Date: 2018-05-31 12:11:23 UTC

Merge branch 'Applications/18.04'

lp:~neon/krfb/master Development 2018-05-30 17:59:21 UTC 2018-05-30
1064. Fix IPv6 connectivity Summary: IPv6 ...

Author: Oleg Chernovskiy
Revision Date: 2018-05-30 17:59:21 UTC

Fix IPv6 connectivity

Summary:
IPv6 is supported by LibVNCServer but for compatibility reasons its
socket is backed by another file descriptor.

This commit adds tracking IPv6 listen socket in the same way we now
track IPv4 one.

Test Plan: Tested by connecting through ::1 and fe80:: addresses

Reviewers: #plasma, #kde_applications, alexeymin

Reviewed By: alexeymin

Subscribers: ltoscano, alexeymin, apol, aacid

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

lp:~neon/kfourinline/master Development 2018-05-27 05:46:41 UTC 2018-05-27
817. Merge remote-tracking branch 'origin/...

Author: Albert Astals Cid
Revision Date: 2018-05-27 05:46:41 UTC

Merge remote-tracking branch 'origin/Applications/18.04'

lp:~neon/ffmpegthumbs/master Development 2018-05-26 16:31:16 UTC 2018-05-26
96. Add filmstrip embed configuration Su...

Author: Thomas Carmichael
Revision Date: 2018-05-26 16:31:16 UTC

Add filmstrip embed configuration

Summary:
By default, a filmstrip effect is embedded in the thumbnail that is generated by ffmpegthumbs.

This adds the capability to configure the thumbnailer so as not to embed the filmstrip effect, if so desired.

Test Plan:
 - Configure the ffmpegthumbs thumbnailer through the Dolphin Preferences > General > Previews tab
 - Un-tick the default option to embed the filmstrip effect and 'Ok' both preferences windows
 - Enter into a folder or refresh a folder with video files to confirm that video thumbnails no longer have the filmstrip effect embedded

Reviewers: #dolphin, ngraham, elvisangelaccio

Reviewed By: #dolphin, ngraham, elvisangelaccio

Subscribers: elvisangelaccio, cfeck

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

lp:~neon/khangman/master Development 2018-05-24 01:38:14 UTC 2018-05-24
1351. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-05-24 01:38:14 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/project-neon/plasma-mobile Development 2018-05-23 03:33:44 UTC 2018-05-23
3119. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-05-23 03:33:44 UTC

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"

lp:~neon/kshisen/master Development 2018-05-18 03:41:46 UTC 2018-05-18
1069. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-05-18 03:41:46 UTC

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"

lp:~neon/kanagram/master Development 2018-05-18 03:40:58 UTC 2018-05-18
1101. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-05-18 03:40:58 UTC

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"

lp:~neon/granatier/master Development 2018-05-15 20:49:02 UTC 2018-05-15
783. port to ranged-based for loop

Author: Mathias Kraus
Revision Date: 2018-05-15 20:49:02 UTC

port to ranged-based for loop

lp:~neon/klickety/master Development 2018-05-06 01:29:51 UTC 2018-05-06
441. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-05-06 01:29:51 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/knetwalk/master Development 2018-05-02 03:30:06 UTC 2018-05-02
533. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-05-02 03:30:06 UTC

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"

lp:~neon/kbounce/master Development 2018-05-02 03:29:51 UTC 2018-05-02
625. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-05-02 03:29:51 UTC

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"

lp:~neon/katomic/master Development 2018-05-01 00:37:31 UTC 2018-05-01
767. Fix crash on going to previous atom ...

Author: Albert Astals Cid
Revision Date: 2018-05-01 00:37:31 UTC

Fix crash on going to previous atom

BUGS: 366396

lp:~neon/plasma-widget-networkmanagement/trunk Development 2018-04-29 00:07:30 UTC 2018-04-29
2537. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-04-29 00:07:30 UTC

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"

lp:~neon/phonon/master Development 2018-04-27 08:50:50 UTC 2018-04-27
2874. bump version from 4.10.0 to 4.10.1 p...

Author: Harald Sitter
Revision Date: 2018-04-27 08:50:50 UTC

bump version from 4.10.0 to 4.10.1

preparing for release

lp:~neon/ark/master Development 2018-04-21 12:35:03 UTC 2018-04-21
3401. Merge branch 'Applications/18.04'

Author: genstorm
Revision Date: 2018-04-21 12:35:03 UTC

Merge branch 'Applications/18.04'

lp:~neon/ksystemlog/master Development 2018-04-20 09:17:31 UTC 2018-04-20
237. Merge branch 'Applications/18.04'

Author: Andreas Sturmlechner
Revision Date: 2018-04-20 09:17:31 UTC

Merge branch 'Applications/18.04'

lp:~neon/kalzium/master Development 2018-04-12 06:14:51 UTC 2018-04-12
3356. Drop unused QtQuick dependency Diffe...

Author: Antonio Rojas
Revision Date: 2018-04-12 06:14:51 UTC

Drop unused QtQuick dependency

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

lp:~neon/project-neon/polkit-qt-1 Development 2018-04-09 10:16:55 UTC 2018-04-09
351. Add .arcconfig

Author: Alexander Volkov
Revision Date: 2018-04-09 10:16:55 UTC

Add .arcconfig

lp:~neon/kross-interpreters/master Development 2018-03-28 11:37:47 UTC 2018-03-28
707. python: the module is optional, so ma...

Author: Michael
Revision Date: 2018-03-28 11:37:47 UTC

python: the module is optional, so make the dependency optional too

Reviewers: aspotashev

Reviewed By: aspotashev

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

lp:~neon/blinken/master Development 2018-03-25 22:02:59 UTC 2018-03-25
467. Mark Phonon as a required module in C...

Author: A. Wilcox
Revision Date: 2018-03-25 22:02:59 UTC

Mark Phonon as a required module in CMake

Summary:
Right now, Blinken does not require Phonon in CMake:

```
-- The following OPTIONAL packages have not been found:

 * Phonon4Qt5

-- Configuring done
-- Generating done
-- Build files have been written to: /usr/src/packages/user/blinken/src/blinken-17.12.2
```

However, this results in a build failure:

```
[ 76%] Building CXX object src/CMakeFiles/blinken.dir/main.cpp.o
In file included from /usr/src/packages/user/blinken/src/blinken-17.12.2/src/soundsplayer.cpp:10:0:
/usr/src/packages/user/blinken/src/blinken-17.12.2/src/soundsplayer.h:13:30: fatal error: phonon/MediaObject: No such file or directory
 #include <phonon/MediaObject>
                              ^
compilation terminated.
make[2]: *** [src/CMakeFiles/blinken.dir/build.make:119: src/CMakeFiles/blinken.dir/soundsplayer.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
[ 76%] Built target doc-index-cache-bz2
In file included from /usr/src/packages/user/blinken/src/blinken-17.12.2/src/blinkengame.cpp:17:0:
/usr/src/packages/user/blinken/src/blinken-17.12.2/src/soundsplayer.h:13:30: fatal error: phonon/MediaObject: No such file or directory
 #include <phonon/MediaObject>
                              ^
compilation terminated.
make[2]: *** [src/CMakeFiles/blinken.dir/build.make:143: src/CMakeFiles/blinken.dir/blinkengame.cpp.o] Error 1
```

This patch forces Phonon to be required.

Test Plan: Tested on git master and 17.12.2 release tarballs on Linux. Since this is an unconditional header I cannot see this requiring testing on other platforms; the behaviour should be the same.

Reviewers: aacid

Subscribers: kde-edu, #kde_edu

Tags: #kde_edu

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

lp:~neon/kdiamond/master Development 2018-03-25 04:29:42 UTC 2018-03-25
517. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-03-25 04:29:42 UTC

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"

lp:~neon/kbreakout/master Development 2018-03-25 04:29:39 UTC 2018-03-25
574. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-03-25 04:29:39 UTC

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"

lp:~neon/kgeography/master Development 2018-03-14 04:17:37 UTC 2018-03-14
833. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-03-14 04:17:37 UTC

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"

lp:~neon/killbots/master Development 2018-03-13 04:18:47 UTC 2018-03-13
581. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-03-13 04:18:47 UTC

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"

lp:~neon/kmplot/master Development 2018-03-13 02:21:45 UTC 2018-03-13
1235. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-03-13 02:21:45 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kbruch/master Development 2018-03-13 02:21:23 UTC 2018-03-13
667. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-03-13 02:21:23 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/artikulate/master Development 2018-03-13 02:21:08 UTC 2018-03-13
688. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-03-13 02:21:08 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kcalc/master Development 2018-03-06 06:10:45 UTC 2018-03-06
1121. Fix build with Qt 5.11

Author: Luca Beltrame
Revision Date: 2018-03-06 06:10:45 UTC

Fix build with Qt 5.11

lp:~neon/juk/master Development 2018-03-06 05:59:55 UTC 2018-03-06
2591. Fix build with Qt 5.11

Author: Luca Beltrame
Revision Date: 2018-03-06 05:59:55 UTC

Fix build with Qt 5.11

lp:~neon/cantor/master Development 2018-03-06 05:58:25 UTC 2018-03-06
1211. Fix build with Qt 5.11 Some includes...

Author: Luca Beltrame
Revision Date: 2018-03-06 05:58:25 UTC

Fix build with Qt 5.11

Some includes need to be explicitly set now

lp:~neon/phonon/vlc Development 2018-02-26 14:53:55 UTC 2018-02-26
642. bump to 0.10.1

Author: Harald Sitter
Revision Date: 2018-02-26 14:53:55 UTC

bump to 0.10.1

lp:~neon/kcolorchooser/master Development 2018-02-08 04:11:29 UTC 2018-02-08
104. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-02-08 04:11:29 UTC

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"

lp:~neon/picmi/master Development 2018-02-08 02:26:43 UTC 2018-02-08
446. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-02-08 02:26:43 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kollision/master Development 2018-02-08 02:26:07 UTC 2018-02-08
391. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-02-08 02:26:07 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/bomber/master Development 2018-02-08 02:25:20 UTC 2018-02-08
377. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-02-08 02:25:20 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kblackbox/master Development 2018-01-15 23:28:10 UTC 2018-01-15
604. Save the state of the "show higlight"...

Author: Albert Astals Cid
Revision Date: 2018-01-15 23:28:10 UTC

Save the state of the "show higlight" option between runs

lp:libktorrent Development 2018-01-07 10:04:02 UTC 2018-01-07
364. Remove unused file

Author: Laurent Montel
Revision Date: 2018-01-07 10:04:02 UTC

Remove unused file

lp:~neon/phonon/gstreamer Development 2018-01-07 10:00:31 UTC 2018-01-07
2635. Remove unused file

Author: Laurent Montel
Revision Date: 2018-01-07 10:00:31 UTC

Remove unused file

lp:~neon/libkomparediff2/master Development 2018-01-05 12:55:39 UTC 2018-01-05
297. Remove obsolete reviewboardrc file

Author: Laurent Montel
Revision Date: 2018-01-05 12:55:39 UTC

Remove obsolete reviewboardrc file

lp:~neon/kremotecontrol/master Development 2017-12-28 01:09:14 UTC 2017-12-28
1021. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2017-12-28 01:09:14 UTC

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"

1100 of 525 results