← Back to branch summary

~artmello/gallery-app/gallery-app-fix_1523573

~artmello/gallery-app/gallery-app-fix_1523573

Viewing all changes in revision 1270.

Committer: Arthur Mello
Date: 2016-03-07 20:20:03 UTC
mfrom: (1265.1.17 gallery-app)
Revision ID: arthur.mello@canonical.com-20160307202003-8f21kqk316683azd

Merge with trunk

files added:
po/sk.po

rc/img/transparency-bg.png

files removed:
src/photoeditor

src/photoeditor/CMakeLists.txt

src/photoeditor/photo-image-provider.cpp

src/photoeditor/photo-image-provider.h

files renamed:
src/photoeditor/photo-metadata.cpp => src/photo/photo-metadata.cpp

src/photoeditor/photo-metadata.h => src/photo/photo-metadata.h

files modified:
click/CMakeLists.txt

debian/changelog

debian/control

debian/gallery-app.install

po/aa.po

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.po

po/ckb.po

po/cs.po

po/cy.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gallery-app.pot

po/gd.po

po/gl.po

po/he.po

po/hu.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lv.po

po/ml.po

po/mr.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/shn.po

po/sl.po

po/sr.po

po/sv.po

po/ta.po

po/te.po

po/tr.po

po/ug.po

po/uk.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml

rc/qml/Components/MediaGrid.qml

rc/qml/Components/PopupAlbumPicker.qml

rc/qml/MediaViewer/MediaViewer.qml

rc/qml/MediaViewer/SingleMediaViewer.qml

rc/qml/OrganicView/OrganicMediaList.qml

src/CMakeLists.txt

src/core/data-collection.cpp

src/event/event-collection.cpp

src/gallery-application.cpp

src/gallery-manager.cpp

src/gallery-manager.h

src/media/media-collection.cpp

src/photo/CMakeLists.txt

src/qml/qml-view-collection-model.cpp

src/qml/qml-view-collection-model.h

tests/autopilot/gallery_app/emulators/album_view.py

tests/autopilot/gallery_app/emulators/photo_viewer.py

tests/autopilot/gallery_app/emulators/picker_screen.py

tests/autopilot/gallery_app/tests/test_albums_view.py

tests/autopilot/gallery_app/tests/test_events_view.py

tests/autopilot/gallery_app/tests/test_photos_view.py

tests/unittests/mediaobjectfactory/CMakeLists.txt

tests/unittests/photo-metadata/CMakeLists.txt

tests/unittests/photo-metadata/tst_photo-metadata.cpp

tests/unittests/stubs/gallery-manager_stub.cpp

tests/unittests/video/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

click/CMakeLists.txt

debian/changelog

debian/gallery-app.install

po/ca@valencia.po

po/gallery-app.pot

rc/img/transparency-bg.png

rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml

rc/qml/Components/MediaGrid.qml

rc/qml/Components/PopupAlbumPicker.qml

rc/qml/MediaViewer/MediaViewer.qml

rc/qml/MediaViewer/SingleMediaViewer.qml

rc/qml/OrganicView/OrganicMediaList.qml

src/CMakeLists.txt

src/core/data-collection.cpp

src/event/event-collection.cpp

src/gallery-application.cpp

src/gallery-manager.cpp

src/gallery-manager.h

src/media/media-collection.cpp

src/photo/CMakeLists.txt

src/photo/photo-metadata.cpp

src/photoeditor/

src/photoeditor/CMakeLists.txt

src/photoeditor/photo-image-provider.cpp

src/photoeditor/photo-image-provider.h

src/qml/qml-view-collection-model.cpp

src/qml/qml-view-collection-model.h

tests/autopilot/gallery_app/emulators/album_view.py

tests/autopilot/gallery_app/emulators/photo_viewer.py

tests/autopilot/gallery_app/emulators/picker_screen.py

tests/autopilot/gallery_app/tests/test_albums_view.py

tests/autopilot/gallery_app/tests/test_events_view.py

tests/autopilot/gallery_app/tests/test_photos_view.py

tests/unittests/mediaobjectfactory/CMakeLists.txt

tests/unittests/photo-metadata/CMakeLists.txt

tests/unittests/photo-metadata/tst_photo-metadata.cpp

tests/unittests/stubs/gallery-manager_stub.cpp

tests/unittests/video/CMakeLists.txt

Older »