lp:~neon/marble/master

Created by Philip Muškovac on 2011-04-08 and last modified on 2019-02-11
Get this branch:
bzr branch lp:~neon/marble/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
marble
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/marble.

The next import is scheduled to run in 12 minutes.

Last successful import was 5 hours ago.

Import started 5 hours ago on alnitak and finished 5 hours ago taking 20 seconds — see the log
Import started 11 hours ago on izar and finished 11 hours ago taking 20 seconds — see the log
Import started 17 hours ago on alnitak and finished 17 hours ago taking 20 seconds — see the log
Import started 23 hours ago on alnitak and finished 23 hours ago taking 25 seconds — see the log
Import started on 2019-02-14 on alnitak and finished on 2019-02-14 taking 20 seconds — see the log
Import started on 2019-02-14 on alnitak and finished on 2019-02-14 taking 20 seconds — see the log
Import started on 2019-02-14 on alnitak and finished on 2019-02-14 taking 20 seconds — see the log
Import started on 2019-02-14 on alnitak and finished on 2019-02-14 taking 20 seconds — see the log
Import started on 2019-02-13 on izar and finished on 2019-02-13 taking 20 seconds — see the log
Import started on 2019-02-13 on alnitak and finished on 2019-02-13 taking 20 seconds — see the log

Recent revisions

12124. By l10n daemon script <email address hidden> on 2019-02-11

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"

12123. By l10n daemon script <email address hidden> on 2019-02-11

GIT_SILENT made messages (after extraction)

12122. By Ilya Bizyaev <email address hidden> on 2019-02-10

Only process onClosing events on Android

Summary:
When Marble Maps are used on Android, it makes sense to modify "back" button behavior to avoid accidental app exit, simplify page stack navigation etc.
On Plasma Mobile (and Desktop, in convergent situations) we, however, want the application to be closed when a user swipes it away from their task manager.

Test Plan:
Verify that on Android the behavior has not changed.
Verify that on Plasma closing the window is enough to close the application.

Reviewers: #marble, mart

Reviewed By: mart

Subscribers: marble-devel, kde-edu, #marble

Tags: #marble, #kde_edu

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

12121. By l10n daemon script <email address hidden> on 2019-01-28

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"

12120. By l10n daemon script <email address hidden> on 2019-01-22

GIT_SILENT made messages (after extraction)

12119. By Yuri Chornoivan <email address hidden> on 2019-01-19

Fix minor Doxygen issues

12118. By Laurent Montel <email address hidden> on 2019-01-01

Add missing qsTr

12117. By Laurent Montel <email address hidden> on 2018-12-29

Add missing qsTr

12116. By l10n daemon script <email address hidden> on 2018-12-26

GIT_SILENT made messages (after extraction)

12115. By l10n daemon script <email address hidden> on 2018-12-25

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"

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.