Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync beta_7_0 back #1

Merged
merged 169 commits into from
Nov 6, 2018
Merged

sync beta_7_0 back #1

merged 169 commits into from
Nov 6, 2018

Commits on Jun 19, 2018

  1. Merge pull request #934 from firewalla/master 

    Beta Release 1.956
    @MelvinTo
    MelvinTo authored Jun 19, 2018
    Configuration menu
    Copy the full SHA
    cc6def9 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2018

  1. allow log.info for some key logs

    @MelvinTo
    MelvinTo committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    8114bec View commit details
    Browse the repository at this point in the history

  2. revert changes not to be added to beta at this moment

    @MelvinTo
    MelvinTo committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    b4e9e40 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #985 from MelvinTo/beta_6_0 

    Patch: force some log.infos to be printed in production
    @MelvinTo
    MelvinTo authored Jun 23, 2018
    Configuration menu
    Copy the full SHA
    4db3b9a View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Change heartbeat log level to INFO

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    a7606db View commit details
    Browse the repository at this point in the history

  2. bug fix

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    31ceb78 View commit details
    Browse the repository at this point in the history

  3. Add log info when firemon is waiting for binding

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    2d4c155 View commit details
    Browse the repository at this point in the history

  4. Disable setLanguage feature temporarily

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    37ff119 View commit details
    Browse the repository at this point in the history

  5. No need to throw error if not having p.dest.ip, just skip destinfo en… 

    …richment
    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    1203712 View commit details
    Browse the repository at this point in the history

  6. bug fix

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    c72e3d6 View commit details
    Browse the repository at this point in the history

  7. reduce the check time for firemain-ping

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    2cad38e View commit details
    Browse the repository at this point in the history

  8. use /dev/shm for firemain/mon ping

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    df59542 View commit details
    Browse the repository at this point in the history

  9. bug fix

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    1d77ee0 View commit details
    Browse the repository at this point in the history

  10. bug fix

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    dc0233e View commit details
    Browse the repository at this point in the history

  11. bug fix

    @MelvinTo
    MelvinTo committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    ea8e0ff View commit details
    Browse the repository at this point in the history

  12. Merge pull request #987 from MelvinTo/beta_6_0 

    Beta Patch: Change heartbeat log level to INFO
    @MelvinTo
    MelvinTo authored Jun 25, 2018
    Configuration menu
    Copy the full SHA
    2a27c70 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. BUG: only one vpn gen script should be running at same time

    @MelvinTo
    MelvinTo committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    c5e611f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta_6_0' of https://github.com/melvinto/firewalla into… 

    … beta_6_0
    @MelvinTo
    MelvinTo committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    38d6e70 View commit details
    Browse the repository at this point in the history

  3. revert change on vpn Default.txt

    @MelvinTo
    MelvinTo committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    1085667 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #989 from MelvinTo/beta_6_0 

    Patch: only one vpn gen script should be running at same time
    @MelvinTo
    MelvinTo authored Jun 26, 2018
    Configuration menu
    Copy the full SHA
    3844bb1 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. BUG: update policy not working for device level policy

    @MelvinTo
    MelvinTo committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    ef2ad4c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta_6_0' of https://github.com/MelvinTo/not_firewalla … 

    …into beta_6_0
    @MelvinTo
    MelvinTo committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    342e907 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. support category and device level scope on creating exception from alarm

    @MelvinTo
    MelvinTo committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    057e029 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #995 from MelvinTo/beta_6_0 

    support category and device level scope on creating exception from alarm
    @MelvinTo
    MelvinTo authored Jun 28, 2018
    Configuration menu
    Copy the full SHA
    6f07c31 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2018

  1. reduce the freq of dnsmasq reload

    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    a1dfcb4 View commit details
    Browse the repository at this point in the history

  2. reload dnsmasq only necessary

    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    d70ea1c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta_6_0' of https://github.com/melvinto/firewalla into… 

    … beta_6_0
    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    1fedea0 View commit details
    Browse the repository at this point in the history

  4. Revert "BUG: update policy not working for device level policy" 

    This reverts commit ef2ad4c.
    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    c181bbd View commit details
    Browse the repository at this point in the history

  5. suppress spoof status changed log to reduce logs

    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    32d744c View commit details
    Browse the repository at this point in the history

  6. BUG: monitor scripts might force restart firemain/man during first setup

    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    2532abd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'beta_6_0' of https://github.com/melvinto/firewalla into… 

    … beta_6_0
    @MelvinTo
    MelvinTo committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    a4f03ef View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. Allow/Block site by default instead of raw ip when handling notificat… 

    …ions

BUG: use domain exact match by default when intelfeedback is not used

bug fix

bug fix
    @MelvinTo
    MelvinTo committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    7067faa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta_6_0' of https://github.com/melvinto/firewalla into… 

    … beta_6_0
    @MelvinTo
    MelvinTo committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    dfc394c View commit details
    Browse the repository at this point in the history

  3. bug fix

    @MelvinTo
    MelvinTo committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    18b14b7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #996 from MelvinTo/beta_6_0 

    Patch: [DHCP Mode] Reload dnsmasq only when necessary
    @MelvinTo
    MelvinTo authored Jul 2, 2018
    Configuration menu
    Copy the full SHA
    1329917 View commit details
    Browse the repository at this point in the history

  5. Revert "Patch: [DHCP Mode] Reload dnsmasq only when necessary"

    @MelvinTo
    MelvinTo authored Jul 2, 2018
    Configuration menu
    Copy the full SHA
    3fabeb3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #997 from firewalla/revert-996-beta_6_0 

    Revert "Patch: [DHCP Mode] Reload dnsmasq only when necessary"
    @MelvinTo
    MelvinTo authored Jul 2, 2018
    Configuration menu
    Copy the full SHA
    c9af7ea View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. Revert "Revert "Patch: [DHCP Mode] Reload dnsmasq only when necessary""

    @MelvinTo
    MelvinTo authored Jul 3, 2018
    Configuration menu
    Copy the full SHA
    53c4740 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #998 from firewalla/revert-997-revert-996-beta_6_0 

    Revert "Revert "Patch: [DHCP Mode] Reload dnsmasq only when necessary""
    @MelvinTo
    MelvinTo authored Jul 3, 2018
    Configuration menu
    Copy the full SHA
    c18b98e View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. Support per device policy when blocking alarms

    @MelvinTo
    MelvinTo committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    a7254ca View commit details
    Browse the repository at this point in the history

  2. Support blocking category from alarm

    @MelvinTo
    MelvinTo committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    6cb2825 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1001 from MelvinTo/beta_6_0 

    alarm block should support per device and category
    @MelvinTo
    MelvinTo authored Jul 6, 2018
    Configuration menu
    Copy the full SHA
    eb42795 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. BUG: expired the wrong alarm key

    @MelvinTo
    MelvinTo committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    74a3e52 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. add ip address as backup for whois server

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    47dc576 View commit details
    Browse the repository at this point in the history

  2. merge

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    52e7a0f View commit details
    Browse the repository at this point in the history

  3. Bug: FireMon crashed because domain "whois.iana.org" can't be resolve… 

    …d bug
    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    c964745 View commit details
    Browse the repository at this point in the history

  4. merge

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    ff156f8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1007 from MelvinTo/beta_6_0_staging 

    Bug: FireMon crashed because domain "whois.iana.org" can't be resolved
    @MelvinTo
    MelvinTo authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    cd82f00 View commit details
    Browse the repository at this point in the history

  6. BUG: expired the wrong alarm key

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    e0b3a63 View commit details
    Browse the repository at this point in the history

  7. set static hostnames into av category

    @duzitong @MelvinTo
    duzitong authored and MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    fc9ef6f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1008 from MelvinTo/beta_6_0_staging 

    BUG: expired the wrong alarm key
    @MelvinTo
    MelvinTo authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    f6e2db9 View commit details
    Browse the repository at this point in the history

  9. update version

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    5854b75 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1009 from MelvinTo/beta_6_0_staging 

    Feature: Support blocking videos
    @MelvinTo
    MelvinTo authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    98cbf18 View commit details
    Browse the repository at this point in the history

  11. enable active protect by default

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    3d8f347 View commit details
    Browse the repository at this point in the history

  12. bug fix

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    86d09a7 View commit details
    Browse the repository at this point in the history

  13. add log

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    1ad98a6 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #1012 from MelvinTo/beta_6_0_staging 

    Enable active protect list by default
    @MelvinTo
    MelvinTo authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    541e66b View commit details
    Browse the repository at this point in the history

  15. BUG: need better error handling on natpmp

    @MelvinTo
    MelvinTo committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    fd157ec View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. Merge pull request #1015 from MelvinTo/beta_6_0_staging 

    BUG: need better error handling on natpmp
    @MelvinTo
    MelvinTo authored Jul 13, 2018
    Configuration menu
    Copy the full SHA
    f56fff8 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. BUG: u-boot may not work on some devices

    @MelvinTo
    MelvinTo committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    76785e8 View commit details
    Browse the repository at this point in the history

  2. add error hanlding for non-nanopi chip

    @MelvinTo
    MelvinTo committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    8d387fe View commit details
    Browse the repository at this point in the history

  3. bug fix

    @MelvinTo
    MelvinTo committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    34dd7de View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1021 from MelvinTo/beta_6_0_staging 

    BUG: u-boot may not work on some devices
    @MelvinTo
    MelvinTo authored Jul 16, 2018
    Configuration menu
    Copy the full SHA
    1e81286 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge branch 'beta_6_0' of https://github.com/MelvinTo/not_firewalla … 

    …into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    668e104 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1011 from firewalla/beta_6_0_staging 

    Beta Patch - 1.957
    @MelvinTo
    MelvinTo authored Jul 17, 2018
    Configuration menu
    Copy the full SHA
    9bb1446 View commit details
    Browse the repository at this point in the history

  3. Update ActiveProtectSensor.js

    @MelvinTo
    MelvinTo authored Jul 17, 2018
    Configuration menu
    Copy the full SHA
    3332c74 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1027 from firewalla/beta_6_0_staging 

    Update ActiveProtectSensor.js
    @MelvinTo
    MelvinTo authored Jul 17, 2018
    Configuration menu
    Copy the full SHA
    7cab0ff View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. set destination name to destination ip

    @MelvinTo
    MelvinTo committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    26b9056 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1030 from MelvinTo/beta_6_0_staging 

    Beta 6 0 staging
    @MelvinTo
    MelvinTo authored Jul 18, 2018
    Configuration menu
    Copy the full SHA
    b027680 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. do not overwrite dest.name when it's already set

    @MelvinTo
    MelvinTo committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    cfcab25 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1033 from MelvinTo/beta_6_0_staging 

    do not overwrite dest.name when it's already set
    @MelvinTo
    MelvinTo authored Jul 19, 2018
    Configuration menu
    Copy the full SHA
    47a8b4b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. change watchdog interval to 120 seconds

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    601e10b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    e3292a7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1036 from MelvinTo/beta_6_0_staging 

     change watchdog interval to 120 seconds
    @MelvinTo
    MelvinTo authored Jul 20, 2018
    Configuration menu
    Copy the full SHA
    12b3884 View commit details
    Browse the repository at this point in the history

  4. BUG: should copy watchdog.conf over when it's updated

    @MelvinTo
    MelvinTo committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    993b3ab View commit details
    Browse the repository at this point in the history

  5. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    3036ddb View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1037 from MelvinTo/beta_6_0_staging 

    BUG: should copy watchdog.conf over when it's updated
    @MelvinTo
    MelvinTo authored Jul 20, 2018
    Configuration menu
    Copy the full SHA
    7bf859c View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2018

  1. Merge pull request #1031 from firewalla/beta_6_0_staging 

    Beta Patch - Several patches
    @MelvinTo
    MelvinTo authored Jul 23, 2018
    Configuration menu
    Copy the full SHA
    9fe0fba View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. add category match handler in Policy.js

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    64d9d20 View commit details
    Browse the repository at this point in the history

  2. missing break in category case

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    310e76d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    b5e2c72 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1057 from MelvinTo/beta_6_0_staging 

    Beta 6 0 staging
    @MelvinTo
    MelvinTo authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    763f3b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. Merge pull request #1058 from firewalla/beta_6_0_staging 

    Beta Patch
    @MelvinTo
    MelvinTo authored Aug 6, 2018
    Configuration menu
    Copy the full SHA
    664def2 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. ignore unknown hosts in alternative dnsmasq

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    ac4f648 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    f0360d4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1073 from MelvinTo/beta_6_0_staging 

    Beta 6 0 staging
    @MelvinTo
    MelvinTo authored Aug 17, 2018
    Configuration menu
    Copy the full SHA
    1c5adba View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. fix LED for newer boards, they are not turning off

    @jerrchen @MelvinTo
    jerrchen authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    cac19b9 View commit details
    Browse the repository at this point in the history

  2. increase auto revert time to 10 minutes

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    5c1249a View commit details
    Browse the repository at this point in the history

  3. merge

    @jerrchen @MelvinTo
    jerrchen authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    1c46563 View commit details
    Browse the repository at this point in the history

  4. include number of archived alarms in init data

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    b5b91eb View commit details
    Browse the repository at this point in the history

  5. BUG: should spoof new device faster

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    54743fc View commit details
    Browse the repository at this point in the history

  6. merge

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    454ce6d View commit details
    Browse the repository at this point in the history

  7. merge

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    0365c43 View commit details
    Browse the repository at this point in the history

  8. fix globalLogLevel bug in logger.js

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    9017573 View commit details
    Browse the repository at this point in the history

  9. delete group while resetting to factory default

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4b41c5b View commit details
    Browse the repository at this point in the history

  10. remove constraint on type of bro notice

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    944b963 View commit details
    Browse the repository at this point in the history

  11. update wording for parentalcontrol alarms

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    2d652b3 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    f66c1e7 View commit details
    Browse the repository at this point in the history

  13. support exception creation

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    cce61f2 View commit details
    Browse the repository at this point in the history

  14. expire stats:last24 automatically

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    eb47e58 View commit details
    Browse the repository at this point in the history

  15. use enqueueAlarm

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    bc16b4c View commit details
    Browse the repository at this point in the history

  16. added cs anv

    @jerrchen @MelvinTo
    jerrchen authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    3e71ab2 View commit details
    Browse the repository at this point in the history

  17. add SSL intel into alarm detail

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    bcdf607 View commit details
    Browse the repository at this point in the history

  18. stability improvement on dnsmasq

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    094b266 View commit details
    Browse the repository at this point in the history

  19. BUG: update policy not working for device level policy

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4794a84 View commit details
    Browse the repository at this point in the history

  20. use LoggerManager.setGlobalLogLevel instead

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    ed63fe7 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #1079 from MelvinTo/beta_6_0_staging 

    Beta 6 0 staging
    @MelvinTo
    MelvinTo authored Aug 21, 2018
    Configuration menu
    Copy the full SHA
    65eedcd View commit details
    Browse the repository at this point in the history

  22. bug fix

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    29d598d View commit details
    Browse the repository at this point in the history

  23. Merge pull request #1080 from MelvinTo/beta_6_0_staging 

    bug fix
    @MelvinTo
    MelvinTo authored Aug 21, 2018
    Configuration menu
    Copy the full SHA
    b7c3425 View commit details
    Browse the repository at this point in the history

  24. bug fix

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    06ac2bb View commit details
    Browse the repository at this point in the history

  25. Merge pull request #1081 from MelvinTo/beta_6_0_staging 

    bug fix
    @MelvinTo
    MelvinTo authored Aug 21, 2018
    Configuration menu
    Copy the full SHA
    2d933d9 View commit details
    Browse the repository at this point in the history

  26. bug fix

    @MelvinTo
    MelvinTo committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    346a918 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #1082 from MelvinTo/beta_6_0_staging 

    bug fix
    @MelvinTo
    MelvinTo authored Aug 21, 2018
    Configuration menu
    Copy the full SHA
    49d6fdb View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2018

  1. mege

    @MelvinTo
    MelvinTo committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    7b5cdeb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1083 from MelvinTo/beta_6_0_staging 

    merge
    @MelvinTo
    MelvinTo authored Aug 22, 2018
    Configuration menu
    Copy the full SHA
    7273a2b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Update sanity check script to add b7

    @MelvinTo
    MelvinTo committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    59ef179 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1085 from MelvinTo/beta_6_0_staging 

    change led off
    @MelvinTo
    MelvinTo authored Aug 23, 2018
    Configuration menu
    Copy the full SHA
    07370ff View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. Merge pull request #1074 from firewalla/beta_6_0_staging 

    Beta Patch - 20180821
    @MelvinTo
    MelvinTo authored Aug 27, 2018
    Configuration menu
    Copy the full SHA
    177dec6 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. apply spoof policy even if policy is not changed

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    ae7a2b1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1088 from MelvinTo/beta_6_0_staging 

    Patch: apply spoof policy even if policy is not changed
    @MelvinTo
    MelvinTo authored Aug 28, 2018
    Configuration menu
    Copy the full SHA
    3dc8312 View commit details
    Browse the repository at this point in the history

  3. BUG: removeOnSuccess and removeOnFailure didn't take effect

    @MelvinTo
    MelvinTo committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    05ad624 View commit details
    Browse the repository at this point in the history

  4. add cronjob to restart bitbridge7 if necessary

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    ea21667 View commit details
    Browse the repository at this point in the history

  5. only add/remove cronjob in bitbridge.js

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    dddfb39 View commit details
    Browse the repository at this point in the history

  6. determine mode and bitbridge service status in cronjob

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    d16ae0b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    a0e062d View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1092 from MelvinTo/beta_6_0_staging 

    Beta 6 0 staging
    @MelvinTo
    MelvinTo authored Aug 28, 2018
    Configuration menu
    Copy the full SHA
    e0aa9a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2018

  1. bitbridge-ping.sh +x

    @MelvinTo
    MelvinTo committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    9279c9d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1100 from MelvinTo/beta_6_0_staging 

    bitbridge-ping.sh +x
    @MelvinTo
    MelvinTo authored Sep 4, 2018
    Configuration menu
    Copy the full SHA
    f3ef3b3 View commit details
    Browse the repository at this point in the history

  3. BUG: use firewalla.encipher.io instead of github for dns status check

    @MelvinTo
    MelvinTo committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    27c7be9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1101 from MelvinTo/beta_6_0_staging 

    BUG: use firewalla.encipher.io instead of github for dns status check
    @MelvinTo
    MelvinTo authored Sep 4, 2018
    Configuration menu
    Copy the full SHA
    f77dc29 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2018

  1. change log level

    @MelvinTo
    MelvinTo committed Sep 7, 2018
    Configuration menu
    Copy the full SHA
    06fcfbb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla 

     into beta_6_0_staging
    @MelvinTo
    MelvinTo committed Sep 7, 2018
    Configuration menu
    Copy the full SHA
    38cc370 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1108 from MelvinTo/beta_6_0_staging 

    Beta 6 0 staging
    @MelvinTo
    MelvinTo authored Sep 7, 2018
    Configuration menu
    Copy the full SHA
    6208556 View commit details
    Browse the repository at this point in the history

  4. add multiple domains for dnsmasq to check DNS connectivity

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Sep 7, 2018
    Configuration menu
    Copy the full SHA
    c703e67 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1110 from MelvinTo/beta_6_0_staging 

    add multiple domains for dnsmasq to check DNS connectivity
    @MelvinTo
    MelvinTo authored Sep 7, 2018
    Configuration menu
    Copy the full SHA
    42ca34c View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2018

  1. Merge pull request #1089 from firewalla/beta_6_0_staging 

    Patches
    @MelvinTo
    MelvinTo authored Sep 12, 2018
    Configuration menu
    Copy the full SHA
    44a0b29 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Merge pull request #1209 from MelvinTo/beta_7_0 

    set brightness accordingly in BluePlatform.js
    @MelvinTo
    MelvinTo authored Oct 30, 2018
    Configuration menu
    Copy the full SHA
    5af0dcf View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. missing /24 in vpn subnet

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    a087668 View commit details
    Browse the repository at this point in the history

  2. merge

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    d0c0d19 View commit details
    Browse the repository at this point in the history

  3. merge

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    a019e8a View commit details
    Browse the repository at this point in the history

  4. remove all ips from ipset before destroying ipset for domain unblock

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    19bb6b1 View commit details
    Browse the repository at this point in the history

  5. BUG: fix wrong cpuid info during checkin

    @MelvinTo
    MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    f0b06e2 View commit details
    Browse the repository at this point in the history

  6. platformize cpuid

    @MelvinTo
    MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    aaa069a View commit details
    Browse the repository at this point in the history

  7. add curl test in fire-ping for network connection test

    @jasonlyc @MelvinTo
    jasonlyc authored and MelvinTo committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    28cfebb View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Add upnp in-mem registry and periodical check

    @drahnieR @MelvinTo
    drahnieR authored and MelvinTo committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    738c337 View commit details
    Browse the repository at this point in the history

  2. add manufacturer for firewalla

    @drahnieR @MelvinTo
    drahnieR authored and MelvinTo committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    85c77cf View commit details
    Browse the repository at this point in the history

  3. fix bug in mapping removal

    @drahnieR @MelvinTo
    drahnieR authored and MelvinTo committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    b4b24e1 View commit details
    Browse the repository at this point in the history

  4. fix nat-pmp ttl, remove unused code

    @drahnieR @MelvinTo
    drahnieR authored and MelvinTo committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    e63b54a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1220 from MelvinTo/beta_7_0_staging 

    fix nat-pmp ttl, remove unused code
    @MelvinTo
    MelvinTo authored Nov 2, 2018
    Configuration menu
    Copy the full SHA
    46ae7e3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1218 from MelvinTo/beta_7_0_staging 

    Patches to beta 7
    @MelvinTo
    MelvinTo authored Nov 2, 2018
    Configuration menu
    Copy the full SHA
    e901caa View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2018

  1. add say hello

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    007337b View commit details
    Browse the repository at this point in the history

  2. bug fix

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    40fcc34 View commit details
    Browse the repository at this point in the history

  3. add diag hello to cronjob

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    85e7857 View commit details
    Browse the repository at this point in the history

  4. add newline to brotab

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    2ce244c View commit details
    Browse the repository at this point in the history

  5. add serial info

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    bac1459 View commit details
    Browse the repository at this point in the history

  6. refine hello

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    a1e86c6 View commit details
    Browse the repository at this point in the history

  7. refine awaits

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    3c6ad28 View commit details
    Browse the repository at this point in the history

  8. add 30 seconds timeout limit to hello

    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    008628f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'beta_7_0_staging' of https://github.com/melvinto/firewalla 

     into beta_7_0_staging
    @MelvinTo
    MelvinTo committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    7c02935 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2018

  1. Merge pull request #1224 from MelvinTo/beta_7_0_staging 

    add hello feature
    @MelvinTo
    MelvinTo authored Nov 5, 2018
    Configuration menu
    Copy the full SHA
    2b1331d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1226 from firewalla/beta_7_0_staging 

    add hello feature
    @MelvinTo
    MelvinTo authored Nov 5, 2018
    Configuration menu
    Copy the full SHA
    dda42d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. merge

    @MelvinTo
    MelvinTo committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    0647418 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1231 from MelvinTo/beta_7_0_staging 

    merge from beta_6
    @MelvinTo
    MelvinTo authored Nov 6, 2018
    Configuration menu
    Copy the full SHA
    3c058fd View commit details
    Browse the repository at this point in the history

  3. revert merge

    @MelvinTo
    MelvinTo committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    244981e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1232 from MelvinTo/beta_7_0_staging 

    revert merge
    @MelvinTo
    MelvinTo authored Nov 6, 2018
    Configuration menu
    Copy the full SHA
    5874c46 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1233 from firewalla/beta_7_0_staging 

    merge from beta_6
    @MelvinTo
    MelvinTo authored Nov 6, 2018
    Configuration menu
    Copy the full SHA
    a2508ca View commit details
    Browse the repository at this point in the history

  6. Merge branch 'beta_6_0' of https://github.com/firewalla/firewalla int… 

    …o beta_7_0_staging

# Conflicts:
#	alarm/AlarmManager2.js
#	alarm/ExceptionManager.js
#	alarm/PolicyManager2.js
#	controllers/netbot.js
#	hook/DeviceHook.js
#	locales/en.json
#	net2/BroDetect.js
#	net2/ModeManager.js
#	net2/config.json
#	net2/main.js
#	scripts/fireupgrade.sh
#	sys/kickstart.js
#	util/Led.js
#	vpn/Default.txt
#	vpn/VpnManager.js
    @MelvinTo
    MelvinTo committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    a433d55 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1234 from MelvinTo/beta_7_0_staging 

    merge from beta_6
    @MelvinTo
    MelvinTo authored Nov 6, 2018
    Configuration menu
    Copy the full SHA
    cec20d0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1235 from firewalla/beta_7_0_staging 

    merge from beta_6
    @MelvinTo
    MelvinTo authored Nov 6, 2018
    Configuration menu
    Copy the full SHA
    51d1baf View commit details
    Browse the repository at this point in the history