← Back to branch summary

~rpadovani/webbrowser-app/remove-404-history

~rpadovani/webbrowser-app/remove-404-history

Viewing all changes in revision 1027.

Committer: Riccardo Padovani
Date: 2015-07-03 14:55:39 UTC
mfrom: (1011.1.69 webbrowser-app)
Revision ID: riccardo@rpadovani.com-20150703145539-pgl6ozrcqw9at9ie

Merge and resolve conflicts

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

src/app/webbrowser/BookmarksFolderListView.qml

src/app/webbrowser/KeyboardShortcut.qml

src/app/webbrowser/KeyboardShortcuts.qml

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/webapp_container/tests/test_saml_url_patterns.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/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

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

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:
.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/UbuntuWebView02.qml

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

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

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

src/app/BrowserWindow.qml

src/app/ChromeController.qml

src/app/Favicon.qml

src/app/WebViewImpl.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/LeavePrivateModeDialog.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/Suggestion.qml

src/app/webbrowser/Suggestions.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/limit-proxy-model.cpp

src/app/webbrowser/limit-proxy-model.h

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

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

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/AccountsPage.qml

src/app/webcontainer/Chrome.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/webapp_container/tests/fake_servers.py

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

tests/autopilot/webbrowser_app/tests/test_private.py

tests/autopilot/webbrowser_app/tests/test_suggestions.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/CMakeLists.txt

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/limit-proxy-model/tst_LimitProxyModelTests.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/UbuntuWebView02.qml

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

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

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

src/app/BrowserWindow.qml

src/app/ChromeController.qml

src/app/Favicon.qml

src/app/WebViewImpl.qml

src/app/favicon-fetcher.cpp

src/app/favicon-fetcher.h

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/BookmarkOptions.qml

src/app/webbrowser/BookmarksFolderListView.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/KeyboardShortcut.qml

src/app/webbrowser/KeyboardShortcuts.qml

src/app/webbrowser/LeavePrivateModeDialog.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/Suggestion.qml

src/app/webbrowser/Suggestions.qml

src/app/webbrowser/UrlDelegate.qml

src/app/webbrowser/UrlsList.qml

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/cache-deleter.cpp

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

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

src/app/webbrowser/limit-proxy-model.cpp

src/app/webbrowser/limit-proxy-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

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/Chrome.qml

src/app/webcontainer/OnlineAccountsController.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/webapp_container/tests/fake_servers.py

tests/autopilot/webapp_container/tests/test_saml_url_patterns.py

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_fullscreen.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_suggestions.py

tests/autopilot/webbrowser_app/tests/test_tabs.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/tst_BookmarksModelTests.cpp

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

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

tests/unittests/limit-proxy-model/tst_LimitProxyModelTests.cpp

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

webbrowser-app.png

Older »