Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: subscriptions.xml

Issue 6088024630755328: issue 1526 - Implement new options page design for Chrome/Opera/Safari (Closed)
Left Patch Set: Created Jan. 21, 2015, 6:10 p.m.
Right Patch Set: Comment about solution being temprorary is added to subscriptions.xml Created June 13, 2015, 12:59 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « skin/options-sprite.png ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 2
3 <!-- 3 <!--
4 - This file is part of the Adblock Plus web scripts, 4 - This file is part of the Adblock Plus web scripts,
5 - Copyright (C) 2006-2014 Eyeo GmbH 5 - Copyright (C) 2006-2015 Eyeo GmbH
6 - 6 -
7 - Adblock Plus is free software: you can redistribute it and/or modify 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 8 - it under the terms of the GNU General Public License version 3 as
9 - published by the Free Software Foundation. 9 - published by the Free Software Foundation.
10 - 10 -
11 - Adblock Plus is distributed in the hope that it will be useful, 11 - Adblock Plus is distributed in the hope that it will be useful,
12 - but WITHOUT ANY WARRANTY; without even the implied warranty of 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of
13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 - GNU General Public License for more details. 14 - GNU General Public License for more details.
15 - 15 -
16 - You should have received a copy of the GNU General Public License 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/>. 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
18 -->
19
20 <!--
21 Bundling current file in adblockplusui repository is just a temprorary
22 solution until #2677 is fixed
18 --> 23 -->
19 24
20 <subscriptions> 25 <subscriptions>
21 <subscription title="EasyList" 26 <subscription title="EasyList"
22 specialization="English" 27 specialization="English"
23 url="https://easylist-downloads.adblockplus.org/easylist.txt" 28 url="https://easylist-downloads.adblockplus.org/easylist.txt"
24 homepage="https://easylist.adblockplus.org/" 29 homepage="https://easylist.adblockplus.org/"
25 prefixes="en" 30 prefixes="en"
26 author="fanboy, MonztA, Famlam, Khrin"/> 31 author="fanboy, MonztA, Famlam, Khrin"/>
27 <subscription title="ABPindo+EasyList" 32 <subscription title="ABPindo+EasyList"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 popular="true"/> 120 popular="true"/>
116 <subscription title="malware" 121 <subscription title="malware"
117 specialization="Disable Malware Websites" 122 specialization="Disable Malware Websites"
118 url="https://easylist-downloads.adblockplus.org/malwaredomains_f ull.txt" 123 url="https://easylist-downloads.adblockplus.org/malwaredomains_f ull.txt"
119 homepage="http://malwaredomains.com/?page_id=2" 124 homepage="http://malwaredomains.com/?page_id=2"
120 popular="true"/> 125 popular="true"/>
121 <subscription title="fanboy" 126 <subscription title="fanboy"
122 specialization="Disable Social media buttons" 127 specialization="Disable Social media buttons"
123 url="https://easylist-downloads.adblockplus.org/fanboy-social.tx t" 128 url="https://easylist-downloads.adblockplus.org/fanboy-social.tx t"
124 homepage="https://easylist.adblockplus.org/" 129 homepage="https://easylist.adblockplus.org/"
125 popular="false"/> 130 popular="true"/>
126 <subscription title="facebook annoyances blocker" 131 <subscription title="facebook annoyances blocker"
127 specialization="Facebook annoyance" 132 specialization="Facebook annoyance"
128 url="https://easylist-downloads.adblockplus.org/fb_annoyances_fu ll.txt" 133 url="https://easylist-downloads.adblockplus.org/fb_annoyances_fu ll.txt"
129 homepage="http://facebook.adblockplus.me/" 134 homepage="http://facebook.adblockplus.me/"
130 popular="false"/> 135 popular="true"/>
131 <subscription title="Pure Video Experience" 136 <subscription title="Pure Video Experience"
132 specialization="Youtube annoyance" 137 specialization="Youtube annoyance"
133 url="https://easylist-downloads.adblockplus.org/yt_annoyances_fu ll.txt" 138 url="https://easylist-downloads.adblockplus.org/yt_annoyances_fu ll.txt"
134 homepage="http://youtube.adblockplus.me/" 139 homepage="http://youtube.adblockplus.me/"
135 popular="false"/> 140 popular="true"/>
136 <subscription title="Prebake - Filter Obtrusive Cookie Notices" 141 <subscription title="Prebake - Filter Obtrusive Cookie Notices"
137 specialization="Prebake" 142 specialization="Prebake"
138 url="https://raw.githubusercontent.com/liamja/Prebake/master/obt rusive.txt" 143 url="https://raw.githubusercontent.com/liamja/Prebake/master/obt rusive.txt"
139 homepage="http://liamja.github.io/Prebake/" 144 homepage="http://liamja.github.io/Prebake/"
140 popular="false"/> 145 popular="true"/>
141 <subscription title="Spam404" 146 <subscription title="Spam404"
142 specialization="Spam404" 147 specialization="Spam404"
143 url="https://spam404bl.com/spam404scamlist.txt" 148 url="https://spam404bl.com/spam404scamlist.txt"
144 homepage="http://www.spam404.com/" 149 homepage="http://www.spam404.com/"
145 popular="false"/> 150 popular="true"/>
146 </subscriptions> 151 </subscriptions>
LEFTRIGHT
« skin/options-sprite.png ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld