← Back to branch summary

~osomon/webbrowser-app/http-auth

~osomon/webbrowser-app/http-auth

Viewing all changes in revision 1010.

Committer: Olivier Tilloy
Date: 2015-08-12 16:10:15 UTC
mfrom: (992.27.54 webbrowser-app)
Revision ID: olivier.tilloy@canonical.com-20150812161015-8ktr48mhdonvu6sz

Merge the latest changes from trunk and resolve a few minor conflicts.

files added:
po/aa.po

po/cy.po

src/app/actions/FindInPage.qml

src/app/webbrowser/BookmarkOptions.qml

src/app/webbrowser/BookmarksFolderListView.qml

src/app/webbrowser/NavigationBar.qml

src/app/webbrowser/TabsBar.qml

src/app/webbrowser/assets/private-browsing-exit.svg

src/app/webbrowser/assets/tab-active-center@18.png

src/app/webbrowser/assets/tab-active-left@18.png

src/app/webbrowser/assets/tab-active-right@18.png

src/app/webbrowser/assets/tab-hovered-center@18.png

src/app/webbrowser/assets/tab-hovered-left@18.png

src/app/webbrowser/assets/tab-hovered-right@18.png

src/app/webbrowser/assets/tab-inactive-center@18.png

src/app/webbrowser/assets/tab-inactive-left@18.png

src/app/webbrowser/assets/tab-inactive-right@18.png

src/app/webbrowser/bookmarks-folder-model.cpp

src/app/webbrowser/bookmarks-folder-model.h

src/app/webbrowser/bookmarks-folderlist-model.cpp

src/app/webbrowser/bookmarks-folderlist-model.h

src/app/webcontainer/AccountChooserDialog.qml

src/app/webcontainer/AccountErrorScreen.qml

src/app/webcontainer/AccountsSplashScreen.qml

src/app/webcontainer/OnlineAccountsController.qml

src/app/webcontainer/SplashScreen.qml

tests/autopilot/webbrowser_app/tests/test_bookmark_options.py

tests/autopilot/webbrowser_app/tests/test_findinpage.py

tests/unittests/bookmarks-folder-model

tests/unittests/bookmarks-folder-model/CMakeLists.txt

tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp

tests/unittests/bookmarks-folderlist-model

tests/unittests/bookmarks-folderlist-model/CMakeLists.txt

tests/unittests/bookmarks-folderlist-model/tst_BookmarksFolderListModelTests.cpp

tests/unittests/qml/tst_Suggestions.qml

tests/unittests/qml/tst_TabsBar.qml

files removed:
src/app/webcontainer/AccountsModel.qml

src/app/webcontainer/AccountsView.qml

files renamed:
src/app/webcontainer/AccountItemView.qml => src/app/webcontainer/AccountItem.qml

src/app/webcontainer/AccountsLoginPage.qml => src/app/webcontainer/AccountsLogic.qml

files modified:
CMakeLists.txt

click-hooks/CMakeLists.txt

debian/changelog

debian/control

doc/WebView.qdoc

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/Components/Extras/Browser/CMakeLists.txt

src/Ubuntu/Web/CMakeLists.txt

src/Ubuntu/Web/ItemSelector02.qml

src/Ubuntu/Web/Selection.qml

src/Ubuntu/Web/SelectionHandle.qml

src/Ubuntu/Web/UbuntuSharedWebContext.qml

src/Ubuntu/Web/UbuntuWebContext.qml

src/Ubuntu/Web/UbuntuWebView02.qml

src/app/AlertDialog.qml

src/app/AuthenticationDialog.qml

src/app/BeforeUnloadDialog.qml

src/app/BrowserView.qml

src/app/BrowserWindow.qml

src/app/CMakeLists.txt

src/app/CertificateVerificationDialog.qml

src/app/ChromeBase.qml

src/app/ChromeButton.qml

src/app/ChromeController.qml

src/app/ConfirmDialog.qml

src/app/ContentDownloadDialog.qml

src/app/ContentPickerDialog.qml

src/app/ContentShareDialog.qml

src/app/Downloader.qml

src/app/ErrorSheet.qml

src/app/Favicon.qml

src/app/FilePickerDialog.qml

src/app/GeolocationPermissionRequest.qml

src/app/InvalidCertificateErrorSheet.qml

src/app/KeyboardRectangle.qml

src/app/ModalDialog.qml

src/app/PromptDialog.qml

src/app/ProxyAuthenticationDialog.qml

src/app/Share.qml

src/app/ThinProgressBar.qml

src/app/WebViewImpl.qml

src/app/actions/Back.qml

src/app/actions/Bookmark.qml

src/app/actions/BookmarkLink.qml

src/app/actions/ClearHistory.qml

src/app/actions/Copy.qml

src/app/actions/CopyImage.qml

src/app/actions/CopyLink.qml

src/app/actions/Forward.qml

src/app/actions/GoTo.qml

src/app/actions/NewTab.qml

src/app/actions/OpenImageInNewTab.qml

src/app/actions/OpenLinkInNewBackgroundTab.qml

src/app/actions/OpenLinkInNewTab.qml

src/app/actions/Reload.qml

src/app/actions/SaveImage.qml

src/app/actions/ShareLink.qml

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/BookmarksModel.qml

src/app/webbrowser/BottomEdgeHandle.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/HistoryModel.qml

src/app/webbrowser/HistorySectionDelegate.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/KeyboardShortcut.qml

src/app/webbrowser/KeyboardShortcuts.qml

src/app/webbrowser/LeavePrivateModeDialog.qml

src/app/webbrowser/NewPrivateTabView.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/SearchEngines.qml

src/app/webbrowser/SearchSuggestions.qml

src/app/webbrowser/SecurityCertificatePopover.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/SettingsPageHeader.qml

src/app/webbrowser/Suggestion.qml

src/app/webbrowser/Suggestions.qml

src/app/webbrowser/TabChrome.qml

src/app/webbrowser/TabPreview.qml

src/app/webbrowser/TabsList.qml

src/app/webbrowser/Toolbar.qml

src/app/webbrowser/ToolbarAction.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/tabs-model.cpp

src/app/webbrowser/tabs-model.h

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/AccountsPage.qml

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/Chrome.qml

src/app/webcontainer/PopupWindowController.qml

src/app/webcontainer/PopupWindowOverlay.qml

src/app/webcontainer/WebApp.qml

src/app/webcontainer/WebViewImplOxide.qml

src/app/webcontainer/WebappContainerWebview.qml

src/app/webcontainer/cookie-store.cpp

src/app/webcontainer/session-utils.cpp

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

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_addressbar_bookmark.py

tests/autopilot/webbrowser_app/tests/test_content_pick.py

tests/autopilot/webbrowser_app/tests/test_geolocation.py

tests/autopilot/webbrowser_app/tests/test_keyboard.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_selection.py

tests/autopilot/webbrowser_app/tests/test_settings.py

tests/autopilot/webbrowser_app/tests/test_suggestions.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/autopilot/webbrowser_app/tests/test_title.py

tests/unittests/CMakeLists.txt

tests/unittests/bookmarks-model/CMakeLists.txt

tests/unittests/bookmarks-model/tst_BookmarksModelTests.cpp

tests/unittests/container-url-patterns/CMakeLists.txt

tests/unittests/cookie-store/CMakeLists.txt

tests/unittests/domain-utils/CMakeLists.txt

tests/unittests/favicon-fetcher/CMakeLists.txt

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

tests/unittests/history-domain-model/CMakeLists.txt

tests/unittests/history-domainlist-chronological-model/CMakeLists.txt

tests/unittests/history-domainlist-model/CMakeLists.txt

tests/unittests/history-model/CMakeLists.txt

tests/unittests/history-timeframe-model/CMakeLists.txt

tests/unittests/intent-filter/CMakeLists.txt

tests/unittests/limit-proxy-model/CMakeLists.txt

tests/unittests/oxide-cookie-helper/CMakeLists.txt

tests/unittests/qml/CMakeLists.txt

tests/unittests/qml/tst_AddressBar.qml

tests/unittests/qml/tst_BrowserTab.qml

tests/unittests/qml/tst_QmlTests.cpp

tests/unittests/qml/tst_SearchEngines.qml

tests/unittests/qml/tst_UbuntuWebView02.qml

tests/unittests/search-engine/CMakeLists.txt

tests/unittests/session-storage/CMakeLists.txt

tests/unittests/session-utils/CMakeLists.txt

tests/unittests/suggestions-filter-model/CMakeLists.txt

tests/unittests/tabs-model/CMakeLists.txt

tests/unittests/tabs-model/tst_TabsModelTests.cpp

tests/unittests/top-sites-model/CMakeLists.txt

tests/unittests/webapp-container-hook/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

click-hooks/CMakeLists.txt

debian/changelog

doc/WebView.qdoc

po/ca@valencia.po

po/webbrowser-app.pot

src/Ubuntu/Components/Extras/Browser/CMakeLists.txt

src/Ubuntu/Web/CMakeLists.txt

src/Ubuntu/Web/ItemSelector02.qml

src/Ubuntu/Web/Selection.qml

src/Ubuntu/Web/SelectionHandle.qml

src/Ubuntu/Web/UbuntuSharedWebContext.qml

src/Ubuntu/Web/UbuntuWebContext.qml

src/Ubuntu/Web/UbuntuWebView02.qml

src/app/AlertDialog.qml

src/app/AuthenticationDialog.qml

src/app/BeforeUnloadDialog.qml

src/app/BrowserView.qml

src/app/BrowserWindow.qml

src/app/CMakeLists.txt

src/app/CertificateVerificationDialog.qml

src/app/ChromeBase.qml

src/app/ChromeButton.qml

src/app/ChromeController.qml

src/app/ConfirmDialog.qml

src/app/ContentDownloadDialog.qml

src/app/ContentPickerDialog.qml

src/app/ContentShareDialog.qml

src/app/Downloader.qml

src/app/ErrorSheet.qml

src/app/Favicon.qml

src/app/FilePickerDialog.qml

src/app/GeolocationPermissionRequest.qml

src/app/InvalidCertificateErrorSheet.qml

src/app/KeyboardRectangle.qml

src/app/ModalDialog.qml

src/app/PromptDialog.qml

src/app/ProxyAuthenticationDialog.qml

src/app/ThinProgressBar.qml

src/app/WebViewImpl.qml

src/app/actions/Back.qml

src/app/actions/Bookmark.qml

src/app/actions/BookmarkLink.qml

src/app/actions/ClearHistory.qml

src/app/actions/Copy.qml

src/app/actions/CopyImage.qml

src/app/actions/CopyLink.qml

src/app/actions/FindInPage.qml

src/app/actions/Forward.qml

src/app/actions/GoTo.qml

src/app/actions/NewTab.qml

src/app/actions/OpenImageInNewTab.qml

src/app/actions/OpenLinkInNewBackgroundTab.qml

src/app/actions/OpenLinkInNewTab.qml

src/app/actions/Reload.qml

src/app/actions/SaveImage.qml

src/app/actions/ShareLink.qml

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/BookmarkOptions.qml

src/app/webbrowser/BookmarksFolderListView.qml

src/app/webbrowser/BookmarksModel.qml

src/app/webbrowser/BottomEdgeHandle.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/HistoryModel.qml

src/app/webbrowser/HistorySectionDelegate.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/KeyboardShortcut.qml

src/app/webbrowser/KeyboardShortcuts.qml

src/app/webbrowser/LeavePrivateModeDialog.qml

src/app/webbrowser/NavigationBar.qml

src/app/webbrowser/NewPrivateTabView.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/SearchEngines.qml

src/app/webbrowser/SearchSuggestions.qml

src/app/webbrowser/SecurityCertificatePopover.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/SettingsPageHeader.qml

src/app/webbrowser/Suggestion.qml

src/app/webbrowser/Suggestions.qml

src/app/webbrowser/TabChrome.qml

src/app/webbrowser/TabPreview.qml

src/app/webbrowser/TabsBar.qml

src/app/webbrowser/TabsList.qml

src/app/webbrowser/ToolbarAction.qml

src/app/webbrowser/UrlDelegate.qml

src/app/webbrowser/UrlsList.qml

src/app/webbrowser/assets/private-browsing-exit.svg

src/app/webbrowser/assets/tab-active-center@18.png

src/app/webbrowser/assets/tab-active-left@18.png

src/app/webbrowser/assets/tab-active-right@18.png

src/app/webbrowser/assets/tab-hovered-center@18.png

src/app/webbrowser/assets/tab-hovered-left@18.png

src/app/webbrowser/assets/tab-hovered-right@18.png

src/app/webbrowser/assets/tab-inactive-center@18.png

src/app/webbrowser/assets/tab-inactive-left@18.png

src/app/webbrowser/assets/tab-inactive-right@18.png

src/app/webbrowser/bookmarks-folder-model.cpp

src/app/webbrowser/bookmarks-folder-model.h

src/app/webbrowser/bookmarks-folderlist-model.cpp

src/app/webbrowser/bookmarks-folderlist-model.h

src/app/webbrowser/bookmarks-model.cpp

src/app/webbrowser/bookmarks-model.h

src/app/webbrowser/tabs-model.cpp

src/app/webbrowser/tabs-model.h

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/AccountChooserDialog.qml

src/app/webcontainer/AccountErrorScreen.qml

src/app/webcontainer/AccountItem.qml

src/app/webcontainer/AccountsLogic.qml

src/app/webcontainer/AccountsModel.qml

src/app/webcontainer/AccountsPage.qml

src/app/webcontainer/AccountsSplashScreen.qml

src/app/webcontainer/AccountsView.qml

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/Chrome.qml

src/app/webcontainer/OnlineAccountsController.qml

src/app/webcontainer/PopupWindowController.qml

src/app/webcontainer/PopupWindowOverlay.qml

src/app/webcontainer/SplashScreen.qml

src/app/webcontainer/WebApp.qml

src/app/webcontainer/WebViewImplOxide.qml

src/app/webcontainer/WebappContainerWebview.qml

src/app/webcontainer/session-utils.cpp

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

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_addressbar_bookmark.py

tests/autopilot/webbrowser_app/tests/test_bookmark_options.py

tests/autopilot/webbrowser_app/tests/test_content_pick.py

tests/autopilot/webbrowser_app/tests/test_findinpage.py

tests/autopilot/webbrowser_app/tests/test_geolocation.py

tests/autopilot/webbrowser_app/tests/test_keyboard.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_selection.py

tests/autopilot/webbrowser_app/tests/test_settings.py

tests/autopilot/webbrowser_app/tests/test_suggestions.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/autopilot/webbrowser_app/tests/test_title.py

tests/unittests/CMakeLists.txt

tests/unittests/bookmarks-folder-model/

tests/unittests/bookmarks-folder-model/CMakeLists.txt

tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp

tests/unittests/bookmarks-folderlist-model/

tests/unittests/bookmarks-folderlist-model/CMakeLists.txt

tests/unittests/bookmarks-folderlist-model/tst_BookmarksFolderListModelTests.cpp

tests/unittests/bookmarks-model/CMakeLists.txt

tests/unittests/bookmarks-model/tst_BookmarksModelTests.cpp

tests/unittests/container-url-patterns/CMakeLists.txt

tests/unittests/domain-utils/CMakeLists.txt

tests/unittests/favicon-fetcher/CMakeLists.txt

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

tests/unittests/history-domain-model/CMakeLists.txt

tests/unittests/history-domainlist-chronological-model/CMakeLists.txt

tests/unittests/history-domainlist-model/CMakeLists.txt

tests/unittests/history-model/CMakeLists.txt

tests/unittests/history-timeframe-model/CMakeLists.txt

tests/unittests/intent-filter/CMakeLists.txt

tests/unittests/limit-proxy-model/CMakeLists.txt

tests/unittests/qml/CMakeLists.txt

tests/unittests/qml/tst_AddressBar.qml

tests/unittests/qml/tst_BrowserTab.qml

tests/unittests/qml/tst_QmlTests.cpp

tests/unittests/qml/tst_SearchEngines.qml

tests/unittests/qml/tst_Suggestions.qml

tests/unittests/qml/tst_TabsBar.qml

tests/unittests/qml/tst_UbuntuWebView02.qml

tests/unittests/search-engine/CMakeLists.txt

tests/unittests/session-storage/CMakeLists.txt

tests/unittests/session-utils/CMakeLists.txt

tests/unittests/suggestions-filter-model/CMakeLists.txt

tests/unittests/tabs-model/CMakeLists.txt

tests/unittests/tabs-model/tst_TabsModelTests.cpp

tests/unittests/top-sites-model/CMakeLists.txt

tests/unittests/webapp-container-hook/CMakeLists.txt

Older »