fab7d60373
Merge pull request #960 from unseen1980/patch-1
...
Ad blocker with armbian and orange pi
2016-12-04 14:20:48 -05:00
b4e5358145
Ad blocker with armbian and orange pi
2016-12-04 18:40:01 +00:00
486db1e797
Merge pull request #956 from trinapicot/development
...
Add check for lighty.conf before trying to move it
2016-12-03 17:11:16 +00:00
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
2016-12-03 00:32:37 +01:00
870454330d
Add check for lighty.conf before trying to move it
2016-12-02 13:54:11 -07:00
509cfd15f2
Simplified EscapeRegexp()
2016-12-02 14:17:34 +01:00
2061daa902
Don't forget to escape also the slash "/"
2016-12-02 14:11:17 +01:00
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
2016-12-02 14:08:54 +01:00
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
2016-12-02 12:57:04 +01:00
d8912fd0a7
Merge pull request #952 from pi-hole/fix/exit_codes
...
Fix/exit codes
2016-12-01 18:24:30 -05:00
925c80edd4
Catch more 1's
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-01 15:10:06 -08:00
2f6afd375b
Merge pull request #942 from pi-hole/PromoFaux-patch-2
...
Update gravity.sh
2016-12-01 14:00:38 -08:00
d92646324c
Double worded
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-01 13:59:58 -08:00
c9fe62a691
Clarify what the command is doing.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-01 13:58:40 -08:00
cb52ad3ba3
Revert other branch chages.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-01 13:31:35 -08:00
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-01 12:21:08 -08:00
1c64f1d0cf
Merge pull request #940 from pi-hole/PromoFaux-patch-1
...
Update .pullapprove.yml
2016-11-22 17:20:57 -05:00
48f4f44289
Merge pull request #944 from pi-hole/feature/Issue_template
...
Update ISSUE_TEMPLATE.md
2016-11-22 16:23:36 -05:00
80c19cbf7d
Update ISSUE_TEMPLATE.md
2016-11-22 12:05:19 -08:00
c97cfde9f9
Update gravity.sh
...
Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`
2016-11-21 22:51:59 +00:00
7b26b308ad
No need for echo and pipe here!
2016-11-21 15:50:05 +01:00
4c10634d85
Convert domain names to lower case before checking validity of the domain
2016-11-21 15:49:11 +01:00
3ba7d7640f
Merge pull request #933 from DL6ER/delayedreactivation
...
Add possiblity for delayed reactivation of blocking
2016-11-21 08:26:26 -05:00
907995a221
Update .pullapprove.yml
...
reflect new approvers team
2016-11-21 13:13:39 +00:00
7bf0985a57
Extended help text of main pihole command
2016-11-21 11:30:34 +01:00
3ca21d8c8a
Merge pull request #931 from pi-hole/update_tests
...
Add piholeDebug to CI Travis tests
2016-11-20 15:51:14 -08:00
a3a87c8883
Merge pull request #937 from pi-hole/feature/README
...
README updates
2016-11-20 15:23:49 -08:00
de4401823e
Merge pull request #924 from DL6ER/webpage.sh
...
Add webpage.sh
2016-11-20 21:43:44 +00:00
3ee10f5983
Merge pull request #938 from DL6ER/another_done
...
Another done
2016-11-20 19:21:58 +00:00
0fc8ac8d4d
Codacy Badge for Master
2016-11-20 09:44:39 -08:00
41bb53a29f
Remove CC Badge, Link Vortex to Discourse
2016-11-20 09:42:45 -08:00
cdee6d55d3
Minor change
2016-11-20 17:40:22 +01:00
e5a1afaa26
Added another missing "done"
2016-11-20 17:31:27 +01:00
f50cbe74cb
Changed -web (webpage) to -a (admin)
2016-11-20 15:15:27 +01:00
5dbbf91917
Link to AdminLTE
2016-11-19 15:08:35 -08:00
7424a29960
Update wiki link
2016-11-19 15:03:32 -08:00
eb22ca2467
Reset Code Stylings to group defalut
2016-11-19 15:03:12 -08:00
ddbcbe5458
Merge in git method instructions from other branch.
...
Move some bits around.
Start adding in logos to media links
More logos
Add BC logo
Change static images to use Asset server
Add and center control panel image
2016-11-19 15:01:56 -08:00
6e54cfd2ac
Further refinements.
...
Trying to find a good flow for information and layout.
2016-11-19 14:57:49 -08:00
fc3d4b3def
Update README.md
2016-11-19 14:57:38 -08:00
df55b2c516
relocate and wordsmith donations
2016-11-19 14:57:29 -08:00
4d9fb57e22
above the fold verbage
...
Try to let the user know in two sentences what Pi-hole can do for them.
Also, linked to Discourse hw/sw requirements.
fixed DO referral code.
2016-11-19 14:57:02 -08:00
3ed08b5c39
Add New Logo and other changes
...
Remove extra break
Center Badges and move DO Slug
Bump Vortex up a bit.
Last change for now.
Move things around a bit.
Pull overlay off black hole image
2016-11-19 14:55:52 -08:00
d715471426
Center Global
2016-11-19 14:47:46 -08:00
486a4929da
Add click instructions
2016-11-19 14:46:30 -08:00
aacddb745b
Swap Global Image
...
Global image, no berry, no overlay
2016-11-19 14:46:30 -08:00
924f499303
Add DO Slug and Copy to README
2016-11-19 14:46:30 -08:00
e863a200e8
Remove CC badge
2016-11-19 14:44:43 -08:00
bb7f8ae69d
Add git clone method to installers
2016-11-19 14:44:13 -08:00
33b6fe72da
Extended help text
2016-11-19 21:57:42 +01:00
