subscriptions.xml - Issue 6088024630755328: issue 1526 - Implement new options page design for Chrome/Opera/Safari

Side by Side Diff: subscriptions.xml

Issue 6088024630755328: issue 1526 - Implement new options page design for Chrome/Opera/Safari (Closed)

Patch Set: Created March 12, 2015, 2:01 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
(Empty)
	1 <?xml version="1.0"?>
	Felix Dahlke 2015/06/03 16:20:43 So the purpose of bundling this file here is so th So the purpose of bundling this file here is so that we temporarily don't have to change the format of the canonical one? Because this file is already bundled by the extension, and used to select the default subscriptions, so duplicating it here is not a good idea. I'm OK with using a bundled file temporarily, but I'd like: 1. A follow-up issue for getting these changes into the real subscriptions.xml file and using that one. 2. A comment in this copy of the file here, that explains why it's bundled, pointing to that issue. saroyanm 2015/06/09 15:29:13 But do we want to have the recommendation availabl Show quoted text On 2015/06/03 16:20:43, Felix H. Dahlke wrote: > So the purpose of bundling this file here is so that we temporarily don't have > to change the format of the canonical one? > > Because this file is already bundled by the extension, and used to select the > default subscriptions, so duplicating it here is not a good idea. > > I'm OK with using a bundled file temporarily, but I'd like: > > 1. A follow-up issue for getting these changes into the real subscriptions.xml > file and using that one. > 2. A comment in this copy of the file here, that explains why it's bundled, > pointing to that issue. But do we want to have the recommendation available in old interface ? Please note if we will replace the existing subscriptions.xml from adblockplus repository it will also add recommendation to the list of suggested subscriptions. I see two possibility: * We can go with your suggestion and be ready that users will get recommendations before they will switch to new options UI (for example in FF). * have subscription.xml in adblockplusui repository and use metadata of builds to switch between subscription.xmls for each build. Separating old and new subscription.xml maybe can be handy ? In case of 1-st I think this can be done in current ticket -> https://issues.adblockplus.org/ticket/1422 Felix Dahlke 2015/06/12 12:30:47 What do you mean by recommendation? "popular"? I b Show quoted text On 2015/06/09 15:29:13, saroyanm wrote: > On 2015/06/03 16:20:43, Felix H. Dahlke wrote: > > So the purpose of bundling this file here is so that we temporarily don't have > > to change the format of the canonical one? > > > > Because this file is already bundled by the extension, and used to select the > > default subscriptions, so duplicating it here is not a good idea. > > > > I'm OK with using a bundled file temporarily, but I'd like: > > > > 1. A follow-up issue for getting these changes into the real subscriptions.xml > > file and using that one. > > 2. A comment in this copy of the file here, that explains why it's bundled, > > pointing to that issue. > > But do we want to have the recommendation available in old interface ? Please > note if we will replace the existing subscriptions.xml from adblockplus > repository it will also add recommendation to the list of suggested > subscriptions. I see two possibility: > * We can go with your suggestion and be ready that users will get > recommendations before they will switch to new options UI (for example in FF). > * have subscription.xml in adblockplusui repository and use metadata of builds > to switch between subscription.xmls for each build. > Separating old and new subscription.xml maybe can be handy ? > > In case of 1-st I think this can be done in current ticket -> > https://issues.adblockplus.org/ticket/1422 What do you mean by recommendation? "popular"? I believe I also commented on that: The very fact that the subscription is in subscriptions.xml makes it "popluar", doesn't it? So that attribute is not necessary. If that distinction really is necessary, we want to be able to make the same distinction on other platforms. Note that subscriptions.xml is currently both bundled with the extension and fetched from our servers (as subscriptions2.xml). #1422 appears to be about actually using subscriptions2.xml from the server in ABP for Firefox instead of the bundled subscriptions.xml. ABP for Firefox uses both for different things, for reasons I have not yet been able to get behind. Do we really want to add a third subscriptions.xml now? I rather believe we need to: 1. Get all the subscription meta data and the canonical list of recommended/popular subscriptions into subscriptions2.xml on the server. 2. Bundle the latest version of subscriptions2.xml during the build, and update it regularly from the extension. But for the sake of progress, I'm fine with keeping subscriptions.xml here for the time being, as long as there's a comment and a follow-up issue for using the same subscriptions.xml we use for the language selection. saroyanm 2015/06/12 13:12:00 Yes I mean popular. Show quoted text On 2015/06/12 12:30:47, Felix H. Dahlke wrote: > On 2015/06/09 15:29:13, saroyanm wrote: > > On 2015/06/03 16:20:43, Felix H. Dahlke wrote: > > > So the purpose of bundling this file here is so that we temporarily don't > have > > > to change the format of the canonical one? > > > > > > Because this file is already bundled by the extension, and used to select > the > > > default subscriptions, so duplicating it here is not a good idea. > > > > > > I'm OK with using a bundled file temporarily, but I'd like: > > > > > > 1. A follow-up issue for getting these changes into the real > subscriptions.xml > > > file and using that one. > > > 2. A comment in this copy of the file here, that explains why it's bundled, > > > pointing to that issue. > > > > But do we want to have the recommendation available in old interface ? Please > > note if we will replace the existing subscriptions.xml from adblockplus > > repository it will also add recommendation to the list of suggested > > subscriptions. I see two possibility: > > * We can go with your suggestion and be ready that users will get > > recommendations before they will switch to new options UI (for example in FF). > > * have subscription.xml in adblockplusui repository and use metadata of builds > > to switch between subscription.xmls for each build. > > Separating old and new subscription.xml maybe can be handy ? > > > > In case of 1-st I think this can be done in current ticket -> > > https://issues.adblockplus.org/ticket/1422 > > What do you mean by recommendation? "popular"? Yes I mean popular. Show quoted text > that: The very fact that the subscription is in subscriptions.xml makes it > "popluar", doesn't it? So that attribute is not necessary. I'm using this attribute to mark them as popular in the interface, please note that when we are loading subscription that are not listed as popular in the XML they doesn't have popular mark next to them. Show quoted text > If that distinction really is necessary, we want to be able to make the same distinction on other > platforms. The thing is that we will have Facebook Annoyance block listed as well, we are not yet sure whether we want it to be listed or not, so I'll suggest to deal with subscription.xml in separate ticket as you suggested. Show quoted text > Note that subscriptions.xml is currently both bundled with the extension and > fetched from our servers (as subscriptions2.xml). > > #1422 appears to be about actually using subscriptions2.xml from the server in > ABP for Firefox instead of the bundled subscriptions.xml. ABP for Firefox uses > both for different things, for reasons I have not yet been able to get behind. Well #1422 marked as blocking for #1526, so that why I thought that they are connected to each other. Show quoted text > Do we really want to add a third subscriptions.xml now? I rather believe we need > to: > > 1. Get all the subscription meta data and the canonical list of > recommended/popular subscriptions into subscriptions2.xml on the server. > 2. Bundle the latest version of subscriptions2.xml during the build, and update > it regularly from the extension. Isn't it same what #1422 suggest ? It's missing the part of updating subscriptions2.xml with recommended/popular, also subscriptions2.xml contain subscriptions like Xfiles which we don't want to list in recommended subscriptions I think. Show quoted text > But for the sake of progress, I'm fine with keeping subscriptions.xml here for > the time being, as long as there's a comment and a follow-up issue for using the > same subscriptions.xml we use for the language selection. Sure I'll update the XML with the comment I just want to understand how we are trying to deal with this file, for proper comment and follow up ticket.
	2

	3 <!--

	4 - This file is part of the Adblock Plus web scripts,

	5 - Copyright (C) 2006-2015 Eyeo GmbH

	6 -

	7 - Adblock Plus is free software: you can redistribute it and/or modify

	8 - it under the terms of the GNU General Public License version 3 as

	9 - published by the Free Software Foundation.

	10 -

	11 - Adblock Plus is distributed in the hope that it will be useful,

	12 - but WITHOUT ANY WARRANTY; without even the implied warranty of

	13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

	14 - GNU General Public License for more details.

	15 -

	16 - You should have received a copy of the GNU General Public License

	17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

	18 -->

	19

	20 <subscriptions>

	21 <subscription title="EasyList"

	22 specialization="English"

	23 url="https://easylist-downloads.adblockplus.org/easylist.txt"

	24 homepage="https://easylist.adblockplus.org/"

	25 prefixes="en"

	26 author="fanboy, MonztA, Famlam, Khrin"/>

	27 <subscription title="ABPindo+EasyList"

	28 specialization="Bahasa Indonesia"

	29 url="https://easylist-downloads.adblockplus.org/abpindo+easylist .txt"

	30 homepage="http://abpindo.blogspot.com/"

	31 prefixes="id"

	32 author="heradhis"/>

	33 <subscription title="Bulgarian list+EasyList"

	34 specialization="български"

	35 url="https://easylist-downloads.adblockplus.org/bulgarian_list+e asylist.txt"

	36 homepage="http://stanev.org/abp/"

	37 prefixes="bg"

	38 author="Александър Станев"/>

	39 <subscription title="EasyList China+EasyList"

	40 specialization="中文"

	41 url="https://easylist-downloads.adblockplus.org/easylistchina+ea sylist.txt"

	42 homepage="http://abpchina.org/forum/"

	43 prefixes="zh"

	44 author="John, Li, Jiefei"/>

	45 <subscription title="EasyList Czech and Slovak+EasyList"

	46 specialization="čeština, slovenčina"

	47 url="https://easylist-downloads.adblockplus.org/easylistczechslo vak+easylist.txt"

	48 homepage="http://adblock.sk/"

	49 prefixes="cs,sk"

	50 author="tomasko126"/>

	51 <subscription title="EasyList Dutch+EasyList"

	52 specialization="Nederlands"

	53 url="https://easylist-downloads.adblockplus.org/easylistdutch+ea sylist.txt"

	54 homepage="https://easylist.adblockplus.org/"

	55 prefixes="nl"

	56 author="Famlam"/>

	57 <subscription title="EasyList Germany+EasyList"

	58 specialization="Deutsch"

	59 url="https://easylist-downloads.adblockplus.org/easylistgermany+ easylist.txt"

	60 homepage="https://easylist.adblockplus.org/"

	61 prefixes="de"

	62 author="MonztA, Famlam"/>

	63 <subscription title="EasyList Hebrew+EasyList"

	64 specialization="עברית"

	65 url="https://easylist-downloads.adblockplus.org/israellist+easyl ist.txt"

	66 homepage="https://github.com/AdBlockPlusIsrael/EasyListHebrew"

	67 prefixes="he"

	68 author="BsT"/>

	69 <subscription title="EasyList Italy+EasyList"

	70 specialization="italiano"

	71 url="https://easylist-downloads.adblockplus.org/easylistitaly+ea sylist.txt"

	72 homepage="https://easylist.adblockplus.org/"

	73 prefixes="it"

	74 author="Khrin"/>

	75 <subscription title="EasyList Lithuania+EasyList"

	76 specialization="lietuvių kalba"

	77 url="https://easylist-downloads.adblockplus.org/easylistlithuani a+easylist.txt"

	78 homepage="http://margevicius.lt/"

	79 prefixes="lt"

	80 author="Algimantas Margevičius"/>

	81 <subscription title="Latvian List+EasyList"

	82 specialization="latviešu valoda"

	83 url="https://easylist-downloads.adblockplus.org/latvianlist+easy list.txt"

	84 homepage="http://latvian-list.site11.com/"

	85 prefixes="lv"

	86 author="anonymous74100"/>

	87 <subscription title="Liste AR+Liste FR+EasyList"

	88 specialization="العربية"

	89 url="https://easylist-downloads.adblockplus.org/liste_ar+liste_f r+easylist.txt"

	90 homepage="https://code.google.com/p/liste-ar-adblock/"

	91 prefixes="ar"

	92 author="smed79"/>

	93 <subscription title="Liste FR+EasyList"

	94 specialization="français"

	95 url="https://easylist-downloads.adblockplus.org/liste_fr+easylis t.txt"

	96 homepage="http://adblock-listefr.com/"

	97 prefixes="fr"

	98 author="Lian, Crits, smed79"/>

	99 <subscription title="ROList+EasyList"

	100 specialization="românesc"

	101 url="https://easylist-downloads.adblockplus.org/rolist+easylist. txt"

	102 homepage="http://www.zoso.ro/rolist"

	103 prefixes="ro"

	104 author="MenetZ, Zoso"/>

	105 <subscription title="RuAdList+EasyList"

	106 specialization="русский, українська"

	107 url="https://easylist-downloads.adblockplus.org/ruadlist+easylis t.txt"

	108 homepage="https://code.google.com/p/ruadlist/"

	109 prefixes="ru,uk"

	110 author="Lain_13"/>

	111 <subscription title="EasyPrivacy"

	112 specialization="Disable Tracking"

	113 url="https://easylist-downloads.adblockplus.org/easyprivacy.txt"

	114 homepage="https://easylist.adblockplus.org/"

	115 popular="true"/>

	116 <subscription title="malware"

	117 specialization="Disable Malware Websites"

	118 url="https://easylist-downloads.adblockplus.org/malwaredomains_f ull.txt"

	119 homepage="http://malwaredomains.com/?page_id=2"

	120 popular="true"/>

	121 <subscription title="fanboy"

	122 specialization="Disable Social media buttons"

	123 url="https://easylist-downloads.adblockplus.org/fanboy-social.tx t"

	124 homepage="https://easylist.adblockplus.org/"

	125 popular="true"/>

	126 <subscription title="facebook annoyances blocker"

	127 specialization="Facebook annoyance"

	128 url="https://easylist-downloads.adblockplus.org/fb_annoyances_fu ll.txt"

	129 homepage="http://facebook.adblockplus.me/"

	130 popular="true"/>

	131 <subscription title="Pure Video Experience"

	132 specialization="Youtube annoyance"

	133 url="https://easylist-downloads.adblockplus.org/yt_annoyances_fu ll.txt"

	134 homepage="http://youtube.adblockplus.me/"

	135 popular="true"/>

	136 <subscription title="Prebake - Filter Obtrusive Cookie Notices"

	137 specialization="Prebake"

	138 url="https://raw.githubusercontent.com/liamja/Prebake/master/obt rusive.txt"

	139 homepage="http://liamja.github.io/Prebake/"

	140 popular="true"/>

	141 <subscription title="Spam404"

	142 specialization="Spam404"

	143 url="https://spam404bl.com/spam404scamlist.txt"

	144 homepage="http://www.spam404.com/"

	145 popular="true"/>

	146 </subscriptions>

OLD	NEW

« skin/options.css ('K') | « skin/options-sprite.png ('k') | no next file » | no next file with comments »