Adam Warner 61a40c1b43 merge devel into 4.3.2 And Resolve merge conflicts ...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

2019-09-22 01:16:44 +01:00

..

database_migration

Merge branch 'development' into new/whitelist-regex-support

2019-08-22 14:19:51 +02:00

chronometer.sh

Improve argument handling

2019-04-27 14:05:04 -07:00

COL_TABLE

Revert #2282

2018-07-27 00:27:06 +01:00

list.sh

Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild"

2019-08-05 21:10:52 +02:00

piholeARPTable.sh

Also flush network_addresses table

2019-06-15 09:15:12 +02:00

piholeCheckout.sh

Merge branch 'development' into release/v4.3

2019-05-18 13:18:14 -07:00

piholeDebug.sh

Print timestamps in local time zone of the Pi-hole.

2019-08-23 10:09:52 +02:00

piholeLogFlush.sh

Incorporates changes requested by @Mcat12

2019-05-01 11:20:26 +02:00

query.sh

merge devel into 4.3.2 And Resolve merge conflicts

2019-09-22 01:16:44 +01:00

setupLCD.sh

Space/Tab setupLCD.sh

2018-07-20 13:17:10 -07:00

update.sh

Don't warn if user is on development as this branch is constantly updated

2019-03-02 16:40:59 +01:00

updatecheck.sh

Merge branch 'development' into release/v4.3

2019-05-18 13:18:14 -07:00

version.sh

Use source instead of dot for setupVars

2018-12-27 16:37:10 -05:00

webpage.sh

merge devel into 4.3.2 And Resolve merge conflicts

2019-09-22 01:16:44 +01:00

wildcard_regex_converter.sh

Fix permissive regex

2018-07-31 22:16:40 -04:00