From 2b26bbe78a1a2b8b427963a6c44c3853efdb737e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 6 Mar 2020 03:52:12 +0200 Subject: Fix: img tag did not allow width and height. Removed swipebox from markdown editor img tag and updated marked markdown to newest version. Thanks to hradec and xet7 ! Closes #2956 --- .../marked/.github/PULL_REQUEST_TEMPLATE/badges.md | 50 ---------------------- .../.github/PULL_REQUEST_TEMPLATE/release.md | 25 ----------- 2 files changed, 75 deletions(-) delete mode 100644 packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md delete mode 100644 packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md (limited to 'packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE') diff --git a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md deleted file mode 100644 index 2078243d..00000000 --- a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md +++ /dev/null @@ -1,50 +0,0 @@ -**@mention the contributor:** - -## Recommendation to: - -- [ ] Change user group -- [ ] Add a badge -- [ ] Remove a badge - - - -## As the one mentioned, I would like to: - -- [ ] accept the recommendation; or, -- [ ] graciously decline; or, -- [ ] dispute the recommendation - -within 30 days, if you have not indicated which option you are taking one of the following will happen: - -1. If adding a badge, we will assume you are graciously declining. -2. If removing a badge, we will assume you do not want to dispute the recommendation; therefore, the badge will be removed. - - - -Note: All committers must approve via review before merging, the disapproving committer can simply close the PR. \ No newline at end of file diff --git a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md deleted file mode 100644 index 29cd7f2e..00000000 --- a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md +++ /dev/null @@ -1,25 +0,0 @@ -## Publisher - -- [ ] `$ npm version` has been run. -- [ ] Release notes in [draft GitHub release](https://github.com/markedjs/marked/releases) are up to date -- [ ] Release notes include which flavors and versions of Markdown are supported by this release -- [ ] Committer checklist is complete. -- [ ] Merge PR. -- [ ] Publish GitHub release using `master` with correct version number. -- [ ] `$ npm publish` has been run. -- [ ] Create draft GitHub release to prepare next release. - -Note: If merges to `master` occur after submitting this PR and before running `$ npm pubish` you should be able to - -1. pull from `upstream/master` (`git pull upstream master`) into the branch holding this version, -2. run `$ npm run build` to regenerate the `min` file, and -3. commit and push the updated changes. - -## Committer - -In most cases, this should be someone different than the publisher. - -- [ ] Version in `package.json` has been updated (see [PUBLISHING.md](https://github.com/markedjs/marked/blob/master/docs/PUBLISHING.md)). -- [ ] The `marked.min.js` has been updated; or, -- [ ] release does not change library. -- [ ] CI is green (no forced merge required). -- cgit v1.2.3-1-g7c22