Merge branch 'development' of https://github.com/jhit/BookStack into jhit-development

This commit is contained in:
Dan Brown 2022-12-16 17:12:57 +00:00
commit 559e392f1b
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 6 additions and 2 deletions

View File

@ -26,10 +26,12 @@ 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';
import 'codemirror/mode/shell/shell'; import 'codemirror/mode/shell/shell';
import 'codemirror/mode/smarty/smarty';
import 'codemirror/mode/sql/sql'; import 'codemirror/mode/sql/sql';
import 'codemirror/mode/stex/stex'; import 'codemirror/mode/stex/stex';
import 'codemirror/mode/swift/swift'; import 'codemirror/mode/swift/swift';
import 'codemirror/mode/toml/toml'; import 'codemirror/mode/toml/toml';
import 'codemirror/mode/twig/twig';
import 'codemirror/mode/vb/vb'; import 'codemirror/mode/vb/vb';
import 'codemirror/mode/vbscript/vbscript'; import 'codemirror/mode/vbscript/vbscript';
import 'codemirror/mode/xml/xml'; import 'codemirror/mode/xml/xml';
@ -94,11 +96,13 @@ const modeMap = {
rs: 'rust', rs: 'rust',
shell: 'shell', shell: 'shell',
sh: 'shell', sh: 'shell',
smarty: 'smarty',
sql: 'text/x-sql', sql: 'text/x-sql',
stext: 'text/x-stex', stext: 'text/x-stex',
swift: 'text/x-swift', swift: 'text/x-swift',
toml: 'toml', toml: 'toml',
ts: 'text/typescript', ts: 'text/typescript',
twig: 'twig',
typescript: 'text/typescript', typescript: 'text/typescript',
vbs: 'vbscript', vbs: 'vbscript',
vbscript: 'vbscript', vbscript: 'vbscript',

View File

@ -25,8 +25,8 @@
$languages = [ $languages = [
'Bash', 'CSS', 'C', 'C++', 'C#', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Haskell', 'HTML', 'INI', 'Bash', 'CSS', 'C', 'C++', 'C#', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Haskell', 'HTML', 'INI',
'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'Nginx', 'OCaml', 'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'Nginx', 'OCaml',
'Octave', 'Pascal', 'Perl', 'PHP', 'Powershell', 'Python', 'Ruby', 'Rust', 'Shell', 'SQL', 'Swift', 'Octave', 'Pascal', 'Perl', 'PHP', 'Powershell', 'Python', 'Ruby', 'Rust', 'Shell', 'Smarty', 'SQL', 'Swift',
'TypeScript', 'VBScript', 'VB.NET', 'XML', 'YAML', 'Twig', 'TypeScript', 'VBScript', 'VB.NET', 'XML', 'YAML',
]; ];
@endphp @endphp