Commit Graph

714 Commits

Author SHA1 Message Date
Estevao Soares dos Santos
fc7ac1e1ca chore: fix merge conflicts 2018-09-14 14:21:20 +01:00
Estevao Soares dos Santos
0c6b5bdc4b Merge branch 'develop' of https://github.com/showdownjs/showdown into develop
# Conflicts:
#	dist/showdown.js
#	dist/showdown.js.map
#	dist/showdown.min.js
#	dist/showdown.min.js.map
2018-09-14 14:11:08 +01:00
Estevao Soares dos Santos
05ef5c55dc refactor(event dispatcher): make event dispatcher return an object instead of text 2018-09-14 14:10:15 +01:00
Estevão Soares dos Santos
686d3dd146
Update CHANGELOG.md 2018-09-14 13:40:24 +01:00
Matt Budish
baf325f120 Upgrade yargs to address vulnerability in mem. (#580)
https://snyk.io/test/npm/yargs/10.1.2

Run grunt build.

Add preinstall script.

Revert "Add preinstall script."

This reverts commit 3034355c0b6c4ac70eeb4a00cdba1d46ccaf78eb.
2018-09-09 20:49:22 +01:00
Lee Moody
1f0242c6ea fix(gfm-codeblock): add support for spaces before language declaration
One or more spaces before the language declaration of a code block is supported by Github.

E.g.

```    html
<div>HTML!</div>
```

``` html
<div>HTML!</div>
```

```html
<div>HTML!</div>
```

Closes #569
2018-08-08 01:25:32 +01:00
Estevao Soares dos Santos
e80a548c9b build 2018-07-07 19:15:02 +01:00
Estevao Soares dos Santos
0d5c9df1a8 chore: update dependencies 2018-07-07 19:12:34 +01:00
Estevao Soares dos Santos
62270d4a4b Merge branch 'develop' 2018-07-07 19:07:04 +01:00
Estevao Soares dos Santos
358947bd29 feat(makeMarkdown): convert HTML to MD
This feature enables convertion of HTML into MD.
2018-07-07 19:05:16 +01:00
Estevão Soares dos Santos
3d51939b4e
Update README.md
Closes #559
2018-07-05 16:09:19 +01:00
jjangga0214
a54ed664f7 doc: Update README.md
correct markdown grammar
2018-06-05 22:33:56 +01:00
Christian Genco
0c6ce94673 doc: add metadata code example 2018-05-13 15:37:53 +01:00
Daniel Ruf
7628471928 chore: cache node_modules 2018-05-10 00:26:04 +01:00
Daniel Ruf
fc43100286 chore: cleanup ci scripts (#525) 2018-05-07 20:12:30 +01:00
Estevao Soares dos Santos
b53f71bdf3 Merge branch 'master' into develop 2018-05-07 20:07:22 +01:00
Estevao Soares dos Santos
099a6da5da chore: update jsdom to v10 2018-05-07 20:05:42 +01:00
Daniel Ruf
f572d368ed chore: use Node.js 6, 8 and 10 2018-05-07 19:54:37 +01:00
Estevao Soares dos Santos
49ed464183 update sinon 2018-05-07 19:43:31 +01:00
Estevao Soares dos Santos
d915c837d9 chore: update travis and appveyor 2018-05-07 19:39:09 +01:00
Estevao Soares dos Santos
8366b6cb48 chore: commit package-lock.json 2018-05-07 19:34:51 +01:00
maxwellito
55f22de0a0 fix: compress showdown emoji
* fix showdown emoji compression

* test: fix functional test
2018-05-07 19:27:19 +01:00
trickypr
699bb625ce doc: fix README.md small typos
Clean up two of the mistakes in the README.md file.
2018-05-07 19:25:04 +01:00
GenaBitu
f20dc75024 fix: replaces \u00A0 with &nbsp;
Closes #521
2018-05-07 19:14:58 +01:00
Estevão Soares dos Santos
039dd66256
Update README.md 2018-05-07 19:05:50 +01:00
Estevão Soares dos Santos
2c1062cb52
Update DONATIONS.md 2018-05-07 19:03:43 +01:00
Estevão Soares dos Santos
4e64a20463
Update DONATIONS.md 2018-05-07 19:03:18 +01:00
greenkeeper[bot]
706813d9bc chore(package): update grunt-contrib-uglify to version 3.3.0 (#481) 2018-02-02 16:05:27 +00:00
greenkeeper[bot]
6376d40584 fix(package): update yargs to version 11.0.0 (#491) 2018-02-02 16:03:29 +00:00
Estevão Soares dos Santos
ac23b8cb72
chore: pin sinon to 4.1.5 (#496) 2018-01-27 20:41:28 +00:00
Estevao Soares dos Santos
410b453049 fix jsdom polyfill 2017-12-23 14:00:20 +00:00
Estevao Soares dos Santos
17222b3d5a build 2017-12-23 13:29:39 +00:00
Estevao Soares dos Santos
173ad51b05 test: fix tests 2017-12-23 13:20:14 +00:00
Estevao Soares dos Santos
13ba2675fe Merge branch 'master' into develop 2017-12-23 12:42:36 +00:00
Estevao Soares dos Santos
be2a10797c refactor: force brackets in links 2017-12-23 12:41:21 +00:00
Estevao Soares dos Santos
94aa3e53ca test: add tests for reverse converter 2017-12-23 12:35:31 +00:00
Thomas Broadley
a42c2d7ed3 docs: fix typos (#480) 2017-12-23 08:18:03 +00:00
Estevao Soares dos Santos
19d2e9f9d4 test: testsuite refactoring 2017-12-22 15:28:41 +00:00
Estevao Soares dos Santos
ea3db5f180 feat(splitAdjacentBlockquotes): add option to split adjacent blockquote blocks
With this option enabled, this:

```md
> some text

> some other text
```

witll result in:

```html
<blockquote>
    <p>some text</p>
</blockquote>
<blockquote>
    <p>some other text</p>
</blockquote>
```

This is the default behavior of GFM.

Closes #477
2017-12-22 10:51:21 +00:00
Estevao Soares dos Santos
9825fd2bd0 Merge commit 'eec56fb1c015663947f6ed393f133bdc7a3e2a64' 2017-12-16 18:45:40 +00:00
Estevao Soares dos Santos
3db9200d2c refactor(subParsers): change name and directory of subparsers
BREAKING CHANGE: makeHtml subparsers names changed, by prepending 'makehtml.' to them.
Example: 'anchors', subparser is now named 'makehtml.anchors'.

Event names were also changed to reflect this.
Example: 'anchors.before' is now named 'makehtml.anchors.before'.

**To migrate:**

If you have a listener extension, replace the old event name with the new one. Example:

Replace this

```js
showdown.extension('myext', function() {
  return [{
    type: 'listener',
    listeners: {
      'anchors.before': function (event, text, converter, options, globals) {
        //... some code
        return text;
      }
  }];
});
```

with this
```js
showdown.extension('myext', function() {
  return [{
    type: 'listener',
    listeners: {
      'makehtml.anchors.before': function (event, text, converter, options, globals) {
        //... some code
        return text;
      }
  }];
});
```
2017-12-16 18:25:44 +00:00
Estevão Soares dos Santos
6dbd3966eb
Update README.md
Testing twitter and facebook integration
2017-12-11 12:41:25 +00:00
showdownjs-bot
fe4b6d7cf6
Update README.md 2017-12-11 12:31:25 +00:00
Estevao Soares dos Santos
187123fed5 release 1.8.5 2017-12-10 19:13:26 +00:00
Estevao Soares dos Santos
63d949f731 feat(metadata): add support for embedded metadata
A simple metadata parser can be useful in markdown documents.
This commit introduces the feature, with the following syntax:

--- or ««« at tstart of the document,
(optionally) followed by a alphanumeric format identifier
followed by key value pairs separated by a colon and a space
followed by --- or ÂÂÂ

Also, adds methods for retrieving the parsed metadata, namely:

getMetadata() and getMetadataFormat

Closes #260
2017-12-10 07:15:09 +00:00
Estevao Soares dos Santos
a8427c9423 feat(completeHTMLOutput): add option to output a complete HTML document 2017-12-10 04:49:24 +00:00
Estevao Soares dos Santos
cc19d9b3e0 update package.json 2017-12-09 19:13:05 +00:00
Estevao Soares dos Santos
27f4d604b4 update donors 2017-12-09 18:54:58 +00:00
Estevao Soares dos Santos
512eab62e8 release 1.8.4 2017-12-05 01:17:04 +00:00
Estevao Soares dos Santos
4ef4c5e674 fix(tables): raw html inside code tags in tables no longer breaks tables
Under certains conditions, raw html inside code tags in tables would break
table parsing. This commit fixes that.

Closes #471
2017-12-05 01:13:11 +00:00