Viewing all changes in revision 459.
- Committer: Leo Arias
- Date: 2014-04-25 02:58:25 UTC
- mfrom: (446.1.56 webbrowser-app)
- Revision ID: leo.arias@canonical.com-20140425025825-wb636muhpyj0bqr5
Merged with trunk.
- files added:
- debian/webapp-container-autopilot.install
- src/app/webbrowser/assets
- tests/autopilot/webapp_container
- tests/autopilot/webapp_container/tests
- tests/unittests/container-url-patterns
- tests/unittests/session-utils
- files removed:
- src/Ubuntu/Components/Extras/Browser/domain-utils.cpp
- files renamed:
- src/Ubuntu/Components/Extras/Browser/ItemSelector.qml => src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml
- src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml => src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml
- src/Ubuntu/Components/Extras/Browser/UserAgent.qml => src/Ubuntu/Components/Extras/Browser/UserAgent02.qml
- src/Ubuntu/Components/Extras/Browser/selection.js => src/Ubuntu/Components/Extras/Browser/selection02.js
- src/app/PageDelegate.qml => src/app/webbrowser/PageDelegate.qml
- src/app/TabsList.qml => src/app/webbrowser/TabsList.qml
- src/app/assets/browser_favourite_off@30.png => src/app/webbrowser/assets/browser_favourite_off@30.png
- src/app/assets/browser_favourite_on@30.png => src/app/webbrowser/assets/browser_favourite_on@30.png
- src/app/assets/close_btn@9.png => src/app/webbrowser/assets/close_btn@9.png
- src/app/assets/expanded_bottom_highlight@27.png => src/app/webbrowser/assets/expanded_bottom_highlight@27.png
- src/app/assets/expanded_tooltip@27.png => src/app/webbrowser/assets/expanded_tooltip@27.png
- src/app/assets/expanded_top_innershadow@27.png => src/app/webbrowser/assets/expanded_top_innershadow@27.png
- src/Ubuntu/Components/Extras/Browser/bookmarks-model.cpp => src/app/webbrowser/bookmarks-model.cpp
- src/Ubuntu/Components/Extras/Browser/bookmarks-model.h => src/app/webbrowser/bookmarks-model.h
- src/Ubuntu/Components/Extras/Browser/domain-utils.h => src/app/webbrowser/domain-utils.h
- src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp => src/app/webbrowser/history-domain-model.cpp
- src/Ubuntu/Components/Extras/Browser/history-domain-model.h => src/app/webbrowser/history-domain-model.h
- src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.cpp => src/app/webbrowser/history-domainlist-chronological-model.cpp
- src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.h => src/app/webbrowser/history-domainlist-chronological-model.h
- src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp => src/app/webbrowser/history-domainlist-model.cpp
- src/Ubuntu/Components/Extras/Browser/history-domainlist-model.h => src/app/webbrowser/history-domainlist-model.h
- src/Ubuntu/Components/Extras/Browser/history-matches-model.cpp => src/app/webbrowser/history-matches-model.cpp
- src/Ubuntu/Components/Extras/Browser/history-matches-model.h => src/app/webbrowser/history-matches-model.h
- src/Ubuntu/Components/Extras/Browser/history-model.cpp => src/app/webbrowser/history-model.cpp
- src/Ubuntu/Components/Extras/Browser/history-model.h => src/app/webbrowser/history-model.h
- src/Ubuntu/Components/Extras/Browser/history-timeframe-model.cpp => src/app/webbrowser/history-timeframe-model.cpp
- src/Ubuntu/Components/Extras/Browser/history-timeframe-model.h => src/app/webbrowser/history-timeframe-model.h
- src/Ubuntu/Components/Extras/Browser/tabs-model.cpp => src/app/webbrowser/tabs-model.cpp
- src/Ubuntu/Components/Extras/Browser/tabs-model.h => src/app/webbrowser/tabs-model.h
- tests/unittests/qml/tst_UbuntuWebView.qml => tests/unittests/qml/tst_UbuntuWebView02.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
