From 4dada5b84dfcf0546ed54f50b5cdb81fc9fc6a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=A4usler?= Date: Wed, 5 Jun 2019 21:39:23 +0200 Subject: [PATCH] Drop support for portable Windows binary (#1065) * Dropped support for portable Windows binary * Update documentation --- .github/CHANGELOG.md | 1 + .github/CONTRIBUTING.md | 6 ++-- .github/ROADMAP.md | 16 ++++----- LICENSE | 4 +-- README.md | 34 +++++++++--------- {doc => docs}/APPLICATION_DATA_DIRECTORY.md | 0 {doc => docs}/BLOCK_ADDITION_PROPERTY.md | 0 {doc => docs}/CLI.md | 0 {doc => docs}/DEBUGGING.md | 0 .../IMAGE_UPLOADER_CONFIGRATION.md | 2 +- {doc => docs}/KEYBINDINGS.md | 0 {doc => docs}/LINUX.md | 0 {doc => docs}/PREFERENCE.md | 0 {doc => docs}/RELEASE.md | 0 {doc => docs}/brew-cask.gif | Bin {doc => docs}/doutu.jpg | Bin {doc => docs}/focus.gif | Bin {doc => docs}/i18n/french.md | 14 ++++---- {doc => docs}/i18n/ja.md | 22 ++++++------ {doc => docs}/i18n/ko.md | 13 +++---- {doc => docs}/i18n/pl.md | 10 +++--- {doc => docs}/i18n/pt.md | 14 ++++---- {doc => docs}/i18n/spanish.md | 14 ++++---- {doc => docs}/i18n/tr.md | 16 +++++---- {doc => docs}/i18n/zh_cn.md | 12 ++++--- {doc => docs}/marktext.png | Bin {doc => docs}/source.gif | Bin {doc => docs}/sponsor/qordoba.png | Bin {doc => docs}/sponsor/readme.png | Bin {doc => docs}/themeImages/cadmium-light.png | Bin {doc => docs}/themeImages/dark.png | Bin {doc => docs}/themeImages/graphite-light.png | Bin {doc => docs}/themeImages/materal-dark.png | Bin {doc => docs}/themeImages/one-dark.png | Bin {doc => docs}/themeImages/ulysses-light.png | Bin {doc => docs}/typewriter.gif | Bin {doc => docs}/wip/README.md | 0 {doc => docs}/wip/ipc.md | 0 {doc => docs}/wip/renderer/editor.md | 0 package.json | 9 +---- src/renderer/components/about/index.vue | 3 +- 41 files changed, 100 insertions(+), 90 deletions(-) rename {doc => docs}/APPLICATION_DATA_DIRECTORY.md (100%) rename {doc => docs}/BLOCK_ADDITION_PROPERTY.md (100%) rename {doc => docs}/CLI.md (100%) rename {doc => docs}/DEBUGGING.md (100%) rename doc/Image Uploader Configration.md => docs/IMAGE_UPLOADER_CONFIGRATION.md (91%) rename {doc => docs}/KEYBINDINGS.md (100%) rename {doc => docs}/LINUX.md (100%) rename {doc => docs}/PREFERENCE.md (100%) rename {doc => docs}/RELEASE.md (100%) rename {doc => docs}/brew-cask.gif (100%) rename {doc => docs}/doutu.jpg (100%) rename {doc => docs}/focus.gif (100%) rename {doc => docs}/i18n/french.md (93%) rename {doc => docs}/i18n/ja.md (90%) rename {doc => docs}/i18n/ko.md (93%) rename {doc => docs}/i18n/pl.md (94%) rename {doc => docs}/i18n/pt.md (93%) rename {doc => docs}/i18n/spanish.md (93%) rename {doc => docs}/i18n/tr.md (93%) rename {doc => docs}/i18n/zh_cn.md (93%) rename {doc => docs}/marktext.png (100%) rename {doc => docs}/source.gif (100%) rename {doc => docs}/sponsor/qordoba.png (100%) rename {doc => docs}/sponsor/readme.png (100%) rename {doc => docs}/themeImages/cadmium-light.png (100%) rename {doc => docs}/themeImages/dark.png (100%) rename {doc => docs}/themeImages/graphite-light.png (100%) rename {doc => docs}/themeImages/materal-dark.png (100%) rename {doc => docs}/themeImages/one-dark.png (100%) rename {doc => docs}/themeImages/ulysses-light.png (100%) rename {doc => docs}/typewriter.gif (100%) rename {doc => docs}/wip/README.md (100%) rename {doc => docs}/wip/ipc.md (100%) rename {doc => docs}/wip/renderer/editor.md (100%) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 434e1457..b55f5c91 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -3,6 +3,7 @@ **:warning:Breaking Changes:** - `preference.md` is deprecated and no longer supported. Please use the GUI or edit `preferences.json` manually. +- Removed portable Windows executable. NSIS installer can now be used to install per-user or machine wide. **:cactus:Feature** diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1544b4e7..a59c2ea0 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Mark Text Contributing Guide -Hi, I'm really excited that you are interested in contributing to Mark Text :tada:. Before submitting your contribution though, please make sure to take a moment and read through the following guidelines. +We are really excited that you are interested in contributing to Mark Text :tada:. Before submitting your contribution though, please make sure to take a moment and read through the following guidelines. - [Code of Conduct](https://github.com/marktext/marktext/blob/master/.github/CODE_OF_CONDUCT.md) - [Issue Reporting Guidelines](#issue-reporting-guidelines) @@ -80,8 +80,10 @@ Before you can get started developing, you need set up your build environment: - libx11 (dev) - libxkbfile (dev) +- libsecret (dev) On Debian-based Linux: `sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev` + On Red Hat-based Linux: `sudo dnf install libx11-devel libxkbfile-devel libsecret-devel` **Let's build:** @@ -120,7 +122,7 @@ For more scripts please see `package.json`. - `package.json`: Project settings - `build`: Contains generated binaries - `dist`: Build files for deployment -- `doc`: Documentation and assets +- `docs`: Documentation and assets - `node_modules`: Dependencies - `src`: Mark Text source code - `static`: Application assets (images, themes, etc) diff --git a/.github/ROADMAP.md b/.github/ROADMAP.md index 2bade600..884da34a 100644 --- a/.github/ROADMAP.md +++ b/.github/ROADMAP.md @@ -22,31 +22,29 @@ - [x] Add More Themes. -- [ ] User settings page, color theme, editor settings, markdown preferences, security settings, etc. +- [x] User settings page, color theme, editor settings, markdown preferences, security settings, etc. - [x] Different file can be referenced, jumped, and opened via a browser. -- [ ] Print page settings. +- [ ] PDF/Print page settings. -- [ ] Support for the selection of different style themes when exporting PDFs and HTML. +- [ ] Support for the selection of different style themes when exporting PDFs and HTML. - [ ] Support for more format output and input. -- [ ] When you open the software, the last edited file or folder are automatically opened. +- [ ] Sessions, so that the last edited files or folder are automatically opened. - [ ] Picture management function, uploaded pictures for unified management, image management will probably have these functions, local pictures, uploaded pictures, search pictures and upload. -- [ ] Support slideshow function, we can write Markdown directly, then Markdown will automatically generate slideshows, transition animations, thumbnails, preview playback. - - [ ] Add a paragraph menu. Add paragraphs, delete, copy, and more. -- [ ] Support `charts`, `flowcharts`, `Gantt charts`, etc. +- [x] Support `charts`, `flowcharts`, `Gantt charts`, etc. - [ ] When entering mathematical formulas, smart tips, support more mathematical, chemical and other formulas. -- [ ] spell checking. +- [ ] Spell checking. -- [ ] novice tutorial for newbies or new features. +- [ ] Novice tutorial for newbies or new features. - [ ] More custom markdown syntax, `subscript` and `superscript` etc. diff --git a/LICENSE b/LICENSE index d026f6e5..c7f81b13 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ MIT License -Copyright (c) 2017-Present Luo Ran -Copyright (c) 2018 Mark Text Contributors +Copyright (c) 2017-present Luo Ran +Copyright (c) 2018-present Mark Text Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 964cda70..c9fa2d79 100644 --- a/README.md +++ b/README.md @@ -71,28 +71,28 @@
Translations: - + :cn: - + :poland: - + :jp: - + :fr: - + :tr: - + :es: - + :portugal: - + :kr:
@@ -121,8 +121,8 @@ Sponsored by Patreon, it will be directly sponsored to Luo Ran (@jocs), who crea **Platinum Sponsors** - - + + @@ -153,7 +153,7 @@ Sponsored by Patreon, it will be directly sponsored to Luo Ran (@jocs), who crea ## Screenshot -![](https://github.com/marktext/marktext/blob/master/doc/marktext.png?raw=true) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.png?raw=true) ## Features @@ -169,17 +169,17 @@ Sponsored by Patreon, it will be directly sponsored to Luo Ran (@jocs), who crea | Cadmium Light | Dark | |:----------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/themeImages/cadmium-light.png?raw=true) | ![](https://github.com/marktext/marktext/blob/master/doc/themeImages/dark.png?raw=true) | +| ![](https://github.com/marktext/marktext/blob/master/docs/themeImages/cadmium-light.png?raw=true) | ![](https://github.com/marktext/marktext/blob/master/docs/themeImages/dark.png?raw=true) | | Graphite Light | Materal Dark | -| ![](https://github.com/marktext/marktext/blob/master/doc/themeImages/graphite-light.png?raw=true) | ![](https://github.com/marktext/marktext/blob/master/doc/themeImages/materal-dark.png?raw=true) | +| ![](https://github.com/marktext/marktext/blob/master/docs/themeImages/graphite-light.png?raw=true) | ![](https://github.com/marktext/marktext/blob/master/docs/themeImages/materal-dark.png?raw=true) | | Ulysses Light | One Dark | -| ![](https://github.com/marktext/marktext/blob/master/doc/themeImages/ulysses-light.png?raw=true) | ![](https://github.com/marktext/marktext/blob/master/doc/themeImages/one-dark.png?raw=true) | +| ![](https://github.com/marktext/marktext/blob/master/docs/themeImages/ulysses-light.png?raw=true) | ![](https://github.com/marktext/marktext/blob/master/docs/themeImages/one-dark.png?raw=true) |

:smile_cat:Edit modes:dog:

| Source Code | Typewriter | Focus | |:------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------:| -| ![](https://raw.githubusercontent.com/marktext/marktext/master/doc/source.gif) | ![](https://raw.githubusercontent.com/marktext/marktext/master/doc/typewriter.gif) | ![](https://raw.githubusercontent.com/marktext/marktext/master/doc/focus.gif) | +| ![](https://raw.githubusercontent.com/marktext/marktext/master/docs/source.gif) | ![](https://raw.githubusercontent.com/marktext/marktext/master/docs/typewriter.gif) | ![](https://raw.githubusercontent.com/marktext/marktext/master/docs/focus.gif) | ## Why write another editor? @@ -207,11 +207,11 @@ brew cask install mark-text #### Windows -Simply download and install Mark Text via setup wizard (`marktext-setup-%version%.exe`) or download a portable version `marktext-%version%.exe`. +Simply download and install Mark Text via setup wizard (`marktext-setup-%version%.exe`) and choose whether to install per-user or machine wide. #### Linux -Please follow the [Linux installation instructions](https://github.com/marktext/marktext/blob/master/doc/LINUX.md). +Please follow the [Linux installation instructions](https://github.com/marktext/marktext/blob/master/docs/LINUX.md). #### Other diff --git a/doc/APPLICATION_DATA_DIRECTORY.md b/docs/APPLICATION_DATA_DIRECTORY.md similarity index 100% rename from doc/APPLICATION_DATA_DIRECTORY.md rename to docs/APPLICATION_DATA_DIRECTORY.md diff --git a/doc/BLOCK_ADDITION_PROPERTY.md b/docs/BLOCK_ADDITION_PROPERTY.md similarity index 100% rename from doc/BLOCK_ADDITION_PROPERTY.md rename to docs/BLOCK_ADDITION_PROPERTY.md diff --git a/doc/CLI.md b/docs/CLI.md similarity index 100% rename from doc/CLI.md rename to docs/CLI.md diff --git a/doc/DEBUGGING.md b/docs/DEBUGGING.md similarity index 100% rename from doc/DEBUGGING.md rename to docs/DEBUGGING.md diff --git a/doc/Image Uploader Configration.md b/docs/IMAGE_UPLOADER_CONFIGRATION.md similarity index 91% rename from doc/Image Uploader Configration.md rename to docs/IMAGE_UPLOADER_CONFIGRATION.md index b7100222..95eaf006 100644 --- a/doc/Image Uploader Configration.md +++ b/docs/IMAGE_UPLOADER_CONFIGRATION.md @@ -2,7 +2,7 @@ ##### SM.MS -No need to config, it's free uploading service, thanks! +No need to config, it's a free uploading service up-to 5MB, thanks! ##### GitHub diff --git a/doc/KEYBINDINGS.md b/docs/KEYBINDINGS.md similarity index 100% rename from doc/KEYBINDINGS.md rename to docs/KEYBINDINGS.md diff --git a/doc/LINUX.md b/docs/LINUX.md similarity index 100% rename from doc/LINUX.md rename to docs/LINUX.md diff --git a/doc/PREFERENCE.md b/docs/PREFERENCE.md similarity index 100% rename from doc/PREFERENCE.md rename to docs/PREFERENCE.md diff --git a/doc/RELEASE.md b/docs/RELEASE.md similarity index 100% rename from doc/RELEASE.md rename to docs/RELEASE.md diff --git a/doc/brew-cask.gif b/docs/brew-cask.gif similarity index 100% rename from doc/brew-cask.gif rename to docs/brew-cask.gif diff --git a/doc/doutu.jpg b/docs/doutu.jpg similarity index 100% rename from doc/doutu.jpg rename to docs/doutu.jpg diff --git a/doc/focus.gif b/docs/focus.gif similarity index 100% rename from doc/focus.gif rename to docs/focus.gif diff --git a/doc/i18n/french.md b/docs/i18n/french.md similarity index 93% rename from doc/i18n/french.md rename to docs/i18n/french.md index a34fda43..2daec395 100644 --- a/doc/i18n/french.md +++ b/docs/i18n/french.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 22 June 2018!** +

mark text

Mark Text

@@ -82,7 +84,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ## Features @@ -97,13 +99,13 @@ | Sombre :crescent_moon: | Clair :high_brightness: | |:------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:Mode d'édition:dog:

| Code Source | Machine à écrire | Focus | |:--------------------------------------------------------------------:|:------------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ## Pourquoi écrire un nouvel éditeur? @@ -129,7 +131,7 @@ Si vous êtes sur OS X, vous pouvez installer Mark Text via [**homebrew cask**]( brew cask install mark-text ``` -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) #### macOS and Windows @@ -137,7 +139,7 @@ Télécharger et installer simplement Mark Text via le client d'installation. #### Linux -Veuillez suivre [les instructions d'installations Linux](https://github.com/marktext/marktext/blob/master/doc/LINUX.md). +Veuillez suivre [les instructions d'installations Linux](https://github.com/marktext/marktext/blob/master/docs/LINUX.md). ## Development @@ -161,7 +163,7 @@ Supporter ce projet en devenant sponsor de celui-ci. Votre logo sera affiché ic **Platinum Sponsors** - + ## Contributors diff --git a/doc/i18n/ja.md b/docs/i18n/ja.md similarity index 90% rename from doc/i18n/ja.md rename to docs/i18n/ja.md index 690c865e..72715c54 100644 --- a/doc/i18n/ja.md +++ b/docs/i18n/ja.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 19 April 2018!** +

mark text

Mark Text

@@ -76,22 +78,22 @@ :en: - + :cn: - + :poland: - + :fr: - + :tr: - + :es: - + :portugal: @@ -107,7 +109,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ## 特徴 @@ -122,13 +124,13 @@ | Dark :crescent_moon: | Light :high_brightness: | |:------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:編集モード:dog:

| Source Code | Typewriter | Focus | |:--------------------------------------------------------------------:|:------------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ## 開発の意図 @@ -152,7 +154,7 @@ macOSをご利用の場合は、[**homebrew cask**](https://github.com/caskroom/ > brew cask install mark-text -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) ## 開発 diff --git a/doc/i18n/ko.md b/docs/i18n/ko.md similarity index 93% rename from doc/i18n/ko.md rename to docs/i18n/ko.md index 0db2270c..8ffc08d5 100644 --- a/doc/i18n/ko.md +++ b/docs/i18n/ko.md @@ -1,3 +1,4 @@ +> **This documentation is outdated, based on the original readme from 27 February 2019!**

mark text

@@ -82,7 +83,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ## 기능 @@ -97,13 +98,13 @@ | Dark :crescent_moon: | Light :high_brightness: | |:------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:다양한 편집 모드:dog:

| Source Code | Typewriter | Focus | |:--------------------------------------------------------------------:|:------------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ## 개발 의도 @@ -129,14 +130,14 @@ macOS를 이용할 경우는 [**homebrew cask**](https://github.com/caskroom/ho brew cask install mark-text ``` -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) #### macOS and Windows 설치 마법사를 통해 Mark Text를 다운로드하여 설치하면 된다. #### Linux -[Linux installation instructions](https://github.com/marktext/marktext/blob/master/doc/LINUX.md) 이 문서를 따르라. +[Linux installation instructions](https://github.com/marktext/marktext/blob/master/docs/LINUX.md) 이 문서를 따르라. ## 개발 @@ -158,7 +159,7 @@ Mark Text는 완전히 개발되었다, pull request를 하기 전에 [Contribu **Platinum 스폰서** - + diff --git a/doc/i18n/pl.md b/docs/i18n/pl.md similarity index 94% rename from doc/i18n/pl.md rename to docs/i18n/pl.md index d682385f..134896e1 100644 --- a/doc/i18n/pl.md +++ b/docs/i18n/pl.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 14 April 2018!** +

mark text

Mark Text

@@ -82,7 +84,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ### Cechy programu @@ -97,13 +99,13 @@ | Ciemny :crescent_moon: | Jasny :high_brightness: | |:------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:Tryby edycji:dog:

| Kod źródłowy | Maszyna do pisania | Skupienie | |:--------------------------------------------------------------------:|:------------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ### Dlaczego kolejny edytor? @@ -127,7 +129,7 @@ Jeśli używasz systemu OS X, to możesz zainstalować Mark Text za pomocą [**h > brew cask install mark-text -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) ### Rozwój diff --git a/doc/i18n/pt.md b/docs/i18n/pt.md similarity index 93% rename from doc/i18n/pt.md rename to docs/i18n/pt.md index 42c46ff1..063058c7 100644 --- a/doc/i18n/pt.md +++ b/docs/i18n/pt.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 18 October 2018!** +

mark text

Mark Text

@@ -82,7 +84,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ## Características @@ -97,13 +99,13 @@ | Escuro :crescent_moon: | Claro :high_brightness: | |:------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:Modo de edição:dog:

| Código Fonte | Máquina de Escrever | Concentração | |:--------------------------------------------------------------------:|:------------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ## Por que criar um novo editor ? @@ -129,7 +131,7 @@ Se está usando macOS você pode utilizar para instalação [**homebrew cask**]( brew cask install mark-text ``` -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) #### macOS e Windows @@ -137,7 +139,7 @@ Baixe e instale a partir do assistente de instalação. #### Linux -Siga as instruções: [Clique aqui](https://github.com/marktext/marktext/blob/master/doc/LINUX.md). +Siga as instruções: [Clique aqui](https://github.com/marktext/marktext/blob/master/docs/LINUX.md). ## Desenvolvimento @@ -182,7 +184,7 @@ Se você patrocinar esse projeto tera sua logo aqui com um link :) [[Quero patro **Platinum** - + ## Contribuidores diff --git a/doc/i18n/spanish.md b/docs/i18n/spanish.md similarity index 93% rename from doc/i18n/spanish.md rename to docs/i18n/spanish.md index ad923b80..525db477 100644 --- a/doc/i18n/spanish.md +++ b/docs/i18n/spanish.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 1 October 2018!** +

mark text

Mark Text

@@ -82,7 +84,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ## Características @@ -97,13 +99,13 @@ | Oscuro :crescent_moon: | Claro :high_brightness: | |:------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:Mode d'édition:dog:

| Código fuente | Máquina de escribir | Concentración | |:--------------------------------------------------------------------:|:------------------------------------------------------------------------:|:-------------------------------------------------------------------:| -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ## ¿Por qué hacer otro editor ? @@ -128,7 +130,7 @@ Si estás usando macOS, puedes instalar Mart Text usando [**homebrew cask**](htt brew cask install mark-text ``` -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) #### macOS y Windows @@ -136,7 +138,7 @@ Descarga e instala Mart Text a partir del asistente de instalación #### Linux -Sigue las [instrucciones de instalación de Linux] (https://github.com/marktext/marktext/blob/master/doc/LINUX.md). +Sigue las [instrucciones de instalación de Linux] (https://github.com/marktext/marktext/blob/master/docs/LINUX.md). ## Desarrollo @@ -180,7 +182,7 @@ Apoya este proyecto convirtiéndote en un sponsor. Tu logo se verá aquí con un **Platinum Sponsors** - + ## Contribuidores diff --git a/doc/i18n/tr.md b/docs/i18n/tr.md similarity index 93% rename from doc/i18n/tr.md rename to docs/i18n/tr.md index e2b6c0e9..053ff895 100644 --- a/doc/i18n/tr.md +++ b/docs/i18n/tr.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 19 June 2018!** +

mark text

Mark Text

@@ -53,7 +55,7 @@ Web sitesi | - + Türkçe | @@ -86,7 +88,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ## Özellikler @@ -101,13 +103,13 @@ | Dark :crescent_moon: | Light :high_brightness: | | :----------------------------------------------------------------: | :-----------------------------------------------------------------: | -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:Düzenleme modları:dog:

| Kaynak Kod | Daktilo | Odaklama | | :------------------------------------------------------------------: | :----------------------------------------------------------------------: | :-----------------------------------------------------------------: | -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ## Neden başka editör yazıyoruz? @@ -133,7 +135,7 @@ Eğer OSX sistemi kullanıyorsan, [**homebrew cask**](https://github.com/caskroo brew cask install mark-text ``` -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) #### macOS ve Windows @@ -141,7 +143,7 @@ Basitçe indirin ve Mark Text kurulum sihirbazı ile kurulumu tamamlayın. #### Linux -Lütfen [Linux kurulum talimatını](https://github.com/marktext/marktext/blob/master/doc/LINUX.md) takip ediniz. +Lütfen [Linux kurulum talimatını](https://github.com/marktext/marktext/blob/master/docs/LINUX.md) takip ediniz. ## Geliştirme @@ -169,7 +171,7 @@ Sponsor olarak bu projeye desktek verin. Logonuz burada websitenizin linki veril **Platinum Sponsorlar** - + ## Katkıda bulunanlar diff --git a/doc/i18n/zh_cn.md b/docs/i18n/zh_cn.md similarity index 93% rename from doc/i18n/zh_cn.md rename to docs/i18n/zh_cn.md index bb6bc3f3..b26b7dd8 100644 --- a/doc/i18n/zh_cn.md +++ b/docs/i18n/zh_cn.md @@ -1,3 +1,5 @@ +> **This documentation is outdated, based on the original readme from 13 March 2018!** +

mark text

Mark Text

@@ -82,7 +84,7 @@
-![](https://github.com/marktext/marktext/blob/master/doc/marktext.gif) +![](https://github.com/marktext/marktext/blob/master/docs/marktext.gif) ### 特性 @@ -98,19 +100,19 @@ | 黑色主题 :crescent_moon: | 白色主题 :high_brightness: | | :----------------------------------------------------------: | :----------------------------------------------------------: | -| ![](https://github.com/marktext/marktext/blob/master/doc/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/doc/light.jpg) | +| ![](https://github.com/marktext/marktext/blob/master/docs/dark.jpg) | ![](https://github.com/marktext/marktext/blob/master/docs/light.jpg) |

:smile_cat:​编辑模式:dog:​

| 源代码模式 | 打字机模式 | 专注模式 | | :----------------------------------------------------------: | :----------------------------------------------------------: | :----------------------------------------------------------: | -| ![](https://github.com/marktext/marktext/blob/master/doc/source.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/doc/focus.gif) | +| ![](https://github.com/marktext/marktext/blob/master/docs/source.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/typewriter.gif) | ![](https://github.com/marktext/marktext/blob/master/docs/focus.gif) | ### 可以斗图的 Markdown 编辑器 Mark Text 内置斗图功能，省掉了寻找「斗图」的烦恼，通过快捷键 `Cmd+/` 直接打开斗图搜索面板，你需要的有趣图片就在里面。斗图功能默认是关闭的，你需要从`user preference` 菜单中，打开 preference.md, 然后设置 `aidou` 为 `true`。保存然后重启编辑器就可以使用了。 -![](https://github.com/marktext/marktext/blob/master/doc/doutu.jpg) +![](https://github.com/marktext/marktext/blob/master/docs/doutu.jpg) ### 安装和下载 @@ -126,7 +128,7 @@ > brew cask install mark-text -![](https://github.com/marktext/marktext/blob/master/doc/brew-cask.gif) +![](https://github.com/marktext/marktext/blob/master/docs/brew-cask.gif) ### 开发 diff --git a/doc/marktext.png b/docs/marktext.png similarity index 100% rename from doc/marktext.png rename to docs/marktext.png diff --git a/doc/source.gif b/docs/source.gif similarity index 100% rename from doc/source.gif rename to docs/source.gif diff --git a/doc/sponsor/qordoba.png b/docs/sponsor/qordoba.png similarity index 100% rename from doc/sponsor/qordoba.png rename to docs/sponsor/qordoba.png diff --git a/doc/sponsor/readme.png b/docs/sponsor/readme.png similarity index 100% rename from doc/sponsor/readme.png rename to docs/sponsor/readme.png diff --git a/doc/themeImages/cadmium-light.png b/docs/themeImages/cadmium-light.png similarity index 100% rename from doc/themeImages/cadmium-light.png rename to docs/themeImages/cadmium-light.png diff --git a/doc/themeImages/dark.png b/docs/themeImages/dark.png similarity index 100% rename from doc/themeImages/dark.png rename to docs/themeImages/dark.png diff --git a/doc/themeImages/graphite-light.png b/docs/themeImages/graphite-light.png similarity index 100% rename from doc/themeImages/graphite-light.png rename to docs/themeImages/graphite-light.png diff --git a/doc/themeImages/materal-dark.png b/docs/themeImages/materal-dark.png similarity index 100% rename from doc/themeImages/materal-dark.png rename to docs/themeImages/materal-dark.png diff --git a/doc/themeImages/one-dark.png b/docs/themeImages/one-dark.png similarity index 100% rename from doc/themeImages/one-dark.png rename to docs/themeImages/one-dark.png diff --git a/doc/themeImages/ulysses-light.png b/docs/themeImages/ulysses-light.png similarity index 100% rename from doc/themeImages/ulysses-light.png rename to docs/themeImages/ulysses-light.png diff --git a/doc/typewriter.gif b/docs/typewriter.gif similarity index 100% rename from doc/typewriter.gif rename to docs/typewriter.gif diff --git a/doc/wip/README.md b/docs/wip/README.md similarity index 100% rename from doc/wip/README.md rename to docs/wip/README.md diff --git a/doc/wip/ipc.md b/docs/wip/ipc.md similarity index 100% rename from doc/wip/ipc.md rename to docs/wip/ipc.md diff --git a/doc/wip/renderer/editor.md b/docs/wip/renderer/editor.md similarity index 100% rename from doc/wip/renderer/editor.md rename to docs/wip/renderer/editor.md diff --git a/package.json b/package.json index e5ff57fb..cdd73688 100644 --- a/package.json +++ b/package.json @@ -93,19 +93,12 @@ "ia32", "x64" ] - }, - { - "target": "portable", - "arch": [ - "ia32", - "x64" - ] } ], "requestedExecutionLevel": "asInvoker" }, "nsis": { - "perMachine": true, + "perMachine": false, "oneClick": false, "allowToChangeInstallationDirectory": true, "include": "resources/windows/installer.nsh" diff --git a/src/renderer/components/about/index.vue b/src/renderer/components/about/index.vue index a5c6344a..1d00ce49 100644 --- a/src/renderer/components/about/index.vue +++ b/src/renderer/components/about/index.vue @@ -19,7 +19,7 @@
{{ copyright }}
-
Copyright © 2018 Mark Text Contributors
+
{{ copyrightContributors }}
 @@ -34,6 +34,7 @@ data () { this.name = 'Mark Text' this.copyright = `Copyright © 2017-${new Date().getFullYear()} Luo Ran` + this.copyrightContributors = `Copyright © 2018-${new Date().getFullYear()} Mark Text Contributors` return { showAboutDialog: false }