lp:~abreu-alexandre/webbrowser-app/fix-url-pattern-patching-overrides-and-google-patterns

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:webbrowser-app at revision 471

PS Jenkins bot: Approve (continuous-integration) on 2014-03-20

Alberto Mardegan (community): Approve on 2014-03-10

David Barth: Pending requested 2014-03-07

Ubuntu Phablet Team: Pending requested 2014-03-06

Diff: 450 lines (+306/-46)

8 files modified

src/app/webcontainer/CMakeLists.txt (+1/-1)
src/app/webcontainer/WebApp.qml (+23/-5)
src/app/webcontainer/url-pattern-utils.cpp (+129/-0)
src/app/webcontainer/url-pattern-utils.h (+32/-0)
src/app/webcontainer/webapp-container.cpp (+11/-40)
tests/unittests/CMakeLists.txt (+1/-0)
tests/unittests/container-url-patterns/CMakeLists.txt (+10/-0)
tests/unittests/container-url-patterns/tst_ContainerUrlPatterns.cpp (+99/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1288982: [webappcontainer] Fix url patterns override from container arg

Undecided

Fix Released

Link a bug report

Related blueprints

470. By Alexandre Abreu on 2014-03-20

Merge trunk

469. By PS Jenkins bot on 2014-03-19

Releasing 0.23+14.04.20140319-0ubuntu1

468. By Olivier Tilloy on 2014-03-19

Use the renderer only once when rendering a thumbnail.
This seems to fix the crash that was happening at destruction time. Fixes: 1294219

467. By PS Jenkins bot on 2014-03-17

Releasing 0.23+14.04.20140317.1-0ubuntu1

466. By Colin Watson on 2014-03-17

Add multiarch annotations.

465. By PS Jenkins bot on 2014-03-17

Releasing 0.23+14.04.20140317-0ubuntu1

464. By Olivier Tilloy on 2014-03-17

Refactor the test HTTP server to use a random port at startup.

463. By Adnane Belmadiaf on 2014-03-17

Fix to open URL that start with / (local files)

462. By Leo Arias on 2014-03-17

Updated the copyright header on all the python files.

461. By Olivier Tilloy on 2014-03-17

Do not register private types in the public plugin.
Register them in the webbrowser application scope instead.

I have made sure that private types that were previously public are currently not being used by any application in the store, so this refactoring is safe.