Re-enable JS for the feedback form

Grammar
0.18
2012-10-03 10:08:45 -07:00 · 2012-10-03 08:37:13 -07:00 · 2012-10-03 08:21:43 -07:00 · 2012-10-03 08:15:28 -07:00 · 2012-10-03 05:51:42 -07:00 · 2012-10-02 11:26:54 -07:00
14 changed files with 96 additions and 41 deletions
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.17 (beta)</string>
+	<string>0.18 (beta)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.17</string>
+	<string>0.18</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -1435,7 +1435,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<true/>
 				<key>VERSION</key>
-				<string>0.17</string>
+				<string>0.18</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1928,7 +1928,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<true/>
 				<key>VERSION</key>
-				<string>0.17</string>
+				<string>0.18</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1,8 +1,10 @@
 #! /bin/sh

-VERSION='0.17'
+VERSION='0.18'

 cd build || exit 1
+[ -d DNSCrypt.mpkg ] || exit 1
+
 (
 cd DNSCrypt.mpkg/Contents/Packages || exit 1

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.17</string>
+	<string>0.18</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.17</string>
+	<string>0.18</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2011-2012 OpenDNS Inc. All rights reserved.</string>
 	<key>NSMainNibFile</key>
@@ -9,7 +9,7 @@
 #import <PreferencePanes/PreferencePanes.h>
 #import <WebKit/WebKit.h>

-#define kDNSCRYPT_PACKAGE_VERSION @"0.17"
+#define kDNSCRYPT_PACKAGE_VERSION @"0.18"

 #define kDNSCRYPT_PREFPANE_APP_PATH @"/Library/PreferencePanes/DNSCrypt.prefPane"
 #define kDNSCRYPT_USR_BASE_DIR kDNSCRYPT_PREFPANE_APP_PATH @"/Contents/Resources/usr"
@@ -309,7 +309,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
    res = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"/usr/local/sbin/dnscrypt-proxy --version | head -n 1", nil]];
    NSCharacterSet *charset = [NSCharacterSet characterSetWithCharactersInString: @"\r\n<>'"];
    res = [[res componentsSeparatedByCharactersInSet: charset] componentsJoinedByString: @" "];
-    NSString *script = [NSString stringWithFormat: @"document.querySelector('textarea[name=feedback]').value='\\n\\n\\n--\\nOpenDNS user interface for OSX " kDNSCRYPT_PACKAGE_VERSION "\\n%@'", res];;
+    NSString *script = [NSString stringWithFormat: @"document.querySelector('textarea[name=feedback]').value='\\n\\n\\n--\\nOpenDNS user interface for OSX " kDNSCRYPT_PACKAGE_VERSION "\\n%@'", res];
    [sender stringByEvaluatingJavaScriptFromString: script];
 }

@@ -65,7 +65,7 @@
 							<string key="NSFrame">{{13, 10}, {563, 359}}</string>
 							<reference key="NSSuperview" ref="1037298196"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="42710935"/>
+							<reference key="NSNextKeyView" ref="111364239"/>
 							<string key="NSReuseIdentifierKey">_NS:461</string>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="19707695">
@@ -120,7 +120,7 @@
 												<object class="NSButtonCell" key="NSCell" id="555340075">
 													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Enable OpenDNS</string>
+													<string key="NSContents">Always use OpenDNS</string>
 													<reference key="NSSupport" ref="176030688"/>
 													<string key="NSCellIdentifier">_NS:239</string>
 													<reference key="NSControlView" ref="300098131"/>
@@ -146,7 +146,7 @@
 												<object class="NSButtonCell" key="NSCell" id="446412441">
 													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Enable Familyshield</string>
+													<string key="NSContents">Always use Familyshield</string>
 													<object class="NSFont" key="NSSupport" id="1059912458">
 														<string key="NSName">LucidaGrande</string>
 														<double key="NSSize">14</double>
@@ -414,7 +414,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{323, 190}, {183, 32}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSNextKeyView" ref="821865429"/>
 												<string key="NSReuseIdentifierKey">_NS:2419</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="675161177">
@@ -474,7 +473,7 @@
 														<boolean value="NO" key="WebKitDisplayImagesKey"/>
 														<boolean value="NO" key="WebKitJavaEnabled"/>
 														<boolean value="NO" key="WebKitJavaScriptCanOpenWindowsAutomatically"/>
-														<boolean value="NO" key="WebKitJavaScriptEnabled"/>
+														<boolean value="YES" key="WebKitJavaScriptEnabled"/>
 														<integer value="1" key="WebKitMinimumFontSize"/>
 														<boolean value="NO" key="WebKitPluginsEnabled"/>
 													</dictionary>
@@ -518,7 +517,7 @@
 								<object class="NSTabViewItem" id="359976024">
 									<string key="NSIdentifier">2</string>
 									<object class="NSView" key="NSView" id="42710935">
-										<reference key="NSNextResponder" ref="821865429"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSTextField" id="826224678">
@@ -526,7 +525,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{5, 293}, {406, 17}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1038497103"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -547,7 +545,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{8, 270}, {526, 22}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="763894061"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -583,7 +580,6 @@
 												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{6, 215}, {455, 18}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="30650809"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -611,7 +607,6 @@
 												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{6, 242}, {195, 18}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="679502487"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -639,7 +634,6 @@
 												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{284, 242}, {126, 18}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="985341605"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -667,7 +661,6 @@
 												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{446, 234}, {94, 32}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="6419610"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -692,7 +685,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{9, 26}, {169, 141}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="583617410"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -724,7 +716,6 @@ LjQzLjEwCjo6MQ</string>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{187, 26}, {169, 141}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="902108600"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -752,7 +743,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{365, 26}, {169, 141}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="960794720"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -779,7 +769,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{6, 170}, {175, 34}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="546014897"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -806,7 +795,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{185, 170}, {175, 34}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="567741681"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -829,7 +817,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{362, 170}, {175, 34}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="25489948"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -853,8 +840,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{511, 0}, {25, 25}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:1598</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="933364045">
@@ -878,7 +863,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{477, 6}, {33, 17}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="988915282"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -900,7 +884,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												<array class="NSMutableArray" key="NSSubviews"/>
 												<string key="NSFrame">{{8, 206}, {526, 5}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="11113535"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="NSOffsets">{0, 0}</string>
@@ -942,7 +925,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												</set>
 												<string key="NSFrame">{{3, 26}, {536, 284}}</string>
 												<reference key="NSSuperview" ref="42710935"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<string key="FrameName"/>
@@ -967,8 +949,6 @@ aW91cy5leGFtcGxlLm5ldA</string>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {543, 313}}</string>
-										<reference key="NSSuperview" ref="821865429"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="228385556"/>
 									</object>
 									<string key="NSLabel">Advanced</string>
@@ -1092,7 +1072,7 @@ aW91cy5leGFtcGxlLm5ldA</string>
 								<object class="NSTabViewItem" id="40200058">
 									<string key="NSIdentifier">5</string>
 									<object class="NSView" key="NSView" id="111364239">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="821865429"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="WebView" id="605742401">
@@ -1117,6 +1097,7 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												</set>
 												<string key="NSFrame">{{17, 17}, {509, 293}}</string>
 												<reference key="NSSuperview" ref="111364239"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:51</string>
 												<string key="FrameName"/>
@@ -1127,6 +1108,8 @@ aW91cy5leGFtcGxlLm5ldA</string>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {543, 313}}</string>
+										<reference key="NSSuperview" ref="821865429"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="605742401"/>
 										<string key="NSReuseIdentifierKey">_NS:610</string>
 									</object>
@@ -1135,13 +1118,13 @@ aW91cy5leGFtcGxlLm5ldA</string>
 									<reference key="NSTabView" ref="821865429"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="359976024"/>
+							<reference key="NSSelectedTabViewItem" ref="40200058"/>
 							<reference key="NSFont" ref="604491631"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="42710935"/>
+								<reference ref="111364239"/>
 							</array>
 						</object>
 					</array>
@@ -121,3 +121,20 @@
      %p
        Domains listed here will bypass DNSCrypt in order to be sent
        to the default resolvers.
+      %p
+        Do
+        %strong not
+        use a tool like hostip(8), drill(1), unbound-host(1), dig(1) or host(1)
+        in order to check that an exception rule works.
+      %p
+        These tools use their own resolution mechanisms that have nothing
+        to do with how others apps on your system are resolving names.
+      %p
+        They don't use the OSX-specific stub resolver, they don't use
+        the system-wide DNS cache, they have bugs and limitations that the OS
+        doesn't have (and the opposite is also true), and they don't know a
+        thing about specific resolvers that have to be used for specific
+        domains.
+      %p
+        Use actual apps, or even a command like ping(8).
+        
@@ -156,6 +156,26 @@
        Domains listed here will bypass DNSCrypt in order to be sent
        to the default resolvers.
      </p>
+      <p>
+        Do
+        <strong>not</strong>
+        use a tool like hostip(8), drill(1), unbound-host(1), dig(1) or host(1)
+        in order to check that an exception rule works.
+      </p>
+      <p>
+        These tools use their own resolution mechanisms that have nothing
+        to do with how others apps on your system are resolving names.
+      </p>
+      <p>
+        They don't use the OSX-specific stub resolver, they don't use
+        the system-wide DNS cache, they have bugs and limitations that the OS
+        doesn't have (and the opposite is also true), and they don't know a
+        thing about specific resolvers that have to be used for specific
+        domains.
+      </p>
+      <p>
+        Use actual apps, or even a command like ping(8).
+      </p>
    </section>
  </body>
 </html>
@@ -21,6 +21,20 @@
  %body
    %h1 Release Notes for the user interface

+    %article
+      %h2 Version 0.18
+      %time Wed,  3 Oct 2012
+      %ul
+        %li
+          freebox.fr has been added to the default list of domains
+          for which DNSCrypt should be bypassed.
+        %li
+          If a static resolvers set has been specified, this will now be
+          used for exceptions instead of DHCP-provided servers.
+        %li
+          Minor cosmetic fixes and documentation improvements have been
+          made.
+
    %article
      %h2 Version 0.17
      %time Fri, 28 Sep 2012
@@ -23,6 +23,24 @@
  </head>
  <body>
    <h1>Release Notes for the user interface</h1>
+    <article>
+      <h2>Version 0.18</h2>
+      <time>Wed,  3 Oct 2012</time>
+      <ul>
+        <li>
+          freebox.fr has been added to the default list of domains
+          for which DNSCrypt should be bypassed.
+        </li>
+        <li>
+          If a static resolvers set has been specified, this will now be
+          used for exceptions instead of DHCP-provided servers.
+        </li>
+        <li>
+          Minor cosmetic fixes and documentation improvements have been
+          made.
+        </li>
+      </ul>
+    </article>
    <article>
      <h2>Version 0.17</h2>
      <time>Fri, 28 Sep 2012</time>
@@ -40,7 +40,7 @@ INTERFACE_PROBES="127.0.0.55"
 INTERFACE_PROBES_MASK="24"

 DOMAINS_EXCEPTIONS='
-fritz.box intranet lan localdomain nowtv.com private routerlogin.net
+freebox.fr fritz.box intranet lan localdomain nowtv.com private routerlogin.net
 '

 export PATH="${DNSCRYPT_USR_BASE_DIR}/bin:${DNSCRYPT_USR_BASE_DIR}/scripts:$PATH"
@@ -39,8 +39,7 @@ remove_old_exceptions() {
  }
 }

-name_servers=$(get_dhcp_dns || get_gw)
-
+name_servers=$(./get-static-resolvers.sh || get_dhcp_dns || get_gw)
 [ x"$name_servers" = 'x' ] && exit 0

 default_domain=$(./get-current-default-domain.sh)
@@ -2,4 +2,6 @@

 . ./common.inc

-[ -r "$STATIC_RESOLVERS_FILE" ] && cat "$STATIC_RESOLVERS_FILE"
+[ -r "$STATIC_RESOLVERS_FILE" ] && cat "$STATIC_RESOLVERS_FILE" && exit 0
+exit 1
+
Author	SHA1	Message	Date
Frank Denis	2647aadad8	Re-enable JS for the feedback form	2012-10-03 10:08:45 -07:00
Frank Denis	6020eb8505	Grammar	2012-10-03 08:37:13 -07:00
Frank Denis	d5f551de8a	0.18	2012-10-03 08:21:43 -07:00
Frank Denis	1c8e2e4fa1	Update release notes.	2012-10-03 08:15:28 -07:00
Frank Denis	093ab54300	Explain that a tool like dig(1) shouldn't be use in order to check if an exception works.	2012-10-03 05:51:42 -07:00
Frank Denis	d15252db40	Keep everything sorted, thanks.	2012-10-02 11:26:54 -07:00
Frank Denis	50dc9a9382	Add freebox.fr to the list of exceptions for things like mafreebox.freebox.fr	2012-10-02 11:25:33 -07:00
Frank Denis	75d3983289	Change "enable OpenDNS" to "always use OpenDNS" and "enable FamilyShield" to "always use FamilyShield" in the preference pane, too, in order to be in line with the menu bar. Suggested by G.D. Wolfman, thanks!	2012-10-02 07:14:59 -07:00
Frank Denis	24227488db	Use 0.17.1 in the package.	2012-10-02 07:14:10 -07:00
Frank Denis	cbfa42cb3a	Moving on. Next will be 0.18	2012-09-29 15:22:55 +02:00
Frank Denis	2f6ab604fc	Use static resolvers, if provided, in order to resolve names bypassing OpenDNS	2012-09-29 15:08:44 +02:00