← Back to branch summary

~uriboni/webbrowser-app/basic-auth

~uriboni/webbrowser-app/basic-auth

Viewing all changes in revision 996.

Committer: Ugo Riboni
Date: 2015-06-08 12:44:47 UTC
mfrom: (992.1.60 webbrowser-app)
Revision ID: ugo.riboni@canonical.com-20150608124447-5x9fy89sufsj55vd

Merge changes from trunk

files added:
tests/autopilot/webbrowser_app/tests/test_new_tab_view.py

files removed:
src/app/webbrowser/upstreamcomponents

src/app/webbrowser/upstreamcomponents/ListItemWithActions.qml

src/app/webbrowser/upstreamcomponents/ListItemWithActionsCheckBox.qml

src/app/webbrowser/upstreamcomponents/MultipleSelectionListView.qml

src/app/webbrowser/upstreamcomponents/MultipleSelectionVisualModel.qml

src/app/webbrowser/upstreamcomponents/README

files modified:
.bzrignore

debian/changelog

debian/control

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/bg.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.po

po/cs.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/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/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/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/ua-override-worker.js

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

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

src/app/Favicon.qml

src/app/favicon-fetcher.cpp

src/app/favicon-fetcher.h

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/BrowserTab.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/Chrome.qml

src/app/webbrowser/ExpandedHistoryView.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/UrlDelegate.qml

src/app/webbrowser/UrlsList.qml

src/app/webbrowser/bookmarks-model.cpp

src/app/webbrowser/bookmarks-model.h

src/app/webbrowser/cache-deleter.cpp

src/app/webbrowser/history-domainlist-chronological-model.cpp

src/app/webbrowser/history-domainlist-chronological-model.h

src/app/webbrowser/top-sites-model.cpp

src/app/webbrowser/top-sites-model.h

tests/autopilot/webbrowser_app/emulators/browser.py

tests/autopilot/webbrowser_app/tests/__init__.py

tests/autopilot/webbrowser_app/tests/test_private.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/bookmarks-model/tst_BookmarksModelTests.cpp

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp

tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp

webbrowser-app.png

Show diffs side-by-side

added added

removed removed

debian/changelog

po/ca@valencia.po

po/webbrowser-app.pot

src/Ubuntu/Web/ua-override-worker.js

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

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

src/app/Favicon.qml

src/app/favicon-fetcher.cpp

src/app/favicon-fetcher.h

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/BrowserTab.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/Chrome.qml

src/app/webbrowser/ExpandedHistoryView.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/UrlDelegate.qml

src/app/webbrowser/UrlsList.qml

src/app/webbrowser/bookmarks-model.cpp

src/app/webbrowser/bookmarks-model.h

src/app/webbrowser/cache-deleter.cpp

src/app/webbrowser/history-domainlist-chronological-model.cpp

src/app/webbrowser/history-domainlist-chronological-model.h

src/app/webbrowser/top-sites-model.cpp

src/app/webbrowser/top-sites-model.h

src/app/webbrowser/upstreamcomponents/

src/app/webbrowser/upstreamcomponents/ListItemWithActions.qml

src/app/webbrowser/upstreamcomponents/ListItemWithActionsCheckBox.qml

src/app/webbrowser/upstreamcomponents/MultipleSelectionListView.qml

src/app/webbrowser/upstreamcomponents/MultipleSelectionVisualModel.qml

src/app/webbrowser/upstreamcomponents/README

tests/autopilot/webbrowser_app/emulators/browser.py

tests/autopilot/webbrowser_app/tests/__init__.py

tests/autopilot/webbrowser_app/tests/test_new_tab_view.py

tests/autopilot/webbrowser_app/tests/test_private.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/bookmarks-model/tst_BookmarksModelTests.cpp

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp

tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp

webbrowser-app.png

Older »