lp:~midori/midori/addingDefaultsAndFilters

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:midori at revision 6594

Cris Dywan: Approve on 2014-03-10

Diff: 1852 lines (+1095/-298)

14 files modified

data/adblock.list (+1/-0)
data/adblock/blocked.svg (+46/-0)
data/adblock/disabled.svg (+46/-0)
data/adblock/enabled.svg (+80/-0)
extensions/adblock/config.vala (+78/-39)
extensions/adblock/extension.vala (+421/-210)
extensions/adblock/subscriptions.vala (+48/-10)
extensions/adblock/updater.vala (+47/-31)
extensions/adblock/widgets.vala (+310/-0)
katze/midori-paths.vala (+12/-4)
midori/midori-app.c (+1/-1)
midori/midori-browser.c (+1/-1)
midori/midori-download.vala (+3/-2)
po/POTFILES.in (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #768568: Add Adblock toggle to statusbar	High	Fix Released
Bug #1286772: [adblock2] no way to add a filter list	Critical	Fix Released

Link a bug report

Related blueprints

6610. By Paweł Forysiuk on 2014-03-10

Split getting domains for uri into a separate function

6609. By Paweł Forysiuk on 2014-03-10

Return if there is no blocked element to hide

6608. By Paweł Forysiuk on 2014-03-10

Split preparing hider css into helper functions

6607. By Paweł Forysiuk on 2014-03-09

Separate subscription parsing helper from subscription manager

6606. By Paweł Forysiuk on 2014-03-09

Parse subscription uris with a helper function

6605. By Cris Dywan on 2014-03-09

preset_filename needs to fallback to build folder

6604. By Paweł Forysiuk on 2014-03-09

Extract widgets into separate file

6603. By Cris Dywan on 2014-03-06

Merge lp:midori

6602. By Cris Dywan on 2014-03-06

Consider a subscription valid if anything at all gets picked up

There's no requirement to have any update or expiry header.

6601. By Cris Dywan on 2014-03-06

Fix and unit test writing of disabled URLs with dashes