Merge lp://staging/~costales/unav/0.60-simple-code into lp://staging/unav
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 74 | ||||||||||||||||
Proposed branch: | lp://staging/~costales/unav/0.60-simple-code | ||||||||||||||||
Merge into: | lp://staging/unav | ||||||||||||||||
Prerequisite: | lp://staging/~costales/unav/0.60-offline-tiles | ||||||||||||||||
Diff against target: |
1441 lines (+555/-256) (has conflicts) 8 files modified
nav/class/Navigator.js (+3/-3) nav/class/UI.js (+12/-14) nav/class/WebAPI.js (+26/-19) nav/index.html (+125/-168) nav/locales/unav.pot (+221/-24) qml/AboutPage.qml (+1/-23) qml/Main.qml (+76/-5) qml/components/NotificationBar.qml (+91/-0) Text conflict in nav/class/UI.js Text conflict in nav/index.html Text conflict in nav/locales/unav.pot Text conflict in qml/Main.qml Text conflict in qml/components/NotificationBar.qml |
||||||||||||||||
To merge this branch: | bzr merge lp://staging/~costales/unav/0.60-simple-code | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
uNav developers | Pending | ||
Review via email: mp+296718@code.staging.launchpad.net |
Commit message
Added calculating route status because 'searching' flag is n...
Rework error web API
Rework no confirm route
No donation btn
Bug 1/15 pos doesn't exits anymore
Recalculate if API error
i18n updated
Message looking for position when user clicks center
Remove decimals from lat,lng in another way. If not, the coo...
Large font for info msg and hide if click fast on map
Msgs for more intuitive simulation process
Added log for check denied
Removed check accuracy
No maximumAge (testing purpose)
Securize all GPS data
Allow double click for zooming
Allow wheel mouse for zooming (check this on phone)
Redefine distance for zoom near
Speak voice before high zoom
Removed timer auto confirm route in X seconds
Remove timer for gps died
Max zoom 19
BG image for map