lp:~codygarver/pantheon-photos/fix-1322215

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~pantheon-photos/pantheon-photos/trunk at revision 2603

meese: Approve on 2014-08-28

Diff: 4098 lines (+6/-3870)

28 files modified

plugins/plugins.mk (+1/-3)
plugins/shotwell-data-imports/FSpotDatabase.vala (+0/-58)
plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala (+0/-208)
plugins/shotwell-data-imports/FSpotDatabaseTable.vala (+0/-54)
plugins/shotwell-data-imports/FSpotImporter.vala (+0/-567)
plugins/shotwell-data-imports/FSpotMetaTable.vala (+0/-113)
plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala (+0/-57)
plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala (+0/-275)
plugins/shotwell-data-imports/FSpotPhotosTable.vala (+0/-363)
plugins/shotwell-data-imports/FSpotRollsTable.vala (+0/-111)
plugins/shotwell-data-imports/FSpotTableBehavior.vala (+0/-28)
plugins/shotwell-data-imports/FSpotTagsTable.vala (+0/-129)
plugins/shotwell-data-imports/Makefile (+0/-30)
plugins/shotwell-data-imports/shotwell-data-imports.vala (+0/-46)
src/Dialogs.vala (+1/-5)
src/data_imports/DataImportJob.vala (+0/-177)
src/data_imports/DataImportSource.vala (+0/-135)
src/data_imports/DataImports.vala (+0/-30)
src/data_imports/DataImportsPluginHost.vala (+0/-483)
src/data_imports/DataImportsUI.vala (+0/-445)
src/data_imports/mk/data_imports.mk (+0/-31)
src/library/LibraryWindow.vala (+0/-13)
src/library/mk/library.mk (+1/-2)
src/plugins/DataImportsInterfaces.vala (+0/-489)
src/plugins/mk/interfaces.mk (+1/-2)
src/plugins/mk/plugins.mk (+1/-2)
src/tags/HierarchicalTagUtilities.vala (+0/-12)
units.mk (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1322215: remove shotwell-data-imports including fspot

Low

Fix Released

Link a bug report

Related blueprints

2602. By Cody Garver on 2014-08-28

Merge in trunk and resolve conflicts

2601. By Cody Garver on 2014-08-28

Kill shotwell-data-imports

2600. By meese on 2014-08-27

changes flag icons to get from theme

2599. By Launchpad Translations on behalf of pantheon-photos on 2014-08-27

Launchpad automatic translations update.

2598. By meese on 2014-08-27

Moves all photo metadata context menu editors to a right sidebar

2597. By Robert Roth on 2014-08-27

Backspace (Delete on macbooks) accelerator changed to Move the current photo to trash instead of jumping to the previous photo (lp:1360040).

2596. By Launchpad Translations on behalf of pantheon-photos on 2014-08-25

Launchpad automatic translations update.

2595. By Viko Adi Rahmawan on 2014-08-25

add contractor actions to context menu

2594. By Erasmo Marín on 2014-08-24

add double click to exit from slideshow page

2593. By meese on 2014-08-24

Changes enhance to a toggle