diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2014-03-16 13:30:22 +0100 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2014-03-16 13:30:22 +0100 |
| commit | a369347d86df01db04014fb519813ca5d18c3683 (patch) | |
| tree | 6a6948e5cfa6fc1fb9150706f14a36daca9b0590 /settings.json.template | |
| parent | cd0f5742f606e7310f735cb879aa0f19595ac023 (diff) | |
| parent | 602380abb7e99febfaf9f574da32ae3cc5064458 (diff) | |
| download | etherpad-lite-a369347d86df01db04014fb519813ca5d18c3683.zip | |
Merge branch 'pr/1579' into toolbar-test
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
Diffstat (limited to 'settings.json.template')
| -rw-r--r-- | settings.json.template | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/settings.json.template b/settings.json.template index 43aa1613..e9d35dcd 100644 --- a/settings.json.template +++ b/settings.json.template @@ -103,6 +103,22 @@ // restrict socket.io transport methods "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"], + /* The toolbar buttons configuration. + "toolbar": { + "left": [ + ["bold", "italic", "underline", "strikethrough"], + ["orderedlist", "unorderedlist", "indent", "outdent"], + ["undo", "redo"], + ["clearauthorship"] + ], + "right": [ + ["importexport", "timeslider", "savedrevision"], + ["settings", "embed"], + ["showusers"] + ] + }, + */ + /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */ "loglevel": "INFO", |