| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2016-08-12 | Fix value to be valid JSON. | Dan Bornstein | |
| Also fixed some errant EOL whitespace. | |||
| 2016-05-22 | Issue #2960 - deactivate settings.json | LokeshN | |
| Deactivate settings.json in Admin dashboard | |||
| 2015-12-21 | set charset for mysql connection in settings.json | Stefan | |
| 2015-12-02 | remove applySettings hook and allow credentials.json to be part of core | John McLear | |
| 2015-10-22 | Merge pull request #2805 from storytouch/indentationSetting | John McLear | |
| Create setting to control if a new line will be indented or not | |||
| 2015-10-20 | Allow LibreOffice to be used when exporting a pad | Simon Gaeremynck | |
| This commit adds support for LibreOffice when exporting a pad to doc, pdf, .. This commit also cleans up some export logic when exporting to txt | |||
| 2015-10-13 | Create setting to control if a new line will be indented or not | Luiza Pagliari | |
| Currently pressing ENTER on a line that ends with ':', '[', '(' or '{' automaticaly indents the new line with 4 spaces. The variable added by this commit to settings.json allow an Etherpad instance to not have this behavior. | |||
| 2015-08-08 | Fix typo in comment | gen2 | |
| 2015-06-23 | Update settings.json.template | John McLear | |
| 2015-05-18 | Tidy HTML before trying to convert it with abiword | Simon Gaeremynck | |
| 2015-04-22 | Adding support for providing intermediate CA certificates when running ↵ | Andreas Åkre Solberg | |
| etherpad-lite with ssl through Node/expressjs | |||
| 2015-04-11 | session key is now ignored and also padOptions are available in settings | John McLear | |
| 2015-04-11 | Move sessionKey setting from settings.json to SESSIONKEY.txt | Stefan | |
| 2015-04-06 | pass error messages to pad text if shown during startup | John McLear | |
| 2015-02-16 | allow for load testing connections to hit by a setting | John McLear | |
| 2014-07-22 | tidy up template a bit | John McLear | |
| 2014-07-22 | tidy up template a bit | John McLear | |
| 2014-07-22 | tidy up template a bit | John McLear | |
| 2014-07-22 | tidy up template a bit | John McLear | |
| 2014-07-22 | Support to allow for a setting so you can stop unknown file types from being ↵ | John McLear | |
| imported | |||
| 2014-06-17 | Merge pull request #1787 from goldquest/dev_nopass_whensession | Marcel Klehr | |
| Grant access for valid session to password protected group pads so, if user has valid session, they don't need the password | |||
| 2014-03-30 | Create a customizable timeslider toolbar | Marcel Klehr | |
| 2014-03-16 | Merge branch 'pr/1579' into toolbar-test | Marcel Klehr | |
| Conflicts: settings.json.template src/static/js/pad_editbar.js | |||
| 2013-12-05 | Replace tabs indentation with spaces indentation | Luc Didry | |
| Some files are obviously external libraries, I didn't touch them | |||
| 2013-10-19 | Privacy: Add an option to disable IP logging | Grant Woodford | |
| 2013-05-29 | Grant access, when valid session is available and sessionNoPassword is set | goldquest | |
| 2013-04-24 | updated to use settings | Spruce (Felix Fichte) | |
| updated handler/SocketIORouter.js to use new setting updated hooks/express.js to use new setting updated utils/Settings.js to accept new setting updated settings.json.template so new setting is present | |||
| 2013-04-13 | Adding settings.json.template example for the toolbar. | cohitre | |
| 2013-03-05 | Remove nested /* */ from settings.json.template | Victor Hooi | |
| 2013-03-03 | Fix comma errors in settings.json.template | yourcelf | |
| 2013-03-03 | Merge pull request #1569 from ether/doc/log4js-appenders | John McLear | |
| Document the endless possibilities of log4js.. | |||
| 2013-03-03 | [settings.json.template] Shrink things together a bit and consistently ↵ | Marcel Klehr | |
| indent comments | |||
| 2013-03-01 | remove more references to lite | John McLear | |
| 2013-02-27 | Document the endless possibilities of log4js | Marcel Klehr | |
| 2013-02-13 | session key in settings file OR generate temp key for instance | John McLear | |
| 2013-01-24 | Update settings.json.template | John McLear | |
| 2013-01-13 | Add log4js config setting | Marcel Klehr | |
| 2012-12-10 | moved to settings.json.template bottom; chg gitignore | Wikinaut | |
| 2012-12-07 | merged upstream develop | Wikinaut | |
| 2012-12-02 | removed empty line in settings.json.template | Wikinaut | |
| 2012-12-02 | removed wrong comment in settings.json.template | Wikinaut | |
| 2012-12-02 | add socketTransportProtocols parameter | Wikinaut | |
| 2012-11-26 | Added message translatable about features importing without abiword | Iván Eixarch | |
| 2012-11-23 | chg server.key to epl-server.key | Wikinaut | |
| 2012-11-23 | Ip => IP typo fix; +comment for SSL | Wikinaut | |
| 2012-11-22 | initial https version fix #1148 | Wikinaut | |
| 2012-11-04 | fix #377: add favicon url as optional settings.json parameter | Wikinaut | |
| 2012-11-02 | Add a setting for customizing the app title | Marcel Klehr | |
| the app title is inserted into the <title> of all tepmlates | |||
| 2012-10-30 | Get involved text | John McLear | |
| 2012-10-30 | Don't depend on Bit.ly to get people to the EP | John McLear | |
| Bit.ly is a problem if we change endpoints. Using etherpad.org gives us full control. https://github.com/Pita/etherpad-lite/issues/1099 | |||
 |
index : etherpad-lite | |
| Really real-time collaborative document editing. http://etherpad.org | cos |
| summaryrefslogtreecommitdiff |
path: root/settings.json.template