Merge branch 'master' into develop

Author: jackycute

deployments/docker-compose.yml

@@ -11,10 +11,10 @@ services:
     restart: always
   codimd:
     # you can use image or custom build below
-    # image: nabo.codimd.dev/hackmdio/hackmd:1.4.0
-    build:
-      context: ..
-      dockerfile: ./deployments/Dockerfile
+    image: nabo.codimd.dev/hackmdio/hackmd:2.0.0
+    # build:
+    #   context: ..
+    #   dockerfile: ./deployments/Dockerfile
     environment:
       - CMD_DB_URL=postgres://codimd:change_password@database/codimd
       - CMD_USECDN=false

lib/csp.js

@@ -16,6 +16,10 @@ var defaultDirectives = {
   connectSrc: ['*']
 }
 
+var dropboxDirectives = {
+  scriptSrc: ['https://www.dropbox.com']
+}
+
 var cdnDirectives = {
   scriptSrc: ['https://cdnjs.cloudflare.com', 'https://cdn.jsdelivr.net', 'https://cdn.mathjax.org'],
   styleSrc: ['https://cdnjs.cloudflare.com', 'https://cdn.jsdelivr.net', 'https://fonts.googleapis.com'],
@@ -37,6 +41,7 @@ CspStrategy.computeDirectives = function () {
   mergeDirectives(directives, config.csp.directives)
   mergeDirectivesIf(config.csp.addDefaults, directives, defaultDirectives)
   mergeDirectivesIf(config.useCDN, directives, cdnDirectives)
+  mergeDirectivesIf(config.dropbox && config.dropbox.appKey, directives, dropboxDirectives)
   mergeDirectivesIf(config.csp.addDisqus, directives, disqusDirectives)
   mergeDirectivesIf(config.csp.addGoogleAnalytics, directives, googleAnalyticsDirectives)
   if (!areAllInlineScriptsAllowed(directives)) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "codimd",
-  "version": "1.4.1",
+  "version": "2.0.0",
   "description": "Realtime collaborative markdown notes on all platforms.",
   "keywords": [
     "Collaborative",

package.json

@@ -1,6 +1,46 @@
 Release Notes
 ===
 
+<i class="fa fa-tag"></i> 2.0.0 Urocissa caerulea <i class="fa fa-clock-o"></i> 2020-03-02
+---
+
+<div style="text-align: center; margin-bottom: 1em;">
+  <img src="https://i.imgur.com/oRbNzRm.jpg" width="600">
+  <small style="display: block;">Urocissa caerulea</small>
+</div>
+
+> The Taiwan blue magpie (Urocissa caerulea), also called the Taiwan magpie, Formosan blue magpie , or the "long-tailed mountain lady", is a species of bird of the crow family. It is endemic to Taiwan.
+> 
+> \- Wikipedia [Taiwan blue magpie](en.wikipedia.org/wiki/Taiwan_blue_magpie)
+
+In the past few months, we delivered not only a bunch of awesome features but also some critical bug fixes. Moreover, we refactored CodiMD's backend and started to write new tests.
+
+To make it easier to maintain, we dropped legacy code, reorganize the repository, and add new documentation. For these reasons, we decided to make a huge leap toward version 2.0.0.
+
+Here are the highlights coming from version 2.0.0:
+
+- [Multilanguage spellchecker][multilanguage-spellchecker]
+- [Customize editor color schemes][customize-editor-color-schemes]
+- [Export note with Pandoc][support-pandoc-export]
+- [Embed Geolocation data][embedding-geolocation-data]
+- [Version checking][auto-version-check-for-site-admin]
+- [Meet the new CodiMD CLI][meet-the-new-codimd-cli]
+- [Refreshed Documentation structure and new Markdown guides](refreshed-documentation-structure-and-new-markdown-guides)
+
+It's our pleasure to announce CodiMD `2.0.0`. Enjoy as always :heartpulse:.
+
+[Check out the complete release note][v2_0_0]. Thank you CodiMD community and all our contributors. ❤️
+
+[multilanguage-spellchecker]: https://hackmd.io/@codimd/v2_0_0#Multilanguage-spellchecker
+[customize-editor-color-schemes]: https://hackmd.io/@codimd/v2_0_0#Customize-editor-color-schemes
+[support-pandoc-export]: https://hackmd.io/@codimd/v2_0_0#Support-Pandoc-export
+[embedding-geolocation-data]: https://hackmd.io/@codimd/v2_0_0#Embedding-Geolocation-data
+[auto-version-check-for-site-admin]: https://hackmd.io/@codimd/v2_0_0#Auto-version-check-for-site-admin
+[meet-the-new-codimd-cli]: https://hackmd.io/@codimd/v2_0_0#Meet-the-new-CodiMD-CLI
+[refreshed-documentation-structure-and-new-markdown-guides]: https://hackmd.io/@codimd/v2_0_0#Refreshed-Documentation-structure-and-new-Markdown-guides
+
+[v2_0_0]: https://hackmd.io/@codimd/release-notes/%2F%40codimd%2Fv2_0_0
+
 <i class="fa fa-tag"></i> 1.4.1 <i class="fa fa-clock-o"></i> 2019-12-13
 ---
 
@@ -26,8 +66,8 @@ Release Notes
 ---
 
 <div style="text-align: center; margin-bottom: 1em;">
-    <img src="https://upload.wikimedia.org/wikipedia/commons/6/60/Mikado_Pheasant_398.jpg" width="300">
-<small style="display: block;">Mikado Pheasant, photo credits to <a href="https://zh.wikipedia.org/wiki/File:Mikado_Pheasant_398.jpg">Snowyowls from wikipedia</a></small>
+  <img src="https://upload.wikimedia.org/wikipedia/commons/6/60/Mikado_Pheasant_398.jpg" width="300">
+  <small style="display: block;">Mikado Pheasant, photo credits to <a href="https://zh.wikipedia.org/wiki/File:Mikado_Pheasant_398.jpg">Snowyowls from wikipedia</a></small>
 </div>
 
 Starting from version 1.4.0, we'll pick one species from [_the endemic species of Taiwan_](https://en.wikipedia.org/wiki/List_of_endemic_species_of_Taiwan) as version name. Is there anyone still remember we've once used type of coffee as our version name? It's time to revive that good convention, but this time we don't need coffee to stay up all night. 💤