lp:~meese/pantheon-photos/fix-1273847

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~pantheon-photos/pantheon-photos/trunk

Danielle Foré: Needs Fixing on 2014-09-07

Cody Garver: Pending requested 2014-09-01

Diff: 152741 lines (+151513/-109)

43 files modified

Makefile (+27/-4)
icons/earth_map.svg (+230/-0)
icons/gps-marker-selected.svg (+1388/-0)
icons/gps-marker.svg (+941/-0)
icons/import.svg (+55/-0)
icons/places.svg (+679/-0)
src/CheckerboardLayout.vala (+4/-1)
src/CollectionPage.vala (+4/-0)
src/MediaDataRepresentation.vala (+51/-1)
src/MediaPage.vala (+67/-43)
src/Page.vala (+24/-10)
src/Photo.vala (+74/-14)
src/PhotoPage.vala (+4/-0)
src/Resources.vala (+9/-1)
src/SearchFilter.vala (+98/-1)
src/Thumbnail.vala (+11/-10)
src/camera/ImportPage.vala (+1/-1)
src/core/SourceInterfaces.vala (+16/-0)
src/db/DatabaseTable.vala (+13/-1)
src/db/Db.vala (+16/-0)
src/db/GeoLocationTable.vala (+205/-0)
src/db/PhotoTable.vala (+68/-15)
src/db/mk/db.mk (+2/-1)
src/library/Branch.vala (+78/-0)
src/library/LibraryWindow.vala (+47/-0)
src/library/TrashSidebarEntry.vala (+2/-0)
src/library/mk/library.mk (+1/-0)
src/libshotwell.deps (+6/-0)
src/main.vala (+2/-2)
src/maps/CountryCodes.vala (+4189/-0)
src/maps/LocationSearchEntry.vala (+201/-0)
src/maps/MapMarkerPage.vala (+54/-0)
src/maps/MapPage.vala (+307/-0)
src/maps/MapWidget.vala (+563/-0)
src/maps/Maps.vala (+16/-0)
src/maps/PositionMarker.vala (+115/-0)
src/maps/mk/maps.mk (+33/-0)
src/photos/PhotoMetadata.vala (+13/-0)
src/sidebar/metadata/LibraryProperties.vala (+97/-2)
src/sidebar/metadata/MetadataSidebar.vala (+5/-1)
ui/locations.dat (+141768/-0)
ui/map.ui (+27/-0)
units.mk (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1273847: Map / geolocation support [$110]

Wishlist

Confirmed

Link a bug report

Related blueprints

2583. By meese on 2014-10-18

merge fix

2582. By meese on 2014-10-17

merge

2581. By meese on 2014-09-20

fixes

2580. By meese on 2014-09-15

search changes from review

2579. By meese on 2014-09-13

add places icon for sidebar

2578. By meese on 2014-09-13

change gps markers to icons from Maya. Make default zoom in closer

2577. By meese on 2014-09-11

adds location search entry for setting gps markers and other fixes from review

2576. By meese on 2014-09-09

change back to geographic map for default, make page not visible if no photos have gps data, remove page border, trim down extra map options

2575. By meese on 2014-09-08

merge from trunk

2574. By meese on 2014-09-02

spelling fix