mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-10-01 01:36:00 -04:00
Merge branch 'master' of git://github.com/c0shea/BookStack into c0shea-master
This commit is contained in:
commit
8b4bfa4d78
@ -16,6 +16,7 @@ import 'codemirror/mode/mllike/mllike';
|
|||||||
import 'codemirror/mode/nginx/nginx';
|
import 'codemirror/mode/nginx/nginx';
|
||||||
import 'codemirror/mode/php/php';
|
import 'codemirror/mode/php/php';
|
||||||
import 'codemirror/mode/powershell/powershell';
|
import 'codemirror/mode/powershell/powershell';
|
||||||
|
import 'codemirror/mode/properties/properties';
|
||||||
import 'codemirror/mode/python/python';
|
import 'codemirror/mode/python/python';
|
||||||
import 'codemirror/mode/ruby/ruby';
|
import 'codemirror/mode/ruby/ruby';
|
||||||
import 'codemirror/mode/rust/rust';
|
import 'codemirror/mode/rust/rust';
|
||||||
@ -42,6 +43,7 @@ const modeMap = {
|
|||||||
haskell: 'haskell',
|
haskell: 'haskell',
|
||||||
hs: 'haskell',
|
hs: 'haskell',
|
||||||
html: 'htmlmixed',
|
html: 'htmlmixed',
|
||||||
|
ini: 'ini',
|
||||||
javascript: 'javascript',
|
javascript: 'javascript',
|
||||||
json: {name: 'javascript', json: true},
|
json: {name: 'javascript', json: true},
|
||||||
js: 'javascript',
|
js: 'javascript',
|
||||||
@ -54,6 +56,7 @@ const modeMap = {
|
|||||||
ml: 'mllike',
|
ml: 'mllike',
|
||||||
nginx: 'nginx',
|
nginx: 'nginx',
|
||||||
powershell: 'powershell',
|
powershell: 'powershell',
|
||||||
|
properties: 'properties',
|
||||||
ocaml: 'mllike',
|
ocaml: 'mllike',
|
||||||
php: 'php',
|
php: 'php',
|
||||||
py: 'python',
|
py: 'python',
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
<a @click="updateLanguage('Lua')">Lua</a>
|
<a @click="updateLanguage('Lua')">Lua</a>
|
||||||
<a @click="updateLanguage('PHP')">PHP</a>
|
<a @click="updateLanguage('PHP')">PHP</a>
|
||||||
<a @click="updateLanguage('Powershell')">Powershell</a>
|
<a @click="updateLanguage('Powershell')">Powershell</a>
|
||||||
|
<a @click="updateLanguage('Properties')">Properties</a>
|
||||||
<a @click="updateLanguage('MarkDown')">MarkDown</a>
|
<a @click="updateLanguage('MarkDown')">MarkDown</a>
|
||||||
<a @click="updateLanguage('Nginx')">Nginx</a>
|
<a @click="updateLanguage('Nginx')">Nginx</a>
|
||||||
<a @click="updateLanguage('Python')">Python</a>
|
<a @click="updateLanguage('Python')">Python</a>
|
||||||
|
Loading…
Reference in New Issue
Block a user