← Back to branch summary

~michael-sheldon/webbrowser-app/implement-download-folder

~michael-sheldon/webbrowser-app/implement-download-folder

Viewing all changes in revision 1180.

Committer: Michael Sheldon
Date: 2015-10-26 11:09:25 UTC
mfrom: (1106.59.20 webbrowser-app)
Revision ID: michael.sheldon@canonical.com-20151026110925-2j9uswxlr5ipon7y

Merge from trunk

files added:
src/app/webbrowser/BookmarksFoldersViewWide.qml

src/app/webbrowser/BookmarksModelUtils.js

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/BookmarksViewWide.qml

src/app/webbrowser/MediaAccessDialog.qml

src/app/webbrowser/SettingsDeviceSelector.qml

tests/autopilot/webbrowser_app/tests/test_media_access_permission.py

tests/unittests/qml/tst_BookmarksFoldersViewWide.qml

tests/unittests/qml/tst_SettingsPage.qml

files removed:
src/app/webbrowser/BookmarksModel.qml

files renamed:
src/app/webbrowser/BookmarksFolderListView.qml => src/app/webbrowser/BookmarksFoldersView.qml

files modified:
debian/changelog

debian/rules

debian/webbrowser-app-apparmor.manifest

po/aa.po

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/bg.po

po/bn.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.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/eo.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/fr_CA.po

po/ga.po

po/gd.po

po/gl.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/hy.po

po/ia.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lo.po

po/lt.po

po/lv.po

po/ml.po

po/mr.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/oc.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sa.po

po/shn.po

po/si.po

po/sk.po

po/sl.po

po/sq.po

po/sr.po

po/sv.po

po/ta.po

po/te.po

po/th.po

po/tr.po

po/ug.po

po/uk.po

po/uz.po

po/vi.po

po/webbrowser-app.pot

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/Ubuntu/Web/UbuntuWebView02.qml

src/Ubuntu/Web/ua-overrides-desktop.js

src/app/ErrorSheet.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/HistoryViewWide.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/NewTabViewWide.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/UrlDelegate.qml

src/app/webbrowser/UrlDelegateWide.qml

src/app/webbrowser/UrlPreviewDelegate.qml

src/app/webbrowser/UrlPreviewGrid.qml

src/app/webbrowser/webbrowser-app.cpp

tests/autopilot/webbrowser_app/emulators/browser.py

tests/autopilot/webbrowser_app/tests/__init__.py

tests/autopilot/webbrowser_app/tests/http_server.py

tests/autopilot/webbrowser_app/tests/test_bookmark_options.py

tests/autopilot/webbrowser_app/tests/test_keyboard.py

tests/autopilot/webbrowser_app/tests/test_new_tab_view.py

tests/unittests/qml/tst_NewTabViewWide.qml

tests/unittests/qml/tst_QmlTests.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/webbrowser-app-apparmor.manifest

po/ca@valencia.po

po/webbrowser-app.pot

src/Ubuntu/Web/UbuntuWebView02.qml

src/Ubuntu/Web/ua-overrides-desktop.js

src/app/ErrorSheet.qml

src/app/webbrowser/BookmarksFoldersView.qml

src/app/webbrowser/BookmarksFoldersViewWide.qml

src/app/webbrowser/BookmarksModel.qml

src/app/webbrowser/BookmarksModelUtils.js

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/BookmarksViewWide.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/HistoryViewWide.qml

src/app/webbrowser/MediaAccessDialog.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/NewTabViewWide.qml

src/app/webbrowser/SettingsDeviceSelector.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/UrlDelegate.qml

src/app/webbrowser/UrlDelegateWide.qml

src/app/webbrowser/UrlPreviewDelegate.qml

src/app/webbrowser/UrlPreviewGrid.qml

src/app/webbrowser/webbrowser-app.cpp

tests/autopilot/webbrowser_app/emulators/browser.py

tests/autopilot/webbrowser_app/tests/__init__.py

tests/autopilot/webbrowser_app/tests/http_server.py

tests/autopilot/webbrowser_app/tests/test_bookmark_options.py

tests/autopilot/webbrowser_app/tests/test_keyboard.py

tests/autopilot/webbrowser_app/tests/test_media_access_permission.py

tests/autopilot/webbrowser_app/tests/test_new_tab_view.py

tests/unittests/qml/tst_BookmarksFoldersViewWide.qml

tests/unittests/qml/tst_NewTabViewWide.qml

tests/unittests/qml/tst_QmlTests.cpp

tests/unittests/qml/tst_SettingsPage.qml

Older »