Skip to content

Commit 048df96

Browse files
andryouandryou
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into legacypermissions
2 parents d83a0e4 + f17782e commit 048df96

File tree

5 files changed

+98
-87
lines changed

5 files changed

+98
-87
lines changed

‎css/options.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ h3 { margin: 0px !important; }
1616
.right { float: right; }
1717
.entryoptions { float: right; font-size: 11px; }
1818
.list, textarea { min-height: 300px; max-height: 300px; overflow-y: auto; }
19-
.sectionheading, .sectionheading h4 { margin-bottom: 0px; }
19+
.sectionheading, .sectionheading h4 { margin-bottom: 0px; }
20+
.row-offcanvas { display: none; }

‎html/options.html

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@
2424
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----">
2525
<input type="image" src="../img/heartbig.png" name="submit" alt="Support Andrew via PayPal!" title="Support Andrew via PayPal!">
2626
</form><br />
27-
<span class="i18_support">To support development, click the heart :)</span><br />Bitcoin: <a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a><br />
28-
<small><i>Awesome icons by <a href="http://dryicons.com" target="_blank">http://dryicons.com</a></i></small>
29-
<br />
30-
<br />
31-
<option class="btn btn-success" id="viewtoggle">List All Settings</option>
27+
<span class="i18_support">To support development, click the heart :)</span><br />Bitcoin: <a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a>
28+
<br /><br />
29+
<option class="btn btn-info" id="viewtoggle">List All Settings</option>
3230
</div>
3331
</div>
3432
<hr>
@@ -70,7 +68,7 @@ <h4 id="sectionname">General Settings</h4>
7068
<input type="checkbox" id="image" class="save" /><label for="image">&nbsp;&lt;IMG&gt;</label>
7169
</td></tr>
7270
<tr><td class="col-sm-4"><label for="xml">XML HTTP Request Handling:</label></td><td><select id="xml" class="savechange form-control">
73-
<option value="false">Disable</option>
71+
<option value="false">Disabled</option>
7472
<option value="true">Control Cross-Domain Requests (allow Same-Domain)</option>
7573
<option value="all">Control All Requests</option>
7674
</select><i>(Default: Control Cross-Domain Requests (allow Same-Domain); control XML HTTP Requests)</i></td></tr>
@@ -116,6 +114,49 @@ <h4 id="sectionname">General Settings</h4>
116114
<option value="true">Only on Unwhitelisted Domains</option>
117115
<option value="alldomains">On All Domains</option>
118116
</select><i>(Default: Only on Unwhitelisted Domains; blocks referrer information when clicking on third-party links (note: setting this to "On All Domains" may cause issues (e.g. thumbnails in Tweetdeck))</i></td></tr>
117+
<tr><td class="col-sm-4"><label for="timezone">Spoof Timezone:</label></td><td><select id="timezone" class="savechange form-control">
118+
<option value="false">Disabled</option>
119+
<option value="random">Random</option>
120+
<option value="720">UTC-12:00</option>
121+
<option value="660">UTC-11:00</option>
122+
<option value="600">UTC-10:00</option>
123+
<option value="570">UTC-09:30</option>
124+
<option value="540">UTC-09:00</option>
125+
<option value="480">UTC-08:00</option>
126+
<option value="420">UTC-07:00</option>
127+
<option value="360">UTC-06:00</option>
128+
<option value="300">UTC-05:00</option>
129+
<option value="240">UTC-04:00</option>
130+
<option value="210">UTC-03:30</option>
131+
<option value="180">UTC-03:00</option>
132+
<option value="120">UTC-02:00</option>
133+
<option value="60">UTC-01:00</option>
134+
<option value="0">UTC±00:00</option>
135+
<option value="-60">UTC+01:00</option>
136+
<option value="-120">UTC+02:00</option>
137+
<option value="-180">UTC+03:00</option>
138+
<option value="-210">UTC+03:30</option>
139+
<option value="-240">UTC+04:00</option>
140+
<option value="-270">UTC+04:30</option>
141+
<option value="-300">UTC+05:00</option>
142+
<option value="-330">UTC+05:30</option>
143+
<option value="-345">UTC+05:45</option>
144+
<option value="-360">UTC+06:00</option>
145+
<option value="-390">UTC+06:30</option>
146+
<option value="-420">UTC+07:00</option>
147+
<option value="-480">UTC+08:00</option>
148+
<option value="-510">UTC+08:30</option>
149+
<option value="-525">UTC+08:45</option>
150+
<option value="-540">UTC+09:00</option>
151+
<option value="-570">UTC+09:30</option>
152+
<option value="-600">UTC+10:00</option>
153+
<option value="-630">UTC+10:30</option>
154+
<option value="-660">UTC+11:00</option>
155+
<option value="-720">UTC+12:00</option>
156+
<option value="-765">UTC+12:45</option>
157+
<option value="-780">UTC+13:00</option>
158+
<option value="-840">UTC+14:00</option>
159+
</select> <i>(Default: disabled; spoof or randomize your timezone. NOTE: if enabled, it may interfere with replying to emails in Gmail.)</i></td></tr>
119160
<tr><td class="col-sm-4"><label for="useragentspoof">User-Agent Spoof:</label></td><td><select id="useragentspoof" class="savechange form-control">
120161
<option value="off">-Off-</option>
121162
<option value="chrome50">Chrome 50.0.2661.102</option>
@@ -161,49 +202,6 @@ <h4 id="sectionname">General Settings</h4>
161202
<option value="domain">Same Domain</option>
162203
<option value="custom">Custom</option>
163204
</select><i>(Default: -Off-; <strong>warning</strong>: if enabled, may "break" some sites (e.g. logging in))</i><div id="customreferrer" class="sshidden"><br /><p><input id="userref" class="form-control" value="" placeholder="Enter an address to set as your referrer value for all sites" /></p><p><input type="button" class="save btn btn-success" value="Save" /></p></div></td></tr>
164-
<tr><td class="col-sm-4"><label for="timezone">Spoof Timezone:</label></td><td><select id="timezone" class="savechange form-control">
165-
<option value="false">Disabled</option>
166-
<option value="random">Random</option>
167-
<option value="720">UTC-12:00</option>
168-
<option value="660">UTC-11:00</option>
169-
<option value="600">UTC-10:00</option>
170-
<option value="570">UTC-09:30</option>
171-
<option value="540">UTC-09:00</option>
172-
<option value="480">UTC-08:00</option>
173-
<option value="420">UTC-07:00</option>
174-
<option value="360">UTC-06:00</option>
175-
<option value="300">UTC-05:00</option>
176-
<option value="240">UTC-04:00</option>
177-
<option value="210">UTC-03:30</option>
178-
<option value="180">UTC-03:00</option>
179-
<option value="120">UTC-02:00</option>
180-
<option value="60">UTC-01:00</option>
181-
<option value="0">UTC±00:00</option>
182-
<option value="-60">UTC+01:00</option>
183-
<option value="-120">UTC+02:00</option>
184-
<option value="-180">UTC+03:00</option>
185-
<option value="-210">UTC+03:30</option>
186-
<option value="-240">UTC+04:00</option>
187-
<option value="-270">UTC+04:30</option>
188-
<option value="-300">UTC+05:00</option>
189-
<option value="-330">UTC+05:30</option>
190-
<option value="-345">UTC+05:45</option>
191-
<option value="-360">UTC+06:00</option>
192-
<option value="-390">UTC+06:30</option>
193-
<option value="-420">UTC+07:00</option>
194-
<option value="-480">UTC+08:00</option>
195-
<option value="-510">UTC+08:30</option>
196-
<option value="-525">UTC+08:45</option>
197-
<option value="-540">UTC+09:00</option>
198-
<option value="-570">UTC+09:30</option>
199-
<option value="-600">UTC+10:00</option>
200-
<option value="-630">UTC+10:30</option>
201-
<option value="-660">UTC+11:00</option>
202-
<option value="-720">UTC+12:00</option>
203-
<option value="-765">UTC+12:45</option>
204-
<option value="-780">UTC+13:00</option>
205-
<option value="-840">UTC+14:00</option>
206-
</select> <i>(Default: disabled; spoof or randomize your timezone. NOTE: if enabled, it may interfere with replying to emails in Gmail.)</i></td></tr>
207205
</table>
208206
</div>
209207
<div id="behaviorsettings" class="tab">
@@ -228,7 +226,7 @@ <h4 id="sectionname">General Settings</h4>
228226
<div id="whitelistblacklist" class="tab">
229227
<table class="table table-striped">
230228
<tr><td colspan="2" class="middle"><p><label for="url">Domain:</label> <input id="url" value="" class="form-control" placeholder="Enter a domain or expression (click 'Help' for more info)" /></p><p><input type="button" id="whitebind" value="+ Whitelist" class="btn btn-success" /> <input type="button" id="blackbind" value="+ Blacklist" class="btn btn-danger" /> <input type="button" id="domaininfo" value="Help" class="btn btn-default" /></p><div id="domaininfocontainer" class="sshidden"><ul><li><strong>Entire Domain Matching</strong>: match an entire domain by adding <strong style="color: green">**.</strong> in front of it (or click on "Trust"/"Distrust" for an existing entry below).<br />Example: <strong style="color: green">**.domain.com</strong> will match <strong>domain.com</strong>, <strong>a.domain.com</strong>, <strong>1.2.domain.com</strong> and even <strong>1.2.3.domain.com</strong></li><li><strong>Wildcard Matching</strong>: match any string of characters (except periods ".") with a <strong style="color: green">*</strong> character.<br />Example: <strong style="color: green">*.domain.com</strong> will match <strong>a.domain.com</strong> but not <strong>domain.com</strong> (no subdomain)</li><li><strong>Single-Character Matching</strong>: match any single character with a <strong style="color: green">?</strong> character.<br />Example: <strong style="color: green">cat?.com</strong> will match <strong>cats.com</strong> and <strong>cat5.com</strong><br /><br /></li><li><strong>Note 1</strong>: you are able to combine the various matching expressions (e.g. <strong>192.16?.*.*, *.cat?.c*, abc*xyz.com</strong>)</li><li><strong>Note 2</strong>: IPv6 URLs must contain square brackets (e.g. <strong>[2001:4860:0:2001::68]</strong>)</li><li><strong>Note 3</strong>: the "www." prefix is automatically handled, so all entries below have it stripped out</li></ul></div></td></tr>
231-
<tr><td class="col-sm-6"><p><strong>Whitelist</strong> (<a href="javascript:;" id="whiteclear">clear</a> | <a href="javascript:;" id="importwhite">bulk import</a>)</p><div class="list form-control" id="whitelist"></div><p><br /><small>Tip: press CTRL+F to search the lists</small></p></td><td class="col-sm-6"><p><strong>Blacklist</strong> (<a href="javascript:;" id="blackclear">clear</a> | <a href="javascript:;" id="importblack">bulk import</a>)</p><div class="list form-control" id="blacklist"></div>
229+
<tr><td class="col-sm-6"><p><strong>Whitelist (<span id="whitelistcount"></span>)</strong> (<a href="javascript:;" id="whiteclear">clear</a> | <a href="javascript:;" id="importwhite">bulk import</a>)</p><div class="list form-control" id="whitelist"></div><p><br /><small>Tip: press CTRL+F to search the lists</small></p></td><td class="col-sm-6"><p><strong>Blacklist (<span id="blacklistcount"></span>)</strong> (<a href="javascript:;" id="blackclear">clear</a> | <a href="javascript:;" id="importblack">bulk import</a>)</p><div class="list form-control" id="blacklist"></div>
232230
</td></tr>
233231
<tr><td colspan="2" id="bulk" class="sshidden"><strong>Bulk Import</strong><br /><br />Copy and paste domains into the box below. Each domain should be on a separate line.<br /><br /><p><textarea class="form-control"></textarea></p><p><input type="button" value="Import to List" class="btn btn-info" id="bulkbtn" /> <input type="button" value="Hide" id="hideimport" class="btn btn-default" /></p><div id="importerror" class="sshidden alert alert-danger"></div></td></tr>
234232
</table>

0 commit comments

Comments
 (0)