Skip to content

Commit c70d292

Browse files
authored
Merge pull request #11 from denco/0.1.4
0.1.4; fix #6; restructure
2 parents add7c63 + 9533c4e commit c70d292

38 files changed

+543
-134
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* text=auto
2+
/src/test/testfiles/nix/**/*.confluence text eol=lf
3+
/src/test/testfiles/win/**/*.confluence text eol=crlf

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"files.exclude": {
1111
"out": true,
1212
"node_modules": true,
13-
".vscode*": true
13+
"**/.vscode": true,
14+
"**/.vscode-*": true
1415
},
1516
"files.trimTrailingWhitespace": true,
1617

.vscodeignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
**/tsconfig.json
33
**/*.map
44
**/*.bak
5+
**/*.log
56
*.vsix
6-
.gitignore
77
.vscode/**
88
.vscode-test/**
9+
node_modules/**
10+
typings/**
11+
**/test/**
12+
.gitignore
13+
.gitattributes
914
tsconfig.json
1015
package-lock.json
11-
test/**
12-
node_modules/**
13-
typings/**

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Confluence Wiki Markup
22

3+
## 0.1.4
4+
* fix [List indenting @win](https://github.com/denco/vscode-confluence-markup/issues/6)
5+
* restructure
6+
* win/nix test files
7+
38
## 0.1.3
49

510
* fix [nested lists](https://github.com/denco/vscode-confluence-markup/issues/7)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Confluence® markup language support for Visual Studio Code
22

33
[![The MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://github.com/denco/vscode-confluence-markup/blob/master/LICENSE)
4-
[![Version](https://vsmarketplacebadge.apphb.com/version/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
4+
[![Version](https://vsmarketplacebadge.apphb.com/version-short/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
55
[![Installs](https://vsmarketplacebadge.apphb.com/installs-short/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
6-
[![Ratings](https://vsmarketplacebadge.apphb.com/rating/denco.confluence-markdown.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
6+
[![Rating](https://vsmarketplacebadge.apphb.com/rating-short/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
77

88
Adds syntax highlighting, snippets and preview for Confluence® Wiki files in Visual Studio Code.
99

0 commit comments

Comments
 (0)