Merge branch 'master' of https://github.com/quanglam2807/webcatalog i…

…nto feature/remove-license-190304-13-4-0 * 'master' of https://github.com/quanglam2807/webcatalog: (27 commits) 17.0.1 Fix spell checker and right click menu don't work properly (webcatalog#344) Fix website is not working properly on iOS Safari (webcatalog#341) Fix website is incorrectly reverted (webcatalog#340) 17.0.0 Replace deprecated Electron APIs (webcatalog#339) Add Brain.fm to catalog (webcatalog#338) Improve workspace reordering experience (webcatalog#336) Improve dark mode (webcatalog#337) Re-add Windows & Linux support (webcatalog#335) Upgrade to Electron 7 (webcatalog#334) 16.1.2 Fix minor spelling error (webcatalog#331) 16.1.1 Fix workspace order is not displayed correctly (webcatalog#330) 16.1.0 Add option to disable update checking on app startup (webcatalog#329) Add ability to reorder workspaces (webcatalog#328) Add option to set default download location (webcatalog#327) Set Electron as recommended browser engine (webcatalog#326) ... # Conflicts: # public/electron.js # template/public/electron.js # template/public/libs/views.js
productinfo · Oct 27, 2019 · 74c038b · 74c038b
2 parents af13367 + d0a9dbd
commit 74c038b
Show file tree

Hide file tree

Showing 153 changed files with 2,287 additions and 2,742 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ before_script:
 - yarn template:install
 - yarn lint
 script:
-- yarn dist
+- travis_wait yarn dist
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then yarn catalog:install && yarn catalog:test; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" -a "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then yarn
   catalog:install && yarn catalog:pack && yarn catalog:publish; fi

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 |macOS|Linux|Windows|
 |---|---|---|
-|[![Travis Build Status](https://travis-ci.com/quanglam2807/webcatalog.svg?branch=master)](https://travis-ci.com/quanglam2807/webcatalog)|[![Travis Build Status](https://travis-ci.com/quanglam2807/webcatalog.svg?branch=master)](https://travis-ci.com/quanglam2807/webcatalog)|[![Build status](https://ci.appveyor.com/api/projects/status/nwbv85xdiq1s69pj?svg=true)](https://ci.appveyor.com/project/quanglam2807/webcatalog)|
+|[![Travis Build Status](https://travis-ci.com/quanglam2807/webcatalog.svg?branch=master)](https://travis-ci.com/quanglam2807/webcatalog)|[![Travis Build Status](https://travis-ci.com/quanglam2807/webcatalog.svg?branch=master)](https://travis-ci.com/quanglam2807/webcatalog)|[![Build status](https://ci.appveyor.com/api/projects/status/qsd7hb1en83vilyx?svg=true)](https://ci.appveyor.com/project/quanglam2807/webcatalog)|
 
 **[WebCatalog](https://getwebcatalog.com)** - Run Web Apps like Real Apps.
 

diff --git a/build-resources/entitlements.mac.plist b/build-resources/entitlements.mac.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/catalog/apps/brain-fm/brain-fm-icon.png b/catalog/apps/brain-fm/brain-fm-icon.png
diff --git a/catalog/apps/brain-fm/brain-fm.yml b/catalog/apps/brain-fm/brain-fm.yml
@@ -0,0 +1,3 @@
+name: 'Brain.fm'
+url: 'https://brain.fm/app'
+category: Productivity
diff --git a/catalog/requirements.txt b/catalog/requirements.txt
@@ -1,3 +1,3 @@
-numpy==1.15.4
-olefile==0.46
-Pillow==5.3.0
+numpy>=1.15.4
+olefile>=0.46
+Pillow>=6.2.0
diff --git a/dist.js b/dist.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 const fs = require('fs-extra');
 const builder = require('electron-builder');
+const { notarize } = require('electron-notarize');
 
 const { Arch, Platform } = builder;
 
@@ -59,12 +60,36 @@ const opts = {
     },
     mac: {
       category: 'public.app-category.utilities',
+      hardenedRuntime: true,
+      gatekeeperAssess: false,
+      entitlements: 'build-resources/entitlements.mac.plist',
+      entitlementsInherit: 'build-resources/entitlements.mac.plist',
     },
     linux: {
       category: 'Utility',
       packageCategory: 'utils',
     },
     afterAllArtifactBuild: () => [TEMPLATE_JSON_PATH],
+    afterSign: (context) => {
+      // Only notarize app when forced in pull requests or when releasing using tag
+      const shouldNotarize = context.electronPlatformName === 'darwin'
+        && ((process.env.TRAVIS_PULL_REQUEST === 'true' && process.env.CSC_FOR_PULL_REQUEST === 'true')
+        || process.env.TRAVIS_TAG);
+      if (!shouldNotarize) return null;
+
+      console.log('Notarizing app...');
+      // https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/
+      const { appOutDir } = context;
+
+      const appName = context.packager.appInfo.productFilename;
+
+      return notarize({
+        appBundleId: 'com.webcatalog.jordan',
+        appPath: `${appOutDir}/${appName}.app`,
+        appleId: process.env.APPLE_ID,
+        appleIdPassword: process.env.APPLE_ID_PASSWORD,
+      });
+    },
   },
 };
 

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -1,10 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
     jekyll (3.6.3)
       addressable (~> 2.4)
@@ -19,37 +19,37 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-feed (0.11.0)
       jekyll (~> 3.3)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
+    jekyll-redirect-from (0.15.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
     jekyll-watch (1.5.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.1)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    minima (2.5.0)
-      jekyll (~> 3.5)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.7.3)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -66,4 +66,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   2.0.1
+   2.0.2
diff --git a/docs/_catalog/airtable.md b/docs/_catalog/airtable.md
diff --git a/docs/_catalog/amazon-drive.md b/docs/_catalog/amazon-drive.md
diff --git a/docs/_catalog/amazon-photos.md b/docs/_catalog/amazon-photos.md
diff --git a/docs/_catalog/asana.md b/docs/_catalog/asana.md
diff --git a/docs/_catalog/box.md b/docs/_catalog/box.md
diff --git a/docs/_catalog/confluence.md b/docs/_catalog/confluence.md
diff --git a/docs/_catalog/discord.md b/docs/_catalog/discord.md
diff --git a/docs/_catalog/dropbox-paper.md b/docs/_catalog/dropbox-paper.md
diff --git a/docs/_catalog/dropbox.md b/docs/_catalog/dropbox.md
diff --git a/docs/_catalog/evernote.md b/docs/_catalog/evernote.md
diff --git a/docs/_catalog/facebook.md b/docs/_catalog/facebook.md
diff --git a/docs/_catalog/fastmail.md b/docs/_catalog/fastmail.md
diff --git a/docs/_catalog/freshbooks.md b/docs/_catalog/freshbooks.md
diff --git a/docs/_catalog/gmail.md b/docs/_catalog/gmail.md
diff --git a/docs/_catalog/google-analytics.md b/docs/_catalog/google-analytics.md
diff --git a/docs/_catalog/google-calendar.md b/docs/_catalog/google-calendar.md
diff --git a/docs/_catalog/google-contacts.md b/docs/_catalog/google-contacts.md
diff --git a/docs/_catalog/google-docs.md b/docs/_catalog/google-docs.md
diff --git a/docs/_catalog/google-drive.md b/docs/_catalog/google-drive.md
diff --git a/docs/_catalog/google-hangouts.md b/docs/_catalog/google-hangouts.md
diff --git a/docs/_catalog/google-keep.md b/docs/_catalog/google-keep.md
diff --git a/docs/_catalog/google-maps.md b/docs/_catalog/google-maps.md