Merge branch 'master' into mainline

RMerl · Aug 14, 2020 · 89f02ff · 89f02ff
2 parents b2fb39a + b93cd5b
commit 89f02ff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/Changelog-NG.txt b/Changelog-NG.txt
@@ -1,11 +1,12 @@
 Asuswrt-Merlin 384/NG Changelog
 ===============================
 
-384.19 (xx-xxx-2020)
+384.19 (14-Aug-2020)
   - NOTE: Due to flash partitioning changes done by Asus, it is
           strongly recommended to make a backup of your JFFS
           partition before upgrading the RT-AC86U, and restoring
-          that backup afterward.
+          that backup afterward.  If you run into issues,
+          reformat your JFFS partition and reboot.
   - NOTE: The RT-AX56U build is not available for this release.
 
   - NEW: Added support for static routes for PPTP/L2TP VPN

diff --git a/release/src-rt/version.conf b/release/src-rt/version.conf
@@ -1,5 +1,5 @@
 KERNEL_VER=3.0
 FS_VER=0.4
 SERIALNO=384.19
-EXTENDNO=beta2
+EXTENDNO=0
 RCNO=0
diff --git a/release/src/router/others/vpnrouting.sh b/release/src/router/others/vpnrouting.sh
@@ -121,8 +121,6 @@ Set_VPN_NVRAM_Vars() {
 }
 
 # Begin
-logger -st "($(basename "$0"))" $$ "Starting routing policy configuration for client $VPN_UNIT"
-
 case "$dev" in
 tun11 | tun12 | tun13 | tun14 | tun15) Set_VPN_NVRAM_Vars ;;
 *) run_custom_script && exit 0 ;;

diff --git a/release/src/router/www/Advanced_VPN_OpenVPN.asp b/release/src/router/www/Advanced_VPN_OpenVPN.asp
@@ -198,9 +198,9 @@ function initial(){
 		           document.form.vpn_server_cust22.value;
 	}
 
-	// Models with encrypted passwords
-	if (based_modelid == "RT-AX88U") {
-		showhide("show_pass_div", 0);
+	// Models without encrypted passwords
+	if (based_modelid == "RT-AC68U") {
+		showhide("show_pass_div", 1);
 	}
 
 	document.getElementById("vpn_server_custom_x").value = Base64.decode(cust2);
@@ -1469,7 +1469,7 @@ function callback_upload_cert(_flag) {
 											<ol>
 										</div>
 
-										<div style="color:#FFCC00;" id="show_pass_div"><input type="checkbox" name="show_pass" id="show_pass" onclick="showopenvpnd_clientlist();update_vpn_client_state();openvpnd_connected_status();">Show passwords</div>
+										<div style="color:#FFCC00;display:none;" id="show_pass_div"><input type="checkbox" name="show_pass" id="show_pass" onclick="showopenvpnd_clientlist();update_vpn_client_state();openvpnd_connected_status();">Show passwords</div>
 
 										<table width="100%" border="1" align="center" cellpadding="4" cellspacing="0" class="FormTable_table" style="margin-top:8px;">
 											<thead>

diff --git a/release/src/router/www/Tools_Sysinfo.asp b/release/src/router/www/Tools_Sysinfo.asp
@@ -629,7 +629,7 @@ function update_sysinfo(e){
 						<td id="wlc_24_td"></td>
 					</tr>
 					<tr id="wifi5_clients_tr" style="display:none;">
-						<th id="wifi51_clients_th">Wireless clients (5 GHz)</th>
+						<th id="wifi51_clients_th">Wireless Clients (5 GHz)</th>
 						<td id="wlc_51_td"></td>
 					</tr>
 					<tr id="wifi5_2_clients_tr" style="display:none;">