lp:~mardy/webbrowser-app/cookie-manager

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:webbrowser-app at revision 699

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-08-28

Olivier Tilloy: Needs Fixing on 2014-08-26

Diff: 1739 lines (+687/-601)

19 files modified

src/app/browserapplication.cpp (+7/-2)
src/app/webcontainer/AccountsLoginPage.qml (+32/-8)
src/app/webcontainer/AccountsPage.qml (+2/-6)
src/app/webcontainer/CMakeLists.txt (+1/-1)
src/app/webcontainer/chrome-cookie-store.cpp (+117/-167)
src/app/webcontainer/chrome-cookie-store.h (+42/-10)
src/app/webcontainer/cookie-store.cpp (+78/-26)
src/app/webcontainer/cookie-store.h (+15/-9)
src/app/webcontainer/local-cookie-store.cpp (+222/-0)
src/app/webcontainer/local-cookie-store.h (+53/-0)
src/app/webcontainer/online-accounts-cookie-store.cpp (+17/-9)
src/app/webcontainer/online-accounts-cookie-store.h (+9/-3)
src/app/webcontainer/webapp-container.cpp (+9/-3)
src/app/webcontainer/webapp-container.h (+1/-0)
src/app/webcontainer/webapp-container.qml (+81/-60)
src/app/webcontainer/webkit-cookie-store.cpp (+0/-120)
src/app/webcontainer/webkit-cookie-store.h (+0/-51)
tests/unittests/cookie-store/CMakeLists.txt (+0/-1)
tests/unittests/cookie-store/tst_CookieStore.cpp (+1/-125)

api

Merged into lp:~abreu-alexandre/webbrowser-app/cookie-manager at revision 671

Alexandre Abreu: Approve on 2014-08-25

David Barth (community): Approve on 2014-08-25

Diff: 29 lines (+5/-3)

2 files modified

src/app/browserapplication.cpp (+4/-2)
src/app/webcontainer/AccountsPage.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

679. By Alberto Mardegan on 2014-08-28

Continue to the webapp page if there are no accounts

678. By Alberto Mardegan on 2014-08-27

Delay initializing the webapp

677. By Alberto Mardegan on 2014-08-27

Restore AppId, use unversioned app ID for OA

676. By Alberto Mardegan on 2014-08-26

Remove redundant slot

675. By Alberto Mardegan on 2014-08-26

Simplify signal emission

674. By Alberto Mardegan on 2014-08-26

Simplify backend calls

673. By Alberto Mardegan on 2014-08-26

Add reference to oxide enum

672. By Alberto Mardegan on 2014-08-26

Merge from trunk

[ Olivier Tilloy ]
* Reduce startup time of both apps by means of a few tricks, all
  related to asynchronous loading: - ensure loaders on the critical
  path load their components asynchronously - instantiate the error
  sheets asynchronously, as they are not needed right away - use
  Component.incubateObject(…) instead of Component.createObject(…) to
  instantiate objects asynchronously where possible - instantiate the
  history and bookmarks models asynchronously (LP: #1325001)
[ CI bot ]
* Resync trunk
[ Olivier Tilloy ]
* Instantiate webviews on demand, only when they really need to be
  shown. Show placeholder artwork and text in empty tab previews. (LP:
  #1357464)
[ David Barth ]
* Add the ability to override the Oxide webview and various functions
  related to navigation support.
[ Alexandre Abreu ]
* Fix the session storage mechanism to record URLs depending on their
  context and on the webapp context: - discard transient pages -
  discard URLs that match a potential redirection prefix (as facebook
  uses) - prevent external requests to open URLs that match the
  redirection prefix (LP: #1356417)
[ Olivier Tilloy ]
* Fix the session storage mechanism to record URLs depending on their
  context and on the webapp context: - discard transient pages -
  discard URLs that match a potential redirection prefix (as facebook
  uses) - prevent external requests to open URLs that match the
  redirection prefix (LP: #1356417)
[ Arthur Mello ]
* Add swipe to delete action to the history view (LP: #1351164)
[ Olivier Tilloy ]
* Delay the auto-hide/auto-show behaviour of the header, in order to
  prevent the view from jumping up and down on touch-enabled devices
  when the touch event sequence is not finished. (LP: #1354700)
[ Ugo Riboni ]
* Include translations in the .desktop file (LP: #1318008)
[ Olivier Tilloy ]
* Include translations in the .desktop file (LP: #1318008)
* Do not request permission for geolocation on devices where webapps
  are running confined. This is delegated to the trust store. (LP:
  #1356767)
* Elide actions’ text in the drawer menu. (LP: #1356345)
* Do not reset the contents of the address bar to the previous URL if
  currently loading. Unfocus the address bar when requesting the page
  to reload. (LP: #1354383)

671. By Alberto Mardegan on 2014-08-21

Fixes

670. By Alexandre Abreu on 2014-08-14

fix