Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-09 15:35:27 +02:00
Code Releases Activity

Merge branch 'master' into github-extension

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-05 15:26:25 +01:00
commit ede91fa58a
5 changed files with 149 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.jsbeautifyrc
View file

@ -1,12 +1,17 @@
{ {
"css": { "css": {
"indent_size": 4, "indent_size": 4,
"allowed_file_extensions": ["css", "scss", "sass", "less"] "indent_level": 0,
"indent_with_tabs": true,
"allowed_file_extensions": ["css", "scss", "sass", "less"],
"max_preserve_newlines": 2
}, },
"html": { "html": {
"indent_size": 4, "indent_size": 4,
"indent_char": " ", "indent_level": 0,
"indent_with_tabs": true,
"preserve_newlines": true, "preserve_newlines": true,
"max_preserve_newlines": 2,
"wrap_line_length": 0, "wrap_line_length": 0,
"indent_handlebars": true, "indent_handlebars": true,
"indent_inner_html": false, "indent_inner_html": false,
@ -14,34 +19,39 @@
}, },
"hbs": { "hbs": {
"indent_size": 4, "indent_size": 4,
"indent_char": " ", "indent_level": 0,
"indent_with_tabs": true,
"max_preserve_newlines": 2,
"preserve_newlines": true, "preserve_newlines": true,
"wrap_line_length": 0 "wrap_line_length": 0
}, },
"js": { "js": {
"indent_size": 4, "indent_size": 4,
"indent_char": " ", "indent_level": 0,
"indent_with_tabs": true,
"preserve_newlines": true, "preserve_newlines": true,
"wrap_line_length": 0, "wrap_line_length": 0,
"break_chained_methods": false, "break_chained_methods": false,
"indent_with_tabs": false,
"max_preserve_newlines": 2, "max_preserve_newlines": 2,
"jslint_happy": true, "jslint_happy": true,
"brace_style": "collapse-preserve-inline", "brace_style": "collapse-preserve-inline",
"space_after_anon_function": false,
"keep_function_indentation": false, "keep_function_indentation": false,
"space_before_conditional": true "space_after_anon_function": false,
"space_before_conditional": true,
"space_in_empty_paren": false,
"space_in_paren": false
}, },
"sql": { "sql": {
"indent_size": 4, "indent_size": 4,
"indent_char": " ",
"indent_level": 0, "indent_level": 0,
"indent_with_tabs": false "indent_with_tabs": true
}, },
"_default": { "_default": {
"indent_size": 4, "indent_size": 4,
"indent_char": " ", "indent_level": 0,
"indent_with_tabs": true,
"preserve_newlines": true, "preserve_newlines": true,
"max_preserve_newlines": 2,
"wrap_line_length": 0 "wrap_line_length": 0
} }
} }

2
documize/api/endpoint/router.go
View file

@ -30,7 +30,7 @@ const (
// AppVersion does what it says // AppVersion does what it says
// Versioning scheme major.minor where "minor" is optional // Versioning scheme major.minor where "minor" is optional
// e.g. 1, 2, 3, 4.1, 4.2, 5, 6, 7, 7.1, 8, 9, 10, ..... 127, 127.1, 128 // e.g. 1, 2, 3, 4.1, 4.2, 5, 6, 7, 7.1, 8, 9, 10, ..... 127, 127.1, 128
AppVersion = "12.9" AppVersion = "13.1"
) )
var port, certFile, keyFile, forcePort2SSL string var port, certFile, keyFile, forcePort2SSL string