Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: marktext/marktext
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: jacobwhall/marktext
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: trunk
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Mar 28, 2020

  1. Release v0.16.1 (#2012)

    * update readme (#2008)
    
    * update readme
    
    * remove unused codes
    
    * Update third party
    
    * remove unused codes
    
    * fix: style error in editor setting
    
    * Release v0.16.1 (#2011)
    Jocs authored Mar 28, 2020
    Copy the full SHA
    1b6e98b View commit details

Commits on Jul 16, 2021

  1. Merge develop into master (#2456)

    * update readme (#2008)
    
    * update readme
    
    * remove unused codes
    
    * Update third party
    
    * remove unused codes
    
    * fix: style error in editor setting
    
    * Release v0.16.1 (#2011)
    
    * Fix typo (#2118)
    
    * Include Chocolatey package installation option (#2107)
    
    * Update dependencies (#2133)
    
    * Fix max width of editor tabs (#2097)
    
    * Fix max width of editor tabs
    
    * Update sponsor (#2141)
    
    * update: sponsors
    
    * update img width and height
    
    * Add ability to paste images to Features (#2127)
    
    * Fix empty shortcuts in shortcut validator (#2130)
    
    * Fix Hunspell dictionary downloader on Windows (#2131)
    
    * Add missing encoding entry (#2132)
    
    * Improve heading font size scaling (#2135)
    
    * Reduce dependency bundle size (#2136)
    
    * Fix Hunspell spell checker initialization on Windows (#2137)
    
    * Disable and hide unnecessary settings options (#2138)
    
    * Increase indentation for sidebar treeview (#2161)
    
    * Fix image export issues on Windows (#2129)
    
    * Fix footnote renderer exception in markedjs (#2162)
    
    * Add GitLab math block support (#2119)
    
    * update: yarn.lock file (#2178)
    
    * feat: switch tabs using alt-#num (#1975)
    
    * Fix bad font when exporting document on macOS (#2190)
    
    * 📝 update zh_cn.md (#2192)
    
    * Improve English grammar in user-interface text. (#2075)
    
    * Fix unnecessary character sanitation on clipboard output (#2197)
    
    * Fix double used shortcut (#2198)
    
    * Fix double used shortcut
    
    * Update documentation
    
    * Update dependencies (#2199)
    
    * Support setting text direction via comand palette (#2194) (#2195)
    
    * Update bug issue template (#2215)
    
    * Fix inline html renderer (#2224)
    
    * Fix sub- and superscript in HTML output
    
    * Update dependencies
    
    * Conform user-interface text to conventions for trailing punctuation (#2209)
    
    * Release v0.16.2 (#2200)
    
    Bump version to 0.16.2 and update documentation.
    
    * Replace PRC emoji for zh_TW translation with Taiwan flag (#2278)
    
    * Update FAQ.md (#2290)
    
    Clarify what aidou is for non-chinese users
    
    * Fix markdown syntax document mistake for table content align (#2282) (#2296)
    
    * Update pt.md (#2350)
    
    * Update pt.md
    
    My annual contribution to Mark Text, with its documentation accessible to all Brazilians and Portuguese.
    
    * Update pt.md
    
    * Update pt.md
    
    * Update pt.md
    
    * Update pt.md
    
    * Update pt.md
    
    * Update pt.md
    
    * Update pt.md
    
    * Update pt.md
    
    * Update regex of auto link to fix trailing slashes (#2354)
    
    * Update FAQ.md - link to Portable (#2337)
    
    Fixing link to portable page.
    
    * updated turkish translation of readme.md (#2366)
    
    * pass file.id to closeTab on middle click (#2272)
    
    * Add codeblock highlight and coloration for the SPARQL and Turtle languages (#2365)
    
    * fix image paths on readme tr.md (#2374)
    
    * Fix issue with not being able to copy table cell (#2375)
    
    * fixed issue#2383 (#2397)
    
    * Fix quick open bug and freeze constants to avoid accidental mutation (#2323)
    
    * fix: #2330 enable shift+tab for table navigation (#2331)
    
    * fix: prism language missing while load dependent language (#1752) (#2335)
    
    * Fix graphite light wordcount (#2392)
    
    * Update dependencies (minor only) (#2402)
    
    * fix: typewriter shake after press enter (#1852)
    
    * Support negative zoom (#2412)
    
    * Restrict export dialog file extensions (#2408)
    
    * Allow BCP-47 language codes in spell checker (#2410)
    
    * Fix footnote inline code font size (#2411)
    
    * feat: add shortcut for toggle-toc (#1863) (#2326)
    
    * Make global menu fields mutable (#2407)
    
    * Replace text when only one table cell is selected (#2413)
    
    * Allow to copy table cells text as plaintext (#2409)
    
    * Fix font selection autocomplete (#2420)
    
    * Updated korean translation of README.md (#2432)
    
    I updated ko.md (korean translation of README.md) to match the latest version of README.md
    
    * Rebase markedjs bug fixes (#2419)
    
    * Add option to disable HTML rendering (#2414)
    
    * Fix symbolic links and related path issues (#2416)
    
    * Upgrade to N-API and Electron 11 (#2422)
    
    * Upgrade to N-API and Electron 11
    
    * Update Electron and remove workaround
    
    * Fix ESLint error
    
    * Disble MathML due to DOMPurify security issues (#2436)
    
    * Update Simplified Chinese translation of README (#2445)
    
    * Improve undo history (#2437)
    
    * Add TOC generator to document exporter (#2391)
    
    * Add support for relative image directory (#2439)
    
    * Fix installation instructions in README.md (#2449)
    
    * Update README.md
    
    Calling brew cask install is disabled
    
    * Update i18n files
    
    * Release v0.16.3 (#2448)
    
    Co-authored-by: Ran Luo <ransixi@gmail.com>
    Co-authored-by: saymoon <saymoon@gmail.com>
    Co-authored-by: shaunmbg <shaunmbg@users.noreply.github.com>
    Co-authored-by: Micael Dias <diasmicaelandre@gmail.com>
    Co-authored-by: Dan Dascalescu <ddascalescu+github@gmail.com>
    Co-authored-by: BeatLink <47278150+BeatLink@users.noreply.github.com>
    Co-authored-by: He Linming <hlm52pk@163.com>
    Co-authored-by: Royce <royce2003@qq.com>
    Co-authored-by: brainchild0 <34869175+brainchild0@users.noreply.github.com>
    Co-authored-by: Rasmus Eneman <rasmus@eneman.eu>
    Co-authored-by: nyanpasu64 <nyanpasu64@tuta.io>
    Co-authored-by: Sbelletier <sbelletier@gmail.com>
    Co-authored-by: 小新 <xinping.wang@hotmail.com>
    Co-authored-by: Enderson Menezes <endersonster@gmail.com>
    Co-authored-by: Sweet Liquid <himejisyana@hotmail.com>
    Co-authored-by: Nick Ali <1514992+nickali@users.noreply.github.com>
    Co-authored-by: erentar <erentar2002@gmail.com>
    Co-authored-by: Max Lantas <mnxndev@outlook.com>
    Co-authored-by: Vincent Emonet <vincent.emonet@gmail.com>
    Co-authored-by: Amauri Bizerra <amauriairesfilho@gmail.com>
    Co-authored-by: Anton Freeman <asfreeman12@gmail.com>
    Co-authored-by: Dan Munckton <munckfish@gmail.com>
    Co-authored-by: evan-cohen <evancohen97@gmail.com>
    Co-authored-by: zmen <sandoverflow@gmail.com>
    Co-authored-by: bmvisoky <49735648+bmvisoky@users.noreply.github.com>
    Co-authored-by: YeloMelon <42390003+YeloMelon@users.noreply.github.com>
    Co-authored-by: MingZZX <41257880+mzzx@users.noreply.github.com>
    Co-authored-by: カワリミ人形 <kawarimidoll+git@gmail.com>
    Copy the full SHA
    1790504 View commit details

Commits on Feb 23, 2022

  1. Copy the full SHA
    e043c50 View commit details

Commits on Mar 7, 2022

  1. Copy the full SHA
    7c9b0ec View commit details

Commits on Apr 14, 2022

  1. Copy the full SHA
    4579b40 View commit details
  2. Fix not colored emojis on popup

    fxha committed Apr 14, 2022
    Copy the full SHA
    dcface0 View commit details

Commits on Apr 26, 2022

  1. Copy the full SHA
    4e159bc View commit details

Commits on May 17, 2022

  1. add option to set custom css;

    Carl Chang committed May 17, 2022
    Copy the full SHA
    ff169d7 View commit details

Commits on May 18, 2022

  1. Copy the full SHA
    ad2a70a View commit details

Commits on May 23, 2022

  1. feature #3274: Select multiple lines in the code block and press tab …

    …to indent multiple lines or tab + shift to cancel indenting multiple lines
    morecup committed May 23, 2022
    Copy the full SHA
    7473cee View commit details

Commits on Jun 8, 2022

  1. Fix file executable check on win32 (#3289)

    Xander-C committed Jun 8, 2022
    Copy the full SHA
    a2eb04a View commit details
  2. Fix picgo and cliScript uploader (#2915)

    Xander-C committed Jun 8, 2022
    Copy the full SHA
    5775b28 View commit details
  3. initial

    rnwelsh committed Jun 8, 2022
    Copy the full SHA
    45f22fc View commit details

Commits on Jun 9, 2022

  1. codeblock intent handling

    rnwelsh committed Jun 9, 2022
    Copy the full SHA
    efa2bf2 View commit details

Commits on Jun 26, 2022

  1. Copy the full SHA
    d2c1f4e View commit details

Commits on Jul 2, 2022

  1. Copy the full SHA
    6804c0c View commit details

Commits on Jul 16, 2022

  1. Copy the full SHA
    3189298 View commit details

Commits on Jul 27, 2022

  1. Copy the full SHA
    9909d3b View commit details

Commits on Aug 2, 2022

  1. Add export PDF shortcut

    Leonardo dos Santos Duarte Silva committed Aug 2, 2022
    Copy the full SHA
    023626a View commit details
  2. Copy the full SHA
    c6afb88 View commit details

Commits on Aug 8, 2022

  1. Copy the full SHA
    b0dd7cc View commit details

Commits on Aug 17, 2022

  1. Add padding at the buttom of editor

    add a padding of 1 screen height at the buttom of editor container.
    szdytom authored Aug 17, 2022
    Copy the full SHA
    7a44ddc View commit details
  2. fix buttom->bottom

    szdytom authored Aug 17, 2022
    Copy the full SHA
    2f51aa0 View commit details

Commits on Aug 20, 2022

  1. Copy the full SHA
    0ad9aa4 View commit details

Commits on Aug 21, 2022

  1. Copy the full SHA
    07a1afd View commit details

Commits on Aug 29, 2022

  1. fix: path.join args must be string type

    hqwuzhaoyi committed Aug 29, 2022
    Copy the full SHA
    2f18615 View commit details

Commits on Aug 30, 2022

  1. Copy the full SHA
    4b8dc97 View commit details

Commits on Nov 20, 2022

  1. Copy the full SHA
    0c77019 View commit details

Commits on Jan 4, 2023

  1. Ignore pressing a tab key if IME is working

    mosaicer committed Jan 4, 2023
    Copy the full SHA
    71306bc View commit details

Commits on Jan 15, 2023

  1. Delete yarn.lock

    Songjiarun1737 committed Jan 15, 2023
    Copy the full SHA
    c3b33fd View commit details

Commits on Feb 8, 2023

  1. Copy the full SHA
    c84b476 View commit details
  2. Copy the full SHA
    f760702 View commit details
  3. Copy the full SHA
    452112a View commit details
  4. Copy the full SHA
    b9d1611 View commit details
  5. Copy the full SHA
    2e8c4f0 View commit details
  6. Copy the full SHA
    9ba569c View commit details
  7. Copy the full SHA
    3f5eaf7 View commit details
  8. Copy the full SHA
    9eb42c7 View commit details
  9. Copy the full SHA
    a0006ba View commit details
  10. Copy the full SHA
    9921ee4 View commit details
  11. Copy the full SHA
    0dcea09 View commit details
  12. Copy the full SHA
    c5954ba View commit details
  13. Copy the full SHA
    69d6c15 View commit details
  14. Copy the full SHA
    e509d94 View commit details
  15. Copy the full SHA
    1f26c9e View commit details
  16. Copy the full SHA
    53bb4d3 View commit details
  17. Copy the full SHA
    9e86468 View commit details
  18. Copy the full SHA
    112263c View commit details
  19. Copy the full SHA
    f3c125f View commit details
  20. Copy the full SHA
    9b0a9b4 View commit details
Showing with 894 additions and 14,344 deletions.
  1. +104 −44 .github/CODE_OF_CONDUCT.md
  2. +0 −5 .github/FUNDING.yml
  3. +0 −32 .github/ISSUE_TEMPLATE.md
  4. +2 −0 .gitignore
  5. +1 −0 .nvmrc
  6. +30 −253 README.md
  7. +16 −15 docs/KEYBINDINGS_LINUX.md
  8. +14 −13 docs/KEYBINDINGS_OSX.md
  9. +16 −15 docs/KEYBINDINGS_WINDOWS.md
  10. +1 −1 docs/LINUX.md
  11. +1 −1 docs/PREFERENCES.md
  12. +34 −1 docs/dev/BUILD.md
  13. +269 −0 docs/i18n/english.md
  14. +1 −1 docs/i18n/ko.md
  15. +35 −17 docs/i18n/zh_tw.md
  16. +1 −0 electron-builder.yml
  17. +5 −4 package.json
  18. +1 −0 src/common/commands/constants.js
  19. +18 −0 src/common/filesystem/paths.js
  20. +5 −1 src/main/app/index.js
  21. +5 −1 src/main/filesystem/watcher.js
  22. +3 −0 src/main/keyboard/keybindingsDarwin.js
  23. +3 −0 src/main/keyboard/keybindingsLinux.js
  24. +3 −0 src/main/keyboard/keybindingsWindows.js
  25. +11 −4 src/main/menu/actions/file.js
  26. +3 −2 src/main/menu/templates/file.js
  27. +10 −37 src/main/menu/templates/help.js
  28. +1 −1 src/main/menu/templates/paragraph.js
  29. +10 −0 src/main/preferences/schema.json
  30. +1 −9 src/muya/lib/assets/styles/index.css
  31. +23 −10 src/muya/lib/contentState/backspaceCtrl.js
  32. +5 −1 src/muya/lib/contentState/enterCtrl.js
  33. +1 −1 src/muya/lib/contentState/pasteCtrl.js
  34. +58 −4 src/muya/lib/contentState/tabCtrl.js
  35. +1 −1 src/muya/lib/renderers/index.js
  36. +1 −1 src/muya/lib/ui/emojiPicker/index.css
  37. +1 −0 src/muya/lib/utils/markdownFile.js
  38. +1 −0 src/muya/themes/default.css
  39. +0 −1 src/renderer/assets/icons/undraw_content.svg
  40. +0 −1 src/renderer/assets/icons/undraw_empty.svg
  41. +0 −1 src/renderer/assets/icons/undraw_folder.svg
  42. +0 −1 src/renderer/assets/icons/undraw_toc_empty.svg
  43. +1 −0 src/renderer/commands/descriptions.js
  44. +10 −1 src/renderer/components/editorWithTabs/editor.vue
  45. +4 −0 src/renderer/components/editorWithTabs/tabs.vue
  46. +15 −15 src/renderer/components/exportSettings/index.vue
  47. +2 −10 src/renderer/components/recent/index.vue
  48. +6 −0 src/renderer/components/search/index.vue
  49. +14 −13 src/renderer/components/sideBar/search.vue
  50. +0 −19 src/renderer/components/sideBar/toc.vue
  51. +1 −10 src/renderer/components/sideBar/tree.vue
  52. +1 −1 src/renderer/components/sideBar/treeFile.vue
  53. +2 −2 src/renderer/components/sideBar/treeFolder.vue
  54. +9 −1 src/renderer/pages/app.vue
  55. +6 −0 src/renderer/prefComponents/editor/index.vue
  56. +12 −1 src/renderer/prefComponents/general/index.vue
  57. +6 −1 src/renderer/prefComponents/theme/index.vue
  58. +3 −0 src/renderer/store/preferences.js
  59. +1 −1 src/renderer/store/project.js
  60. +10 −7 src/renderer/util/fileSystem.js
  61. +31 −0 src/renderer/util/theme.js
  62. +3 −0 static/preference.json
  63. +21 −233 test/specs/commonMark/compare.marked.md
  64. +38 −14 test/specs/gfm/gfm.0.29.json
  65. +3 −3 test/specs/gfm/gfm.0.29.md
  66. +0 −13,533 yarn.lock
148 changes: 104 additions & 44 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,74 +1,134 @@

# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
education, socio-economic status, nationality, personal appearance, race,
religion, or sexual identity and orientation.
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:
Examples of behavior that contributes to a positive environment for our
community include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior by participants include:
Examples of unacceptable behavior include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Publishing others' private information, such as a physical or email address,
without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities
## Enforcement Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at ransixi@gmail.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
reported to the community leaders responsible for enforcement at
email@jacobhall.net.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
**Community Impact**: A violation through a single incident or series of
actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or permanent
ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.1, available at
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
[https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations

5 changes: 0 additions & 5 deletions .github/FUNDING.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,8 +10,10 @@ node_modules/
npm-debug.log
npm-debug.log.*
yarn-error.log
yarn.lock
thumbs.db
!.gitkeep
.idea
.env
.eslintcache
marktext.code-workspace
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.15.1
Loading