commit 61d7e21401893e57f893a0a7be997c4ccd1b1263
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Fri Feb 3 12:56:19 2017 -0600

    Prepare 3.23.5

 NEWS         | 31 +++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

commit ffc941592e4be725e1aed874210e3de5f3dd824a
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Fri Feb 3 13:14:08 2017 -0600

    Fix test-ephy-encodings and test-ephy-file-helpers

    They need to be set up to use the newly-relocatable state schema.

 tests/ephy-encodings-test.c    | 3 +++
 tests/ephy-file-helpers-test.c | 2 ++
 2 files changed, 5 insertions(+)

commit c5d3a657fc31b486f67e182bb3557336c9ccda61
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Fri Feb 3 13:10:54 2017 -0600

    Disable broken test-ephy-download

    The right thing to do when a test is failing is ignore it, right?
    ...right?

 tests/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit cf689cf2b079fa95d17a04a753bdfdb628523a22
Author: Adrian Perez de Castro <aperez@igalia.com>
Date:   Fri Feb 3 00:54:51 2017 +0200

    uri-tester: Ensure regexps are properly constructed

    This adds a few more cases to the escaping done when converting
    an AdBlock
    non-regepx "simple pattern" from a rule into a GRegex. This patch
    does the
    following:

    - Adds escaping to some of the regexp metacharacters which were
    not being
      handled: (){}+.|\
    - Adds support for using a vertical bar at the end of a pattern to
    anchor the
      match at the end.
    - Adds support for using ^ to match a "separator character"
    (a non-letter,
      non-number, or one of _-.%).

    This also adds as much comment lines as code, which in this
    particular case
    is probably a good thing, so reading the code in the future does
    not need
    checking each case against the GRegex documentation.

    https://bugzilla.gnome.org/show_bug.cgi?id=777714

 embed/web-extension/ephy-uri-tester.c | 56
 +++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 16 deletions(-)

commit fac43af4622b46532b298ea5611c6880844c5f0d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Feb 2 21:31:46 2017 -0600

    Do not run new migrator if the main profile has been migrated

    This is ephy *profile* migrator. It runs on a per-profile basis. i.e.
    each web app runs migrators separately. So this migration step
    could run
    once for a profile dir, then again far in the future when an old
    web app
    is opened. But passwords are global state, not stored in the
    profile dir,
    and we want to run this migration only once. This is tricky to
    fix, but
    it's easier if we relax the constraint to "never run this migrator
    if it
    has been run already for the default profile dir." That's because
    we don't
    really care if a couple web app passwords get converted from
    insecure to
    secure, which is not a big problem and indicates the user probably
    never
    uses Epiphany except for web apps anyway. We just don't want all
    the user's
    passwords to get converted mysteriously because he happens to open
    a web
    app. So check the migration version for the default profile dir
    and abort
    if this migrator has already run there. This way we avoid adding a
    new flag
    file to clutter the profile dir just to check if this migrator
    has run.

    https://bugzilla.gnome.org/show_bug.cgi?id=752738

 lib/ephy-profile-utils.c                     | 15 ++++++--
 lib/ephy-profile-utils.h                     |  2 ++
 src/profile-migrator/ephy-profile-migrator.c | 52
 ++++++++++++++++++++--------
 3 files changed, 51 insertions(+), 18 deletions(-)

commit 7db9178219b008676a532ddd38311d056ebd6302
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Fri Feb 3 04:06:19 2017 +0000

    Update Kazakh translation

 po/kk.po | 1044
 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 598 insertions(+), 446 deletions(-)

commit 71d0b0aa75788aa6ebacc1cf6225f57a6c7e7b2d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Feb 2 19:51:15 2017 -0600

    form-auth-data: Properly normalize URI when accessing secret service

    I've mishandled this issue pretty badly. Incredibly, my previous
    patch,
    which was intended to ensure we always normalize URIs to security
    origins when working with form auth data, only fixed use of the form
    auth data cache. It didn't actually fix any use of the secret service
    itself. Fix that.

    This commit notably removes support for mailman passwords, which is
    making the code way too complicated and conflicts with the goal of
    storing only security origins and not full URIs in the secret service.

    Note: this normalization is way better than what we were doing before.
    In particular, it incidentally fixes odd bugs like the URI framgment,
    even the empty fragment #, being sufficient to trick our password
    manager into storing separate passwords, so this should also make the
    password filling significantly more reliable than it used to
    be. (Unless
    you need per-URI passwords without a username, i.e. mailman passwords,
    in which case you're just out of luck, sorry!)

    https://bugzilla.gnome.org/show_bug.cgi?id=752738

 lib/ephy-form-auth-data.c | 55
 +++++++++++------------------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

commit f90ce8b619f20204fd95c9356c7464012a117b2b
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Feb 2 19:13:05 2017 -0600

    form-auth-data: Add debugging statements

 lib/ephy-form-auth-data.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

commit 7d2448d820d32bb6c81253e39d043eb1aa5dbb6c
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Feb 2 19:04:10 2017 -0600

    debug: Update comment

 lib/ephy-debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9c1495d9d8dff536749e8011858909eb76e0846c
Author: Fabio Tomat <f.t.public@gmail.com>
Date:   Thu Feb 2 20:39:14 2017 +0000

    Update Friulian translation

 po/fur.po | 631
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 379 insertions(+), 252 deletions(-)

commit ffbbbfea827918f210a1e08db8b39e60d1e8a739
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 21:43:01 2017 -0600

    Fix impedance mismatch between web extension and form auth data cache

    Using just host is not sufficient, we need to have protocol and
    port as
    well for matching based on security origin to work properly.

    Unfortunately the existing code here was full of subtle errors: the
    parameters named "uri" were actually passed hostnames from the web
    extension, and not URIs at all. The code only worked as long as that
    assumption held, but I broke it because I expected the URI
    parameters to
    actually contain URIs. So fix this. Really pass URIs and not
    hostnames,
    and properly convert them to security origins.

    Thanks to Hussam for reporting this bug so quickly after it was
    introduced. (As well as lots of other bugs in the past that I've
    rarely
    credited him for in commit messages.)

    https://bugzilla.gnome.org/show_bug.cgi?id=752738

 embed/web-extension/ephy-web-extension.c | 24 ++++++++++--------------
 lib/ephy-form-auth-data.c                | 31
 +++++++++++++++++--------------
 2 files changed, 27 insertions(+), 28 deletions(-)

commit 88aacc4f86762c805d2abf092c727e363282b64f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 15:51:50 2017 -0600

    prefs-dialog: Bring back default encoding preference

    Bring back this preference. Safari guesses the default encoding
    based on
    the user's locale, and unless we're going to do that, we should allow
    the user to configure it.

 src/prefs-dialog.c                | 75
 +++++++++++++++++++++++++++++++++++++++
 src/resources/gtk/prefs-dialog.ui | 39 ++++++++++++++++++++
 2 files changed, 114 insertions(+)

commit 974d8332e0de1e43aa85fc16d39deb2b8ce33ecd
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 12:31:01 2017 -0600

    profile-migrator: Don't crash when passed invalid -d

 src/profile-migrator/ephy-profile-migrator.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit b0387605bf2c161b4af6b53e40c689c9e8ddb4d2
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 12:23:36 2017 -0600

    profile-migrator: Fixup for the previous commit

 src/profile-migrator/ephy-profile-migrator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d3f0c4df956d1de1b8584d4dd556936e3f042e4e
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 12:18:18 2017 -0600

    profile-migrator: Fix -d index to be 1-based

    Otherwise you have to use e.g. -d 10 to get the 11th migrator....

 src/profile-migrator/ephy-profile-migrator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9f480784c9f95aedb653572c7f42b1de9174a798
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 12:06:39 2017 -0600

    Put the new profile migrator before other 3.23 migrators

    This will break anybody using 3.23. To fix:

Notes:
    To fix, run ephy-profile-migrator -d 11

 src/profile-migrator/ephy-profile-migrator.c | 160
 +++++++++++++--------------
 1 file changed, 80 insertions(+), 80 deletions(-)

commit eec6703b784866c51a7b099f1ccfa6b3de881b61
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Feb 1 18:42:10 2017 +0100

    Do not allow to bookmark pages in incognito mode

 src/ephy-window.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 1320bb12a25cd4be63278302e33a4ea35564fe7f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Wed Feb 1 11:32:32 2017 -0600

    Add profile migrator to migrate insecure passwords

    All previously-saved passwords will now only be available to https://
    origins. Users will have to manually enter their passwords once
    again in
    order to save them separately for an insecure origin.

    https://bugzilla.gnome.org/show_bug.cgi?id=752738

 lib/ephy-profile-utils.h                     |  2 +-
 src/profile-migrator/ephy-profile-migrator.c | 82
 +++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)

commit f7823c4654f5eb66c48f8a89b3b28de5d74a99b6
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Tue Jan 31 20:48:17 2017 -0600

    form-auth-data: fix function name typo

    https://bugzilla.gnome.org/show_bug.cgi?id=752738

 lib/ephy-form-auth-data.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit fae524984cba702ec8a451a5ad15e1eeae423518
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 19:33:48 2016 -0600

    form-auth: Store passwords for security origins, not hosts

    This prevents an active MITM attacker from enumerating all your saved
    passwords. The attacker will now only be able to access passwords
    saved
    on http:// sites. That's by design, though; users are now warned when
    focusing insecure password forms and should think twice before saving
    such passwords.

    Unfortunately this does introduce a migration issue, in that no
    previously-saved passwords will be available on https:// websites
    anymore, and all previously-saved passwords will still be enumerable
    by
    attackers. I'm not sure how to handle migration. We might be able to
    handle it nicely by using the history service to guess whether a
    password should be migrated from http:// to https://, but that is
    not a
    simple project.

    https://bugzilla.gnome.org/show_bug.cgi?id=752738

 lib/ephy-form-auth-data.c | 34 +++++++++++++++-------------------
 src/passwords-dialog.c    | 24 ++++++++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

commit 25bfba25e0715c353acd9cd9e677e9dd8806ebbe
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Feb 1 18:17:37 2017 +0100

    Do not use ephy-session in incognito mode either

 src/ephy-shell.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit e7a419c6397ecddab0895ea1ef9ee57db7319015
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Feb 1 09:59:56 2017 +0000

    Update Spanish translation

 po/es.po | 623
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 343 insertions(+), 280 deletions(-)

commit 7358d182facd6d9753d947475c961efcf72bcdfd
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Tue Jan 31 21:01:50 2017 -0600

    prefs-dialog: tweak string

 src/resources/gtk/prefs-dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c991eddece0a02528ab3768a0962115564ce69d
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Jan 25 09:05:04 2017 +0100

    Rename clear personal data button as manage personal data

 src/resources/gtk/prefs-dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit afe0f013631864bbb603b14779d23c51168c2c89
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 17 12:48:37 2017 +0100

    Rework personal data dialog using new WebKit API

    It allows to delete data types for all websites modified since a given
    period of time, similar to firefox and chromium. But when selecting to
    clear data from the beginning of time it also allows you to only
    delete
    the data for particular domains.
    It only offers to delete data that is actually found.
    Other kind of data not handled by WebKitWebsiteDataManager like
    cookies,
    passwords and history navugation has been removed, since it was
    actually redundant here. The cookies dialog already allows to clear
    cookies, the password dialog allows to clear passwords and same
    for the
    history dialog. The only regression would be the favicons, but I think
    it would be better to make WebKitWebsiteDataManager handle favicons
    instead of having them as a special case here.

    https://bugzilla.gnome.org/show_bug.cgi?id=741447

 src/clear-data-dialog.c                | 428
 ++++++++++++++++++++++++++++-----
 src/resources/gtk/clear-data-dialog.ui | 233 +++++++++++++-----
 2 files changed, 535 insertions(+), 126 deletions(-)

commit 1bc3e49fd319cbe21c3635b005d68d0dad659fcf
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Jan 25 13:16:19 2017 +0100

    Use an ephemeral WebKitWebContext in incognito mode

    That ensures nothing is written to the disk by WebKit.

    https://bugzilla.gnome.org/show_bug.cgi?id=777736

 configure.ac             |  2 +-
 embed/ephy-embed-shell.c | 23 +++++++++++++++--------
 embed/ephy-embed-shell.h |  3 ---
 3 files changed, 16 insertions(+), 12 deletions(-)

commit 23e788dad0ea0d3a8fa9ddf18322d92ce6a52abf
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 29 22:41:04 2017 -0600

    prefs-dialog: Do not use the default web context

    Instead, create a new web context just for the sync web view and get
    preferred languages from the Epiphany embed web context. Use
    g_object_get/set_data() as a workaround for the lack of a
    webkit_web_context_get_preferred_languages().

    https://bugzilla.gnome.org/show_bug.cgi?id=777736

 embed/ephy-embed-prefs.c |  8 ++++----
 src/prefs-dialog.c       | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

commit 86378f748549dcd6098c0300f066ce4ee9c59dca
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 31 15:34:19 2017 +0100

    Do not allow incognito or private instances to save window geometry

    Allow them to read it, but not write it.

 src/ephy-window.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit 9e305eb9b9dfb59f450d15438a9bbf8c6a3c8639
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 31 15:24:46 2017 +0100

    Save state of web apps in their own gsettings path

    Make the org.gnome.Epiphany.state schema relocatable and set
    a specific
    path for web apps, or use the default one otherwise. This ensures that
    web apps don't write their window geometry to the general settings and
    every web app can have its own geometry no matter what window was last
    closed.

 data/org.gnome.epiphany.gschema.xml |  2 +-
 lib/ephy-settings.c                 | 38
 ++++++++++++++++++++++++++++++-------
 lib/ephy-settings.h                 |  3 +++
 src/ephy-main.c                     | 13 +++++++++++++
 4 files changed, 48 insertions(+), 8 deletions(-)

commit aff4396245565d11fb588aa68504515ff6c0585a
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 31 14:28:23 2017 +0100

    Also save the window position in gsettings

 data/org.gnome.epiphany.gschema.xml |  5 +++
 src/ephy-session.c                  |  8 ++--
 src/ephy-window.c                   | 80
 ++++++++++++++++++++++++++++---------
 src/ephy-window.h                   |  3 ++
 4 files changed, 72 insertions(+), 24 deletions(-)

commit 2dce10c3532e8ddac52248b0ffdffa272d64f528
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 31 13:54:32 2017 +0100

    window: rename has_size as has_default_size

 src/ephy-window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 704e4017f3fa3b3a411a8319c2734145ff93d88e
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 31 12:55:58 2017 +0100

    Stop using ephy-session in web app mode

    We were making sure we never loaded the session in web app mode,
    but we
    always saved it. It's better to simply not use ephy-session at all in
    web app mode.

 src/ephy-shell.c      | 28 +++++++++++++++++-----------
 src/ephy-window.c     |  5 ++++-
 src/window-commands.c |  5 ++++-
 3 files changed, 25 insertions(+), 13 deletions(-)

commit fedcde29c79954e028dcd2283c66cf3c87ea5304
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Tue Jan 31 10:13:00 2017 +0100

    Move window position setting from ui to state schema

    And use a tuple instead of two settings.

 data/org.gnome.epiphany.gschema.xml | 25 ++++++++++---------------
 src/ephy-window.c                   | 26 ++++++++++++++++----------
 2 files changed, 26 insertions(+), 25 deletions(-)

commit 2ad08ce0664bed0b666491055f639b716ff178aa
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 30 20:14:21 2017 -0600

    web-extension: Fix logic error in insecure form detection

    It's causing criticals on pages with password forms.

 embed/web-extension/ephy-web-extension.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ae35f72fc9a0084578e6a11cc3bb3544b74e8a1
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 30 19:52:12 2017 -0600

    permissions-manager: simplify security origin comparision a bit

    It's a linear search, so exact values don't matter.

 lib/ephy-permissions-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ddcc22e62a7067c850c2208d2f4900fc0ca43fef
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 30 19:42:07 2017 -0600

    permissions-manager: Cache permissions when enumerating them

    GKeyFile performs synchronous file I/O to read permissions from the
    permissions store, so we'd better do it as little as possible. This
    commit ensures we read from the notification permissions file
    just twice
    ever, instead of twice each time a new tab is created.

    https://bugzilla.gnome.org/show_bug.cgi?id=777835

 embed/ephy-embed-shell.c       |   3 -
 lib/ephy-permissions-manager.c | 138
 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 132 insertions(+), 9 deletions(-)

commit 3c87365b6c5179e15ad7daacfcfb27850e67b7f7
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Fri Dec 30 18:21:42 2016 -0600

    Set initial notification permissions

 embed/ephy-embed-shell.c       |  25 +++++++-
 lib/ephy-permissions-manager.c | 142
 +++++++++++++++++++++++++++++++++++++++--
 lib/ephy-permissions-manager.h |   6 ++
 3 files changed, 167 insertions(+), 6 deletions(-)

commit 29eed5e5d0696aa5426013493f0d4e5e70da7a10
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Mon Jan 30 16:26:37 2017 +0100

    Update POTFILES.in

 po/POTFILES.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f9dec6e42f586289616008979a2067d88d2f2cb3
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 29 23:29:54 2017 -0600

    Require WebKitGTK+ 2.15.3

    For WebKitSecurityOrigin

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 098dbd66221900f5e070484fe5db6d2a4b1be91a
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 20:11:17 2016 -0600

    Rename EPHY_PERMISSION_ALLOW to EPHY_PERMISSION_PERMIT

    For better parallelism with EPHY_PERMISSION_DENY

 embed/ephy-web-view.c                    | 4 ++--
 embed/web-extension/ephy-web-extension.c | 2 +-
 lib/ephy-permissions-manager.h           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 4ad6f2e0a77340a82f2bf5d61cb494ec770bc701
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 16:34:43 2016 -0600

    permissions-manager: operate on security origins, not hosts

 data/Makefile.am                                   |  2 +-
 ... => org.gnome.epiphany.permissions.gschema.xml} | 14 ++--
 embed/ephy-web-view.c                              | 30 +++++----
 embed/web-extension/ephy-web-extension.c           | 14 ++--
 lib/ephy-permissions-manager.c                     | 78
 +++++++++++++---------
 lib/ephy-permissions-manager.h                     | 18 ++---
 lib/ephy-profile-utils.h                           |  2 +-
 src/profile-migrator/ephy-profile-migrator.c       | 15 +++++
 8 files changed, 107 insertions(+), 66 deletions(-)

commit 19aeecfd458ffb1197607b5f90fb512e51aa806b
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 16:03:36 2016 -0600

    permissions-manager: Remove setting-changed signal

    This signal is unused. It should be easy to bring back if desired,
    but I
    can't think of any part of the code that would want to use it.

 lib/ephy-permissions-manager.c | 31 -------------------------------
 1 file changed, 31 deletions(-)

commit fb084ccb1eb88ba6a6b7274639bf0ce73dacc7f8
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 15:58:21 2016 -0600

    Rename EphyHostsManager to EphyPermissionsManager

 embed/ephy-embed-shell.c                           | 14 ++--
 embed/ephy-embed-shell.h                           |  4 +-
 embed/ephy-web-view.c                              | 85
 +++++++++++-----------
 embed/web-extension/ephy-web-extension.c           | 21 +++---
 lib/Makefile.am                                    |  4 +-
 ...-hosts-manager.c => ephy-permissions-manager.c} | 73
 ++++++++++---------
 ...-hosts-manager.h => ephy-permissions-manager.h} | 50 ++++++-------
 7 files changed, 125 insertions(+), 126 deletions(-)

commit f8676aead08e4f317813bd3a42f38f520e26ad1d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 15:23:10 2016 -0600

    Use security origins rather than hosts for permission requests

    They're still fed into a host manager that translates the security
    origins into hosts, so there should be no real behavior change here.
    Next step is to make the host manager aware of security origins.

 embed/ephy-embed-shell.c                 |  6 ++--
 embed/ephy-web-view.c                    | 50
 +++++++++++++++++---------------
 embed/web-extension/ephy-web-extension.c | 39 ++++++++++++++++++-------
 3 files changed, 57 insertions(+), 38 deletions(-)

commit 0002bce0c3a0e015eb707167f5eed60f5c557d8f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 12:56:23 2016 -0600

    web-view: Use security origins on error pages where appropriate

 embed/ephy-web-view.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

commit e924464c25e796cee17b2032f6756bacbadc76d5
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Dec 29 12:54:43 2016 -0600

    uri-helpers: Add function to convert URI to security origin

 lib/ephy-uri-helpers.c | 16 +++++++++++++++-
 lib/ephy-uri-helpers.h |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

commit c1ff13e2bb0024125f9add68901542ce32face50
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 29 21:57:59 2017 -0600

    header-bar: Fix memory leak when changing homepage

    https://bugzilla.gnome.org/show_bug.cgi?id=775641

 src/ephy-header-bar.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 49739184c49efeb1addb6816e5e44aeb6e05a927
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 29 21:53:41 2017 -0600

    embed-prefs: free variable a bit sooner

    This does not fix anything, but it makes the function a bit easier to
    read by clarifying that languages is not used again later on. The code
    is sufficiently confusing that this seems beneficial here.

    https://bugzilla.gnome.org/show_bug.cgi?id=682723

 embed/ephy-embed-prefs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6bae3a12e3544f05947c96b5ca61577016bfa558
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 29 21:51:54 2017 -0600

    embed-prefs: Fix memory leak when setting languages

    This was a tough one. It's a GArray rather than a GPtrArray, which led
    me on a wild goose chase trying to set a clear function for the
    array...
    the clear function is not allowed to actually free memory, since
    GArray
    is not designed for holding pointers.

    This code should probably be refactored further.

    https://bugzilla.gnome.org/show_bug.cgi?id=682723

 embed/ephy-embed-prefs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 75cc218240c502facf6fbb669105174438ff0073
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Mon Jan 30 02:52:56 2017 +0100

    Update Polish translation

 po/pl.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit c2cbb3fae821dfcecba337987460dd63e63b2aed
Author: Stas Solovey <whats_up@tut.by>
Date:   Sun Jan 29 18:02:38 2017 +0000

    Update Russian translation

 po/ru.po | 2485
 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 1216 insertions(+), 1269 deletions(-)

commit d2286fd9115f3d6f2740c841753b864b24134a94
Author: Tomas Popela <tpopela@redhat.com>
Date:   Sun Jan 29 14:21:47 2017 +0100

    Stop emission of the right signal during drag operation

    It's drag-data-received not drag_data_received

 src/ephy-notebook.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8d0c33593e4979cd6bea01b485985b738a74e989
Author: Dušan Kazik <prescott66@gmail.com>
Date:   Sun Jan 29 08:54:28 2017 +0000

    Update Slovak translation

 po/sk.po | 507
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 250 insertions(+), 257 deletions(-)

commit 6302fc63b6da308bb73a5b6ed56c441d615a90e4
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sun Jan 29 04:31:24 2017 +0100

    Remove markup from strings in an ui file

 src/resources/gtk/encoding-dialog.ui | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 223abb3d566dd880b363256cf166f4dccb195110
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sun Jan 29 04:21:28 2017 +0100

    Update Polish translation

 po/pl.po | 3032
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 1432 insertions(+), 1600 deletions(-)

commit 6d5f146240f35c5f678f32101872c243cd636d55
Author: Ting-Wei Lan <lantw@src.gnome.org>
Date:   Tue Nov 15 19:07:01 2016 +0800

    Prefer common_name to name when reading ISO 3166 data

    https://bugzilla.gnome.org/show_bug.cgi?id=774466

 lib/ephy-langs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 46e0e29b8e446407df63f17e47d6b8b344b8bc91
Author: Iulian Radu <iulian.radu67@gmail.com>
Date:   Sat Jan 28 20:20:09 2017 +0200

    Fix conflicting keyboard shortcut

    Bookmarks export uses ctrl + x as a keyboard shortcut, which is also
    used for clipboard cut.

    Replace bookmarks export shortcut it with Ctrl + Shift + x. For
    consistency, also replace bookmarks import with Ctrl + Shift + m.

    https://bugzilla.gnome.org/show_bug.cgi?id=777872

 src/resources/gtk/application-menu.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3e2f75d400c484983aea9708185580faed1f9a30
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sat Jan 28 11:22:20 2017 -0600

    window: Add F6 to key event blacklist

    For whatever reason, the webview always consumes this, breaking our
    keyboard shortcut.

    https://bugzilla.gnome.org/show_bug.cgi?id=777873

 src/ephy-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit a0545a9e59f982b381e2e2329756edd89ac04aed
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Jan 26 08:38:44 2017 -0600

    Revert "Implement search engine manager"

    This reverts commit 2829c4330285ddc50243aaabb3ab89971c540af9.

    Didn't mean to commit this, it's not quite ready yet.

 data/Makefile.am                                   |   6 +-
 data/org.gnome.epiphany.search.engines.gschema.xml |  24 ---
 embed/ephy-embed-shell.c                           |  14 --
 embed/ephy-embed-shell.h                           |   3 +-
 embed/ephy-embed-utils.c                           |  25 +--
 lib/Makefile.am                                    |   2 -
 lib/ephy-search-engine-manager.c                   | 215
 ---------------------
 lib/ephy-search-engine-manager.h                   |  47 -----
 src/prefs-dialog.c                                 | 115 +++++++----
 src/search-provider/ephy-search-provider.c         |  26 +--
 10 files changed, 103 insertions(+), 374 deletions(-)

commit 860573d9b1f655c1e0915863fbd5fa256b0b0412
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Jan 26 08:38:22 2017 -0600

    Revert "search engine dialog"

    This reverts commit 493302357b89d0b46d7d305ca64d9fb0646d6962.

    Didn't mean to commit this, it's not quite ready yet

 lib/ephy-search-engine-manager.c          |   9 +-
 src/Makefile.am                           |   2 -
 src/ephy-search-engine-dialog.c           | 231 ----------------------
 src/ephy-search-engine-dialog.h           |  33 ----
 src/prefs-dialog.c                        |  15 --
 src/resources/epiphany.gresource.xml      |   1 -
 src/resources/gtk/prefs-dialog.ui         |  47 +----
 src/resources/gtk/search-engine-dialog.ui | 311
 ------------------------------
 8 files changed, 11 insertions(+), 638 deletions(-)

commit 54f10fd20e095db84d78567affb6fef078686dc7
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Thu Jan 26 08:29:07 2017 -0600

    session: Ignore blank URLs when saving session

 src/ephy-session.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 493302357b89d0b46d7d305ca64d9fb0646d6962
Author: cedlemo <cedlemo@gmx.com>
Date:   Wed Jan 25 14:47:45 2017 +0100

    search engine dialog

    https://bugzilla.gnome.org/show_bug.cgi?id=776738

 lib/ephy-search-engine-manager.c          |   9 +-
 src/Makefile.am                           |   2 +
 src/ephy-search-engine-dialog.c           | 231 ++++++++++++++++++++++
 src/ephy-search-engine-dialog.h           |  33 ++++
 src/prefs-dialog.c                        |  15 ++
 src/resources/epiphany.gresource.xml      |   1 +
 src/resources/gtk/prefs-dialog.ui         |  47 ++++-
 src/resources/gtk/search-engine-dialog.ui | 311
 ++++++++++++++++++++++++++++++
 8 files changed, 638 insertions(+), 11 deletions(-)

commit 2829c4330285ddc50243aaabb3ab89971c540af9
Author: cedlemo <cedlemo@gmx.com>
Date:   Sat Jan 21 11:09:21 2017 +0100

    Implement search engine manager

    https://bugzilla.gnome.org/show_bug.cgi?id=776738

 data/Makefile.am                                   |   6 +-
 data/org.gnome.epiphany.search.engines.gschema.xml |  24 +++
 embed/ephy-embed-shell.c                           |  14 ++
 embed/ephy-embed-shell.h                           |   3 +-
 embed/ephy-embed-utils.c                           |  25 ++-
 lib/Makefile.am                                    |   2 +
 lib/ephy-search-engine-manager.c                   | 215
 +++++++++++++++++++++
 lib/ephy-search-engine-manager.h                   |  47 +++++
 src/prefs-dialog.c                                 | 115 ++++-------
 src/search-provider/ephy-search-provider.c         |  26 ++-
 10 files changed, 374 insertions(+), 103 deletions(-)

commit d351dc87b39252a5bd7bddb950855fb807f9b342
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Tue Jan 24 08:58:55 2017 +0000

    Update Spanish translation

 po/es.po | 993
 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 560 insertions(+), 433 deletions(-)

commit 0ce6f94ca807d7c29838afbfb6d4f22191d0a33f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 21:47:05 2017 -0600

    bookmarks-popover: use consistent variable names

    It's self in this file.

 src/bookmarks/ephy-bookmarks-popover.c | 34
 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit 06ecf1454d135ec857019d99b1f8e30a0a64c66c
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 21:45:00 2017 -0600

    bookmarks-popover: fix build error

    I was too overconfident when copy/pasting.

    https://bugzilla.gnome.org/show_bug.cgi?id=772131

 src/bookmarks/ephy-bookmarks-popover.c | 2 ++
 1 file changed, 2 insertions(+)

commit 80bfba17a18056900b1b90f9347d6440a0b99fb9
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 21:43:44 2017 -0600

    bookmarks-popover: Fix missing conditional in previous patch

    No reason to mess with the tag detail list box if it's not visible.

    https://bugzilla.gnome.org/show_bug.cgi?id=772131

 src/bookmarks/ephy-bookmarks-popover.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit cd930a9c134f21ed8a8b18340168156f448f45c9
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 21:40:14 2017 -0600

    bookmarks-popover: Restore bookmarks to tag view listbox when needed

    If a bookmark is removed from the tag view listbox while the
    listbox is
    shown, then restored, it never comes back. Fix this.

    https://bugzilla.gnome.org/show_bug.cgi?id=772131

 src/bookmarks/ephy-bookmarks-popover.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 4ab966ebc86c363d260321f4d3b514ac3e3122b5
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 21:16:49 2017 -0600

    bookmarks-popover: Don't disconnect handlers when tag is removed

    We don't connect to anything in create_bookmark_row anymore so
    we don't
    want to disconnect from anything here. Fortunately my mistake here was
    harmless as nowhere except create_bookmark_row ever connected to
    individual bookmarks.

    https://bugzilla.gnome.org/show_bug.cgi?id=772131

 src/bookmarks/ephy-bookmarks-popover.c | 3 ---
 1 file changed, 3 deletions(-)

commit 2fdd7eec77097d236a8e8abb2caff002b81df357
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 21:04:48 2017 -0600

    bookmarks-manager: fix handling of bookmarks import

    When importing bookmarks we don't emit the bookmark-added signal,
    nor do
    we connect to all the signals that we watch for other bookmarks,
    leading
    to the result that the bookmarks popover can get really broken after a
    bookmarks import until the browser is closed and restarted.

    We only uncovered this bug because it so happened that I requested a
    .gvdb file to help reproduce a different issue. Lucky.

    https://bugzilla.gnome.org/show_bug.cgi?id=772131

 src/bookmarks/ephy-bookmarks-manager.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

commit 503155111ae77dd83c62f37ca9fa056bba12ac86
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 20:13:47 2017 -0600

    filters-manager: Fix misuse of GCancellable

    This completely broke the adblocker.

 lib/ephy-filters-manager.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 3bbe7177919be463acdb200aa4aed1e596f96581
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 19:52:09 2017 -0600

    window: allow websites to handle shift+click events

    Currently we allow websites to cancel all mouse events EXCEPT
    shift+click -> download page. This doesn't make much sense and there's
    no technical reason it has to be this way, so handle it the same
    way we
    do other shortcuts instead, when handling navigation policy decisions,
    rather than intercepting the event before it even reaches WebKit.

    https://bugzilla.gnome.org/show_bug.cgi?id=740618

 src/ephy-window.c | 54
 +++++++++++-------------------------------------------
 1 file changed, 11 insertions(+), 43 deletions(-)

commit 85a9539fb24d8cd40ff1991e608f27451bea0df3
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 18:33:27 2017 -0600

    profile-migrator: Delete old states.xml file

 lib/ephy-profile-utils.h                     |  2 +-
 src/profile-migrator/ephy-profile-migrator.c | 26
 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

commit 27593bbd7981665a8d37884017922ff404a13f49
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 18:08:19 2017 -0600

    Store last-closed window size in GSettings

    This way we can restore the window size even if there is no saved
    session state, whether because the restore session feature is
    disabled,
    or simply if the user closed all tabs with Ctrl+W. This should never
    cause window size to be forgotten.

    Note that this is not quite best-practice for dealing with window
    states. That would be
    https://wiki.gnome.org/HowDoI/SaveWindowState. But
    this works, and the recommendation there does not work, so let's do
    this.

    Also note that it's a bit odd that it's the last-closed window that
    determines size. This is what gedit does, and gedit was the first
    app I
    tested, so it seems reasonable. It's only really noticeable if you
    resize one window to some silly size while having another window at
    reasonable size, and most users will never have multiple windows, and
    most users will never disable session restoration anyway, so whatever.

    https://bugzilla.gnome.org/show_bug.cgi?id=777055

 data/org.gnome.epiphany.gschema.xml | 15 +++++++
 src/ephy-session.c                  |  2 +-
 src/ephy-window.c                   | 86
 ++++++++++++++++++++++++++++++++++---
 src/ephy-window.h                   |  4 ++
 4 files changed, 99 insertions(+), 8 deletions(-)

commit 1290e4a71d723e7edce59cb89f53d12a4b3a1a1a
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 09:03:33 2017 -0600

    filters-manager: Fix two memory leaks

    Also, store a string rather than yet another GFile in the
    AdblockFilterRetrieveData struct.

    https://bugzilla.gnome.org/show_bug.cgi?id=776286

 lib/ephy-filters-manager.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

commit e9ad3db75cfd0c210943e11db6c5e38380a71cb5
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 23 08:02:57 2017 -0600

    filters-manager: Delete adblock files only if adblocker is enabled

    This was requested by Carlos to avoid extra downloads when toggling
    the
    setting.

    https://bugzilla.gnome.org/show_bug.cgi?id=776286

 lib/ephy-filters-manager.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

commit 9c23cd821d869a36dc2b9bf3b3ebef5d8cc6830a
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 23:55:57 2017 -0600

    Move adblocker filter updating to new EphyFiltersManager class

    There is now way too much adblock code in EphyEmbedShell. Move it to a
    new file.

 embed/ephy-embed-shell.c   | 399
 ++++++++-------------------------------------
 lib/Makefile.am            |   2 +
 lib/ephy-filters-manager.c | 388
 +++++++++++++++++++++++++++++++++++++++++++
 lib/ephy-filters-manager.h |  34 ++++
 4 files changed, 495 insertions(+), 328 deletions(-)

commit a66cc9c7435f8282759b8bb5faeb5cb715c63b23
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 22:55:57 2017 -0600

    embed-shell: avoid problems when toggling adblock settings

 embed/ephy-embed-shell.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 2bcb8588532f2a9869ebd265270e3735469917da
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 22:46:53 2017 -0600

    prefs-dialog: Move do not track setting to general tab

    Its is now dependent on the enable-adblock setting, because the minor
    anti-tracking features are not very useful without the adblocker.

 src/prefs-dialog.c                | 34 +++++++++++++++++++------------
 src/resources/gtk/prefs-dialog.ui | 42
 +++++++++++----------------------------
 2 files changed, 33 insertions(+), 43 deletions(-)

commit c857f5bc1a7e2cae4c1f2f020fa4a47a1d170a2d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 22:29:48 2017 -0600

    prefs-dialog: Rename privacy panel to stored data

    We have this awkward dependency between the enable adblock setting and
    the strengthened DNT setting. They really have to be displayed on the
    same page. And we don't want to hide adblock on the privacy page, so
    the DNT setting has to move to the general page. And it'd be absurd to
    have a privacy page without DNT, so rename it.

 src/prefs-dialog.c                | 8 ++++----
 src/resources/gtk/prefs-dialog.ui | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

commit b360172a7d53bc54607c766918f508dc12ad698d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 22:23:42 2017 -0600

    Only download adblock filters if adblocker is actually enabled

    https://bugzilla.gnome.org/show_bug.cgi?id=776286

 embed/ephy-embed-shell.c              | 19 +++++++++++++++++--
 embed/web-extension/ephy-uri-tester.c | 28 ++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 6 deletions(-)

commit c7e665ea6416e5c9745e4e67414051f02693e8c6
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 21:43:41 2017 -0600

    Reload adblock filters when setting changes

    This requires downloading missing filters in the UI process, flushing
    the adblock filters in each web process, and reloading them.

 embed/ephy-embed-shell.c                      | 16 +++++-
 embed/web-extension/ephy-uri-tester.c         | 77
 ++++++++++++++++++++-------
 embed/web-extension/ephy-web-extension-main.c |  1 +
 3 files changed, 73 insertions(+), 21 deletions(-)

commit 291bc33d1c6d296ac4f2f6e8e1eb25ffac09c97c
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 20:51:18 2017 -0600

    web-extension: Clean up more during shutdown

 embed/web-extension/ephy-web-extension-main.c | 3 +++
 1 file changed, 3 insertions(+)

commit 2408bcfd8fe0663266512b2d5f1a2e809a775c8f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 17:54:34 2017 -0600

    embed-shell: Delete old unused adblock filter files

 embed/ephy-embed-shell.c | 65
 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

commit 2ec4cef600d57c79d8bacd27ecb6cdb24924fa4f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 17:09:06 2017 -0600

    embed-shell: Improve error message when downloading filters fails

    Let's print the URL that we failed to download.

 embed/ephy-embed-shell.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 009216dc3287b65eb0e7ab82c8560c0dbbb6e830
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 17:06:50 2017 -0600

    Enable EasyPrivacy filtering by default

    For now, you can disable or enable the filtering using the existing
    DNT
    setting, which has been renamed to reflect that it controls more than
    just DNT headers. Note that the underlying gsetting is different,
    though.

 data/org.gnome.epiphany.gschema.xml |  4 ++--
 lib/ephy-uri-tester-shared.h        |  1 +
 src/prefs-dialog.c                  | 24 ++++++++++++++++++++++++
 src/resources/gtk/prefs-dialog.ui   |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

commit b8811db568f939a6d7cb07e6e4dc7d72ec907069
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 17:06:20 2017 -0600

    Add helpers for adding and removing items from a strv

 lib/ephy-string.c | 59
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/ephy-string.h |  5 +++++
 2 files changed, 64 insertions(+)

commit d2fc9b8016297dea7eb39ac181a13ce3037c5205
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 12:37:20 2017 -0600

    Get default adblock filters straight from EasyList

    Instead of using the Adblock Plus version of the file, since we are
    going to be exposing more filters from EasyList

 data/org.gnome.epiphany.gschema.xml | 2 +-
 lib/ephy-uri-tester-shared.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 4ffc3167f66190904911adca1e71ab018e7727db
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 12:48:27 2017 -0600

    bookmarks-popover: Code style fix

 src/bookmarks/ephy-bookmarks-popover.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit c431e67f7893c6675f227e151393865860e63d4f
Author: Dušan Kazik <prescott66@gmail.com>
Date:   Sun Jan 22 20:38:11 2017 +0000

    Update Slovak translation

 po/sk.po | 2922
 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1625 insertions(+), 1297 deletions(-)

commit 6784843ea48a4493a841fe40c96a63f6cb513d26
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 12:19:25 2017 -0600

    add-bookmark-popover: Always create new bookmarks grid when shown

    Otherwise it could be stale and lead to crashes.

    https://bugzilla.gnome.org/show_bug.cgi?id=777615

 src/bookmarks/ephy-add-bookmark-popover.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

commit 2a2a3a5c7be47bd78906c3d397b354fd2d6be67f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 11:46:34 2017 -0600

    Bookmarks popover should only connect to tag changes once per bookmark

    Currently, the EphyBookmarksPopover connects to tag added/removed
    signals on each EphyBookmark once for each EphyBookmarksRow that is
    created for this bookmark. Usually that is exactly two, once for
    the All
    view and once for the Tags view, but it can be three during an
    intermediate state when adding a tag when the tag has just been
    added to
    the Tags subview and not yet removed from the Tags main view. At any
    rate, it should not be connected two or three times, it should be
    connected once. So have EphyBookmarksManager emit these notifications
    and get them from it instead, irrespective of the number of
    EphyBookmarksRows that have been created.

    https://bugzilla.gnome.org/show_bug.cgi?id=772131

 src/bookmarks/ephy-bookmarks-manager.c | 45
 ++++++++++++++++++++++++++++++++++
 src/bookmarks/ephy-bookmarks-popover.c | 31 +++++++++++------------
 2 files changed, 61 insertions(+), 15 deletions(-)

commit bb07e27a5c88f19ac73bc24023461434e3465479
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 11:20:20 2017 -0600

    bookmark-properties-grid: Fix duplicate tag creation

    Here we're just trying to add a style class to a widget, but it
    accidentally causes the new tag to be created a second time,
    leading to
    serious breakage in the bookmarks popover.

 src/bookmarks/ephy-bookmark-properties-grid.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 3e4768e292745685963e37ed57ff7963dc89359f
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 11:08:40 2017 -0600

    bookmark: include tag name in tag-added signal

    Even though it's not currently used, it's pretty strange to have a
    tag-added signal that doesn't indicate which tag was added. This
    changes
    the signal to parallel tag-removed.

 src/bookmarks/ephy-bookmark.c          | 5 +++--
 src/bookmarks/ephy-bookmarks-popover.c | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 5eb43a069eb3c84c59db1aaf6cb07e8cbead6e7e
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Sun Jan 22 10:29:53 2017 -0600

    header-bar: Make stop button work again

    https://bugzilla.gnome.org/show_bug.cgi?id=777585

 src/ephy-header-bar.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 3729c5dc2dce2f41e089f0751040f884f43f3a5c
Author: Jordi Mas <jmas@softcatala.org>
Date:   Sun Jan 22 09:03:49 2017 +0100

    Update Catalan translation

 po/ca.po | 3638
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1960 insertions(+), 1678 deletions(-)

commit 50b521826568965c6bbb4b4816c3a6037f87b344
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Fri Jan 20 23:43:18 2017 -0600

    Improve unsubmitted form warning text

 src/ephy-window.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 92e98991e7009b7ef9ea8aa7423429650ebb5275
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Fri Jan 20 20:03:06 2017 -0600

    Fix the passwords dialog

 src/passwords-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 294a457c31e93b7cbe4729a28093d5d9cfa2f440
Author: Fabio Tomat <f.t.public@gmail.com>
Date:   Fri Jan 20 04:10:30 2017 +0000

    Update Friulian translation

 po/fur.po | 792
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 428 insertions(+), 364 deletions(-)

commit f77c643a580fd59793ab1b96a95f38f5716eec6f
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Jan 18 15:11:03 2017 +0100

    Bring back the support for multiple adblock filter files

 embed/ephy-embed-shell.c              | 22 +++++++++-----
 embed/web-extension/ephy-uri-tester.c | 57
 +++++++++++++++++++++--------------
 lib/ephy-uri-tester-shared.c          | 13 ++------
 lib/ephy-uri-tester-shared.h          |  3 +-
 4 files changed, 54 insertions(+), 41 deletions(-)

commit 10cf854c6d8f8a1821245e9094ecfb7036f47c39
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Wed Jan 18 13:36:15 2017 +0100

    Move the adblock filter list to gsettings

    It used to be a file in the adblock data dir. Now that adblock dir is
    shared, it's much better to store the filters in gsettings. It
    will also
    make easier to handle in case we eventually add a UI to manage
    filters.
    For now it always uses the first filter in the list, since the support
    for multiple filters was recently removed.
    The profile migrator now removes the adblock folder from non-default
    profile dirs and reads the filters.list file from the default profile
    dir to set its contents in gsettings.

 data/org.gnome.epiphany.gschema.xml          |  7 ++-
 embed/ephy-embed-shell.c                     |  5 +-
 lib/ephy-prefs.h                             |  1 +
 lib/ephy-profile-utils.h                     |  2 +-
 lib/ephy-uri-tester-shared.c                 | 10 +++-
 lib/ephy-uri-tester-shared.h                 |  2 +-
 src/profile-migrator/ephy-profile-migrator.c | 83
 ++++++++++++++++++++++++++++
 7 files changed, 102 insertions(+), 8 deletions(-)

commit 7ee2b9973cb1dfe55872336c819588ed361d9e7a
Author: Carlos Garcia Campos <carlosgc@gnome.org>
Date:   Wed Jan 18 17:15:20 2017 +0100

    Revert "Dramatically shrink the location entry"

    This reverts commit cce7462b78b05fbf1a2cf960f8b4ef2d1cc86b07.
    It made the location entry so small that is quite annoying to use now.

 lib/widgets/ephy-location-entry.c |  4 ++--
 src/ephy-header-bar.c             | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

commit d5b1040684a817728ac76575aca036eb7f78ed96
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 21:00:11 2017 -0600

    Update POTFILES.in, now without stray debugging

 po/POTFILES.in | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 8b1e262e3ce6111c8e59ef4b13731c0021a327e5
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 20:59:50 2017 -0600

    Revert "Update POTFILES.in"

    This reverts commit d7fe992423337fc842080520f9f14fc6212276a6.

    Committed careless debugging

 po/POTFILES.in                            | 20 ++++++++++----------
 src/bookmarks/ephy-bookmarks-list-model.c |  9 ++-------
 2 files changed, 12 insertions(+), 17 deletions(-)

commit 23a9332cf172a5bd0ffd057b63c3e55836ce047d
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 20:33:25 2017 -0600

    bookmarks-manager: Fix bookmark removal not working properly

    The list model never removes the bookmark right away, it's not being
    removed until the second time this signal is emitted after the
    removal,
    because we are performing the operations in the wrong order. This
    signal
    is named "bookmark-removed", not "will-remove-bookmark", so actually
    remove it first before emitting it.

 src/bookmarks/ephy-bookmarks-manager.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit d7fe992423337fc842080520f9f14fc6212276a6
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 20:27:27 2017 -0600

    Update POTFILES.in

    Why is it impossible to remember to do this? It's like a curse....

 po/POTFILES.in                            | 20 ++++++++++----------
 src/bookmarks/ephy-bookmarks-list-model.c |  9 +++++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

commit 082750d1771665b6b3e92a9966815a52bc057e7e
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 20:25:37 2017 -0600

    Revert "Remove unused libnotify dependency"

    This reverts commit 458d1b66d3a853e13328e58fa9d3672e6ea8272c.

    Clean build is failing, not sure why....

 configure.ac    | 1 +
 src/Makefile.am | 4 ++++
 src/ephy-main.c | 2 ++
 3 files changed, 7 insertions(+)

commit 458d1b66d3a853e13328e58fa9d3672e6ea8272c
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 20:05:18 2017 -0600

    Remove unused libnotify dependency

    We initialize libnotify but never use it for anything... bye.

    (It's still used in WebKit, but Epiphany doesn't know about that.)

 configure.ac    | 1 -
 src/Makefile.am | 4 ----
 src/ephy-main.c | 2 --
 3 files changed, 7 deletions(-)

commit 9b06cd3a02ec2572f200abdc81d059d1588491a8
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 20:00:17 2017 -0600

    bookmarks-popover: Add an empty state

    Otherwise it looks horrible in private profile mode. Which admittedly
    nobody uses. But maybe somebody will delete all the default bookmarks
    and then see this handiwork.

 src/bookmarks/ephy-bookmarks-popover.c |  9 +++++++
 src/resources/gtk/bookmarks-popover.ui | 43
 ++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

commit 17ac264643b4ea3f1ad15e60632e40be197b32cb
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 19:25:48 2017 -0600

    Rename EphyHistoryWindow to EphyHistoryDialog

 TODO                                               |   1 -
 src/Makefile.am                                    |   4 +-
 ...ephy-history-window.c => ephy-history-dialog.c} | 106
 ++++++++++-----------
 ...ephy-history-window.h => ephy-history-dialog.h} |   6 +-
 src/ephy-shell.c                                   |  20 ++--
 src/ephy-shell.h                                   |   2 +-
 src/resources/gtk/history-dialog.ui                |   2 +-
 src/window-commands.c                              |  12 +--
 8 files changed, 76 insertions(+), 77 deletions(-)

commit 051174744b2331413cd128648d4d52505f28596c
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:   Mon Jan 16 19:19:20 2017 -0600

    Move all UI files under src/resources/gtk

 src/Makefile.am                                    | 63
 +++++++++++-----------
 src/clear-data-dialog.c                            |  2 +-
 src/cookies-dialog.c                               |  2 +-
 src/ephy-encoding-dialog.c                         |  2 +-
 src/ephy-encoding-row.c                            |  2 +-
 src/ephy-history-window.c                          |  2 +-
 src/ephy-shell.c                                   |  6 +--
 src/prefs-dialog.c                                 |  4 +-
 src/resources/epiphany.gresource.xml               | 20 +++----
 .../application-menu.ui}                           |  0
 src/resources/{ => gtk}/clear-data-dialog.ui       |  0
 src/resources/{ => gtk}/cookies-dialog.ui          |  0
 src/resources/{ => gtk}/encoding-dialog.ui         |  0
 src/resources/{ => gtk}/encoding-row.ui            |  0
 src/resources/{ => gtk}/history-dialog.ui          |  0
 src/resources/{ => gtk}/passwords-dialog.ui        |  0
 src/resources/{ => gtk}/prefs-dialog.ui            |  0
 src/resources/{ => gtk}/prefs-lang-dialog.ui       |  0
 src/resources/{ => gtk}/shortcuts-dialog.ui        |  0
 src/window-commands.c                              |  2 +-
 20 files changed, 50 insertions(+), 55 deletions(-)