20170803_jeffrey - silenceuncrio/diary GitHub Wiki
0915
ariel 還有一些想要加強的地方
1000
status page 的 GPS panel 也要來點變化
只要有偵測到衛星的話
panel title 也打個勾
commit 6c8f2b1b20be0a690330f9fbb23f92ff76688313
Author: jeffrey <[email protected]>
Date: Thu Aug 3 09:58:53 2017 +0800
Display a 'check' icon in front of the 'GPS' panel title when satellite detected at least one
proscend/prosrc/www/brand_digicomm/app/feature/status_gnss.html | 1 +
proscend/prosrc/www/brand_nobrand/app/feature/status_gnss.html | 1 +
proscend/prosrc/www/brand_planet/app/feature/status_gnss.html | 1 +
3 files changed, 3 insertions(+)
1040
Dual SIM 那一頁的 Data Limitation 多加一個欄位 - Now Time
commit 2b0d4cc251712564b2a4ea96b8120ac4d60d4746
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Thu Aug 3 10:37:28 2017 +0800
Add 'Now Time' field for 'Data Limitation' section at 'Dual SIM' web page
proscend/prosrc/webcgi/icos_shm.c | 12 +++++++
proscend/prosrc/www/app/feature/dualSim.html | 52 ++++++++++++++++++++++------
proscend/prosrc/www/app/locale-en.json | 10 +++---
proscend/prosrc/www/app/locale-fr.json | 14 ++++----
proscend/prosrc/www/app/locale-zh-tw.json | 10 +++---
5 files changed, 74 insertions(+), 24 deletions(-)
1110
當 data limitation 到了後幫忙顯示 (Blocked)
讓使用者知道
commit 4b2a21e1a5208b280c9622ea5b2413ea78a1ce92
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Thu Aug 3 11:06:49 2017 +0800
Disply a '(Blocked)' literal at 'Already Used Data (MB)' field while data limitation reached
proscend/prosrc/www/app/feature/dualSim.html | 10 ++++++++--
proscend/prosrc/www/app/locale-en.json | 17 +++++++++--------
proscend/prosrc/www/app/locale-fr.json | 1 +
proscend/prosrc/www/app/locale-zh-tw.json | 1 +
4 files changed, 19 insertions(+), 10 deletions(-)
1340
因應 john 的 MODULE_SWITCH icos module 的改寫來修正 CGI 還有 web page
如果 switch 這 icos module 被 apply 之後認為有必要 reboot 的話
它會 return ICOS_MODULE_REBOOT
來讓 caller 知道它待會會將 device 做 reboot
CGI 要讓 browser 知道這件事
browser 端的 javascript 要讓使用者知道待會系統會重新啟動
commit c02b103d75ec74f47df4e61bf8119941ec33d775
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Thu Aug 3 13:35:55 2017 +0800
According to 'MODULE_SWITCH' ICOS_Apply()'s result to decide whether notify the reboot event or not
proscend/prosrc/icos/icoslib/switch/switchcfg.c | 2 +-
proscend/prosrc/webcgi/switch.c | 338 ++++++++++++------------
proscend/prosrc/www/app/feature/switch.js | 32 ++-
3 files changed, 192 insertions(+), 180 deletions(-)
1345
切回自己的 feature/rip
branch
➜ www git:(develop) ✗ git checkout feature/rip
Switched to branch 'feature/rip'
➜ www git:(feature/rip) ✗
重新 build 一份 firmware
1550
再度切回 branch 'develop'
➜ www git:(feature/rip) ✗ git checkout develop
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
➜ www git:(develop) ✗
幫忙化化妝
commit db899a3c2dec4de5a1c11bb50db77763563d47e6
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Thu Aug 3 15:49:54 2017 +0800
Beautify the display of the content of 'Now Time' field
proscend/prosrc/www/app/feature/dualSim.html | 32 ++++++++++++++--------------
1 file changed, 16 insertions(+), 16 deletions(-)
懶得切 branch 了
插拔電兩次直接讓 M300 切 partition 從有 quagga 的 firmware 開機得了
1750
ariel 希望把 ICOS_Apply fail
這字眼從 web 拿掉
system 選單之下的 pages
commit c9f1990c09dc4ea5f2a20f0c0cb5b8e41308f6fa
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Thu Aug 3 17:45:52 2017 +0800
Remove the internel error message while ICOS_Apply() fail at the following web pages:
- System / Time and Date
- System / COM Ports
- System / Logging
- System / Ethernet Ports
- System / Modbus
- System / Static Route
proscend/prosrc/www/app/feature/comPorts.js | 4 ++--
proscend/prosrc/www/app/feature/logging.js | 2 +-
proscend/prosrc/www/app/feature/modbus.js | 2 +-
proscend/prosrc/www/app/feature/route.js | 8 +++-----
proscend/prosrc/www/app/feature/switch.js | 2 +-
proscend/prosrc/www/app/feature/timeAndDate.js | 2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
WAN 選單之下的 pages
commit ee14b2744479587c44f083872d6f955e16d6fbed
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Thu Aug 3 17:53:59 2017 +0800
Remove the internel error message while ICOS_Apply() fail at the following web pages:
- WAN / Priority
- WAN / LTE Config
- WAN / Dual SIM
- WAN / Ethernet
- WAN / IPv6 DNS
proscend/prosrc/www/app/feature/dnsDhcp6c.js | 2 +-
proscend/prosrc/www/app/feature/dualSim.js | 6 +++---
proscend/prosrc/www/app/feature/lteConfig.js | 2 +-
proscend/prosrc/www/app/feature/wanEthernet.js | 16 ++++++++--------
proscend/prosrc/www/app/feature/wanPriority.js | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
LAN 選單之下的 pages
commit 598f16f7fdfc1a86acdadf7f40a9fb00505bb4ba
Author: jeffrey <[email protected]>
Date: Thu Aug 3 17:57:17 2017 +0800
Remove the internel error message while ICOS_Apply() fail at the following web pages:
- LAN / IPv4
- LAN / IPv6
proscend/prosrc/www/app/feature/lanIpv4.js | 2 +-
proscend/prosrc/www/app/feature/lanIpv6.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Service 選單之下的 pages
commit c15bbb21bc9b7dd19817fa53edcdf96f74ef4ffc
Author: jeffrey <[email protected]>
Date: Thu Aug 3 18:02:52 2017 +0800
Remove the internel error message while ICOS_Apply() fail at the following web pages:
- Service / IPSec
- Service / Port Forwarding
- Service / Dynamic DNS
- Service / DMZ
- Service / SNMP
- Service / TR069
- Service / IP Filter
- Service / MAC Filter
- Service / URL Filter
- Service / VRRP
- Service / MQTT
proscend/prosrc/www/app/feature/cwmp.js | 8 +++-----
proscend/prosrc/www/app/feature/dmz.js | 8 +++-----
proscend/prosrc/www/app/feature/dynamicDns.js | 2 +-
proscend/prosrc/www/app/feature/ipfilter.js | 2 +-
proscend/prosrc/www/app/feature/ipsec.js | 2 +-
proscend/prosrc/www/app/feature/macfilter.js | 2 +-
proscend/prosrc/www/app/feature/mqtt.js | 2 +-
proscend/prosrc/www/app/feature/portForwarding_v2.js | 2 +-
proscend/prosrc/www/app/feature/snmp.js | 2 +-
proscend/prosrc/www/app/feature/urlfilter.js | 2 +-
proscend/prosrc/www/app/feature/vrrp.js | 8 +++-----
11 files changed, 17 insertions(+), 23 deletions(-)
Management 選單之下的 pages
commit d529b9c2bcd1d6e14ad6785ea74a201e896647dc
Refs: [develop]
Author: jeffrey <[email protected]>
Date: Thu Aug 3 18:07:51 2017 +0800
Remove the internel error message while ICOS_Apply() fail at the following web pages:
- Management / Administration
proscend/prosrc/www/app/feature/administration.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
打完收工