Skip to content

Commit

Permalink
Updated license-table
Browse files Browse the repository at this point in the history
  • Loading branch information
andris9 committed Aug 15, 2023
1 parent 31f4b1c commit b1b7dd9
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 96 deletions.
2 changes: 1 addition & 1 deletion LICENSE_EMAILENGINE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This Agreement is entered into by and between Postal Systems OÜ and you, or the

* 5.1. You may only run the Software for the benefit of the organization you represent.
* 5.2. Sharing or providing generated License Keys to third-party entities not related to your organization is strictly prohibited.
* 5.3. The Software includes and bundles open source software components. Postal Systems OÜ is not responsible for these bundled open source components, and any concerns regarding these should be addressed to the respective developers. The list of this software and the respective open source licenses for each bundled software component are provided in the 'licenses.txt' file included within the application.
* 5.3. The Software includes and bundles open source software components. Postal Systems OÜ is not responsible for these bundled open source components, and any concerns regarding these should be addressed to the respective developers. The list of this software and the respective open source licenses for each bundled software component are provided in the 'licenses.html' file included within the application.

**6. EXPIRATION OF LICENSE KEYS**

Expand Down
2 changes: 1 addition & 1 deletion data/google-crawlers.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"creationTime": "2023-07-18T23:22:53.000000",
"creationTime": "2023-08-08T22:01:12.000000",
"prefixes": [
{
"ipv6Prefix": "2001:4860:4801:2003::/64"
Expand Down
4 changes: 4 additions & 0 deletions license-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ process.stdin.on('end', () => {
for (let key of Object.keys(list)) {
let splitter = key.lastIndexOf('@');
let packageName = key.substr(0, splitter);
if (packageName === 'emailengine-app') {
continue;
}

let packageVersion = key.substr(splitter + 1);
let data = list[key];
console.log('<tr>');
Expand Down
45 changes: 0 additions & 45 deletions licenses.txt

This file was deleted.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"build-source": "rm -rf node_modules package-lock.json && npm install && npm run licenses && ./copy-static-files.sh && rm -rf node_modules package-lock.json && npm install --omit=dev && rm -rf package-lock.json && ./update-info.sh",
"build-dist": "npx pkg --compress Brotli package.json && rm -rf package-lock.json && npm install && node winconf.js",
"build-dist-fast": "npx pkg --debug package.json && rm -rf package-lock.json && npm install && node winconf.js",
"licenses": "license-checker --json | node license-table.js > static/licenses.html",
"licenses": "license-checker --excludePackages emailengine-app --json | node license-table.js > static/licenses.html",
"postinstall": "npm run licenses",
"gettext": "find ./views -name \"*.hbs\" -print0 | xargs -0 xgettext-template -L Handlebars -o translations/messages.pot --force-po && jsxgettext lib/routes-ui.js workers/api.js -j -o translations/messages.pot",
"prepare-docker": "echo \"EE_DOCKER_LEGACY=$EE_DOCKER_LEGACY\" >> system.env && cat system.env"
Expand Down Expand Up @@ -54,7 +54,7 @@
"@postalsys/email-text-tools": "2.1.0",
"@postalsys/hecks": "3.0.0-fork.3",
"@postalsys/templates": "1.0.4",
"ace-builds": "1.24.0",
"ace-builds": "1.24.1",
"base32.js": "0.1.0",
"bull-arena": "3.30.4",
"bullmq": "4.7.2",
Expand Down Expand Up @@ -140,7 +140,6 @@
"node_modules/swagger-ui-dist/**/*",
"translations/**/*",
"LICENSE_EMAILENGINE.txt",
"licenses.txt",
"help.txt",
"version-info.json"
],
Expand Down
18 changes: 12 additions & 6 deletions static/js/ace/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/js/ace/ext-language_tools.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/js/ace/worker-html.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/js/ace/worker-javascript.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/js/ace/worker-json.js

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions translations/messages.pot
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=ascii\n"
"POT-Creation-Date: 2023-07-19 19:22+0000\n"
"POT-Creation-Date: 2023-08-15 13:09+0000\n"

#: views/config/license.hbs:48
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""

#: views/redirect.hbs:1
msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
msgstr ""

#: views/unsubscribe.hbs:1
#: views/unsubscribe.hbs:79
msgid "Unsubscribe"
Expand Down Expand Up @@ -53,10 +57,6 @@ msgstr ""
msgid "Enter your email address"
msgstr ""

#: views/redirect.hbs:1
msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
msgstr ""

#: views/accounts/register/imap.hbs:11
msgid "Your name"
msgstr ""
Expand Down Expand Up @@ -189,45 +189,45 @@ msgstr ""
msgid "Standard IMAP"
msgstr ""

#: lib/routes-ui.js:549
#: lib/routes-ui.js:557
msgid "Invalid API key for OpenAI"
msgstr ""

#: lib/routes-ui.js:4167
#: lib/routes-ui.js:6117
#: lib/routes-ui.js:6128
#: lib/routes-ui.js:4193
#: lib/routes-ui.js:6143
#: lib/routes-ui.js:6154
msgid "Server hostname was not found"
msgstr ""

#: lib/routes-ui.js:4170
#: lib/routes-ui.js:6120
#: lib/routes-ui.js:6131
#: lib/routes-ui.js:4196
#: lib/routes-ui.js:6146
#: lib/routes-ui.js:6157
msgid "Invalid username or password"
msgstr ""

#: lib/routes-ui.js:4174
#: lib/routes-ui.js:6135
#: lib/routes-ui.js:4200
#: lib/routes-ui.js:6161
msgid "TLS protocol error"
msgstr ""

#: lib/routes-ui.js:5881
#: lib/routes-ui.js:5992
#: lib/routes-ui.js:6220
#: lib/routes-ui.js:5907
#: lib/routes-ui.js:6018
#: lib/routes-ui.js:6246
msgid "Signature validation failed"
msgstr ""

#: lib/routes-ui.js:5918
#: lib/routes-ui.js:5958
#: lib/routes-ui.js:8595
#: lib/routes-ui.js:5944
#: lib/routes-ui.js:5984
#: lib/routes-ui.js:8621
msgid "Failed to validate request arguments"
msgstr ""

#: lib/routes-ui.js:6055
#: lib/routes-ui.js:6306
#: lib/routes-ui.js:6081
#: lib/routes-ui.js:6332
msgid "Failed to process account"
msgstr ""

#: lib/routes-ui.js:8695
#: lib/routes-ui.js:8728
#: lib/routes-ui.js:8721
#: lib/routes-ui.js:8754
msgid "Failed to process request"
msgstr ""
13 changes: 1 addition & 12 deletions workers/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const marked = require('marked');

const fs = require('fs');
const eulaText = marked.parse(
fs.readFileSync(Path.join(__dirname, '..', 'LICENSE_EMAILENGINE.txt'), 'utf-8').replace(/\blicenses\.txt\b/g, '[licenses.txt](/licenses.html)')
fs.readFileSync(Path.join(__dirname, '..', 'LICENSE_EMAILENGINE.txt'), 'utf-8').replace(/\blicenses\.html\b/g, '[licenses.html](/licenses.html)')
);

const {
Expand Down Expand Up @@ -973,17 +973,6 @@ When making API calls remember that requests against the same account are queued
}
});

server.route({
method: 'GET',
path: '/licenses.txt',
handler: {
file: { path: pathlib.join(__dirname, '..', 'licenses.txt'), confine: false }
},
options: {
auth: false
}
});

server.route({
method: 'GET',
path: '/LICENSE.txt',
Expand Down

0 comments on commit b1b7dd9

Please sign in to comment.