瀏覽代碼

Updated readme

Will Browning 5 年之前
父節點
當前提交
7b0ac3aed4
共有 4 個文件被更改,包括 49 次插入38 次删除
  1. 7 2
      README.md
  2. 5 5
      composer.lock
  3. 36 30
      package-lock.json
  4. 1 1
      package.json

+ 7 - 2
README.md

@@ -37,7 +37,7 @@ Here are a few reasons I can think of:
 * Bring your own GPG/OpenPGP key to encrypt your forwarded emails (and the option to replace subjects)
 * Bring your own GPG/OpenPGP key to encrypt your forwarded emails (and the option to replace subjects)
 * No adverts
 * No adverts
 * No analytics or trackers (just server access logs)
 * No analytics or trackers (just server access logs)
-* No third party content (excluding stripe on the subscription page)
+* No third party content (excluding stripe.js on the subscription page)
 * Open-source application code
 * Open-source application code
 * No limitation on the number of aliases that can be created
 * No limitation on the number of aliases that can be created
 * Generous monthly bandwidth
 * Generous monthly bandwidth
@@ -72,6 +72,11 @@ If you're concerned that your aliases are all linked by your username e.g. @john
 2. You can add additional usernames and separate your aliases under your these. e.g. you could have one username for personal stuff, another for work, another for hobbies etc.
 2. You can add additional usernames and separate your aliases under your these. e.g. you could have one username for personal stuff, another for work, another for hobbies etc.
 
 
 
 
+#### **Where is the server located?**
+
+The server is located in Amsterdam, Netherlands with [Greenhost.net](https://greenhost.net/). Greenhost focuses greatly on privacy and security and their servers run entirely on Dutch wind energy.
+
+
 #### **What if I don't trust you?**
 #### **What if I don't trust you?**
 
 
 It's good to keep your guard up when online so you should never trust anyone 100%. I'll try my best to be as honest and transparent as I can but if you still aren't convinced you can always just fire up your own server and self-host this application. You'll need to know about server administration and PHP. I'll be adding more details on how to do this soon.
 It's good to keep your guard up when online so you should never trust anyone 100%. I'll try my best to be as honest and transparent as I can but if you still aren't convinced you can always just fire up your own server and self-host this application. You'll need to know about server administration and PHP. I'll be adding more details on how to do this soon.
@@ -130,7 +135,7 @@ The following is in place to help prevent spam:
 
 
 #### **What do you use to do DNS lookups on domain names?**
 #### **What do you use to do DNS lookups on domain names?**
 
 
-The server is running a local DNS caching server to improve the speed of queries. Cloudflare's (1.1.1.1) is used as a fallback.
+The server is running a local DNS caching server to improve the speed of queries. DNS.WATCH resolvers are used as a fallback.
 
 
 
 
 #### **Is there a limit to how many emails I can forward?**
 #### **Is there a limit to how many emails I can forward?**

+ 5 - 5
composer.lock

@@ -1295,16 +1295,16 @@
         },
         },
         {
         {
             "name": "monolog/monolog",
             "name": "monolog/monolog",
-            "version": "1.24.0",
+            "version": "1.25.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
+                "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
+                "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -1369,7 +1369,7 @@
                 "logging",
                 "logging",
                 "psr-3"
                 "psr-3"
             ],
             ],
-            "time": "2018-11-05T09:00:11+00:00"
+            "time": "2019-09-06T13:49:17+00:00"
         },
         },
         {
         {
             "name": "nesbot/carbon",
             "name": "nesbot/carbon",

+ 36 - 30
package-lock.json

@@ -1954,6 +1954,11 @@
             "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
             "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
             "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
             "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         },
+        "collect.js": {
+            "version": "4.16.6",
+            "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.16.6.tgz",
+            "integrity": "sha512-Y0mR+JAWmUmA7HOByjdtc4dnQF/PRl4ap3jpG7RpC5vJjMmjDxBC8SFtp0s0vcRKoY+9WhJG0HUk1H2ze0Ao7A=="
+        },
         "collection-visit": {
         "collection-visit": {
             "version": "1.0.0",
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
             "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -2498,9 +2503,9 @@
             }
             }
         },
         },
         "cyclist": {
         "cyclist": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-            "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+            "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
         },
         },
         "date-fns": {
         "date-fns": {
             "version": "1.30.1",
             "version": "1.30.1",
@@ -5004,9 +5009,9 @@
             "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
             "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         },
         },
         "laravel-mix": {
         "laravel-mix": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-4.1.2.tgz",
-            "integrity": "sha512-nA+JME+59hWI5u+r3VfPfmpUj8CxlNmNsvslBOUtUwRc1K2Wq55uAPUtTLgAp7n5JngF3O7qFN3LcTCVO/SpZQ==",
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-4.1.4.tgz",
+            "integrity": "sha512-fpFNpPyYAdeZ5mozlKbHpw+tCiRFUCCdSsK/D2+yYhlyIEbzPcAe4ar5cjeT33TnDNiKXSS42cB58yUSW5Y5tg==",
             "requires": {
             "requires": {
                 "@babel/core": "^7.2.0",
                 "@babel/core": "^7.2.0",
                 "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
                 "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
@@ -5019,6 +5024,7 @@
                 "babel-merge": "^2.0.1",
                 "babel-merge": "^2.0.1",
                 "chokidar": "^2.0.3",
                 "chokidar": "^2.0.3",
                 "clean-css": "^4.1.3",
                 "clean-css": "^4.1.3",
+                "collect.js": "^4.12.8",
                 "concatenate": "0.0.2",
                 "concatenate": "0.0.2",
                 "css-loader": "^1.0.1",
                 "css-loader": "^1.0.1",
                 "dotenv": "^6.2.0",
                 "dotenv": "^6.2.0",
@@ -5031,7 +5037,7 @@
                 "html-loader": "^0.5.5",
                 "html-loader": "^0.5.5",
                 "imagemin": "^6.0.0",
                 "imagemin": "^6.0.0",
                 "img-loader": "^3.0.0",
                 "img-loader": "^3.0.0",
-                "lodash": "^4.17.5",
+                "lodash": "^4.17.15",
                 "md5": "^2.2.1",
                 "md5": "^2.2.1",
                 "optimize-css-assets-webpack-plugin": "^5.0.1",
                 "optimize-css-assets-webpack-plugin": "^5.0.1",
                 "postcss-loader": "^3.0.0",
                 "postcss-loader": "^3.0.0",
@@ -5458,9 +5464,9 @@
             }
             }
         },
         },
         "loglevel": {
         "loglevel": {
-            "version": "1.6.3",
-            "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
-            "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA=="
+            "version": "1.6.4",
+            "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
+            "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="
         },
         },
         "loose-envify": {
         "loose-envify": {
             "version": "1.4.0",
             "version": "1.4.0",
@@ -5817,9 +5823,9 @@
             }
             }
         },
         },
         "node-forge": {
         "node-forge": {
-            "version": "0.7.5",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
-            "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="
+            "version": "0.8.2",
+            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz",
+            "integrity": "sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg=="
         },
         },
         "node-libs-browser": {
         "node-libs-browser": {
             "version": "2.2.1",
             "version": "2.2.1",
@@ -6212,11 +6218,11 @@
             "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
             "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
         },
         },
         "parallel-transform": {
         "parallel-transform": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-            "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+            "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
             "requires": {
             "requires": {
-                "cyclist": "~0.2.2",
+                "cyclist": "^1.0.1",
                 "inherits": "^2.0.3",
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.1.5"
                 "readable-stream": "^2.1.5"
             }
             }
@@ -6379,9 +6385,9 @@
             "integrity": "sha512-lvCF85D4e8whd0nN32D8FqKwwkk7nYUI3Ku8UAEx4Z1reomu75dv5evRUTZNaj1EalxxWNXiNl0EHRq36fG8WA=="
             "integrity": "sha512-lvCF85D4e8whd0nN32D8FqKwwkk7nYUI3Ku8UAEx4Z1reomu75dv5evRUTZNaj1EalxxWNXiNl0EHRq36fG8WA=="
         },
         },
         "portfinder": {
         "portfinder": {
-            "version": "1.0.23",
-            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz",
-            "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==",
+            "version": "1.0.24",
+            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
+            "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
             "requires": {
             "requires": {
                 "async": "^1.5.2",
                 "async": "^1.5.2",
                 "debug": "^2.2.0",
                 "debug": "^2.2.0",
@@ -7788,11 +7794,11 @@
             "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
             "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
         },
         },
         "selfsigned": {
         "selfsigned": {
-            "version": "1.10.4",
-            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
-            "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+            "version": "1.10.6",
+            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.6.tgz",
+            "integrity": "sha512-i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w==",
             "requires": {
             "requires": {
-                "node-forge": "0.7.5"
+                "node-forge": "0.8.2"
             }
             }
         },
         },
         "semver": {
         "semver": {
@@ -7849,9 +7855,9 @@
             }
             }
         },
         },
         "serialize-javascript": {
         "serialize-javascript": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.0.tgz",
-            "integrity": "sha512-UkGlcYMtw4d9w7YfCtJFgdRTps8N4L0A48R+SmcGL57ki1+yHwJXnalk5bjgrw+ljv6SfzjzPjhohod2qllg/Q=="
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+            "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="
         },
         },
         "serve-index": {
         "serve-index": {
             "version": "1.9.1",
             "version": "1.9.1",
@@ -9238,9 +9244,9 @@
             }
             }
         },
         },
         "webpack-cli": {
         "webpack-cli": {
-            "version": "3.3.7",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.7.tgz",
-            "integrity": "sha512-OhTUCttAsr+IZSMVwGROGRHvT+QAs8H6/mHIl4SvhAwYywjiylYjpwybGx7WQ9Hkb45FhjtsymkwiRRbGJ1SZQ==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz",
+            "integrity": "sha512-RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==",
             "requires": {
             "requires": {
                 "chalk": "2.4.2",
                 "chalk": "2.4.2",
                 "cross-spawn": "6.0.5",
                 "cross-spawn": "6.0.5",

+ 1 - 1
package.json

@@ -14,7 +14,7 @@
         "axios": "^0.18.1",
         "axios": "^0.18.1",
         "cross-env": "^5.2.1",
         "cross-env": "^5.2.1",
         "dayjs": "^1.8.16",
         "dayjs": "^1.8.16",
-        "laravel-mix": "^4.1.2",
+        "laravel-mix": "^4.1.4",
         "laravel-mix-purgecss": "^4.1.0",
         "laravel-mix-purgecss": "^4.1.0",
         "lodash": "^4.17.15",
         "lodash": "^4.17.15",
         "portal-vue": "^2.1.6",
         "portal-vue": "^2.1.6",