libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,141 Commits 2 Branches 0 Tags 24 MiB
Commit Graph

133 Commits

Author SHA1 Message Date
Luiza Pagliari 0cb8d31e95 [fix] Have one setting for each shortcut to create ordered list 
This is an adjustment to #2891.
 2017-05-11 14:56:09 -03:00
Luiza Pagliari 97038c2183 [fix] Fix shortcut enabling flag for 'ESC' 
This is an adjustment to #2891.
 2017-05-11 12:36:20 -03:00
Luiza Pagliari 688e8f37a3 [fix] Fix format of settings template + add information about shortcuts 
There was an extra comma at the end of shortcut list, this was breaking
Etherpad startup.

This is an adjustment to #2891.
 2017-05-11 12:32:12 -03:00
Luiza Pagliari 1ebcf0dc47 Merge pull request #2891 from bhldev/padShortcutDisable 
Added pad shortcut disabling feature to settings.json
 2017-05-11 11:29:25 -03:00
Luiza Pagliari 009cd31243 [feature] Create option to automatically reconnect after a few seconds 
On some erros that display a modal with "Force reconnect" button, allow
Etherpad to automatically reload pad after a few seconds. Amount of
seconds is defined on settings.json.

Still need to create tests for this feature, and implement i18n.
 2017-04-04 11:09:24 -03:00
Paul Carver 573b55af8b Correct the spelling of occured to occurred 
The correct spelling is occurred. See
http://www.gingersoftware.com/english-online/spelling-book/misspelling/occurred-occured-ocurred
or other dictionary search results.
 2016-11-11 12:46:40 -05:00
Dan Bornstein 219a1dc3e3 Fix value to be valid JSON. 
Also fixed some errant EOL whitespace.
 2016-08-12 11:05:40 -07:00
LokeshN a8d5dc0693 Issue #2960 - deactivate settings.json 
Deactivate settings.json in Admin dashboard
 2016-05-22 21:12:21 +05:30
Brian Lim 26aeb7b705 Added pad shortcut disabling feature 2016-01-21 07:38:41 -05:00
Stefan 8bf53c63cc set charset for mysql connection in settings.json 2015-12-21 21:02:54 +01:00
John McLear 0617f81689 remove applySettings hook and allow credentials.json to be part of core 2015-12-02 11:53:41 +00:00
John McLear 50171a4c3c Merge pull request #2805 from storytouch/indentationSetting 
Create setting to control if a new line will be indented or not
 2015-10-22 16:12:07 +01:00
Simon Gaeremynck 2bfc3026d2 Allow LibreOffice to be used when exporting a pad 
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-20 19:46:08 +01:00
Luiza Pagliari 5deb06d589 Create setting to control if a new line will be indented or not 
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-10-13 18:39:23 -03:00
gen2 0e59e5a77f Fix typo in comment 2015-08-08 06:56:14 +01:00
John McLear 04d5e25305 Update settings.json.template 2015-06-23 23:03:56 +01:00
Simon Gaeremynck 786b43efc8 Tidy HTML before trying to convert it with abiword 2015-05-18 16:24:41 +01:00
Andreas Åkre Solberg ec7b3fc787 Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs 2015-04-22 20:29:19 +02:00
John McLear 8ed12c7776 session key is now ignored and also padOptions are available in settings 2015-04-11 21:22:00 +01:00
Stefan a3ed82ad06 Move sessionKey setting from settings.json to SESSIONKEY.txt 2015-04-11 18:45:14 +02:00
John McLear 3a969f8dd8 pass error messages to pad text if shown during startup 2015-04-06 00:13:38 +01:00
John McLear ec6a2b5ba9 allow for load testing connections to hit by a setting 2015-02-16 23:02:19 +00:00
John McLear 83b7ca529b tidy up template a bit 2014-07-22 16:03:49 +01:00
John McLear 95ab126fe2 tidy up template a bit 2014-07-22 16:03:26 +01:00
John McLear 6dfe33258a tidy up template a bit 2014-07-22 16:02:56 +01:00
John McLear aa908ea8ce tidy up template a bit 2014-07-22 16:02:22 +01:00
John McLear 17f26b8c2c Support to allow for a setting so you can stop unknown file types from being imported 2014-07-22 15:46:31 +01:00
Marcel Klehr b1b972a2b4 Merge pull request #1787 from goldquest/dev_nopass_whensession 
Grant access for valid session to password protected group pads

so, if user has valid session, they don't need the password
 2014-06-17 14:01:16 +02:00
Marcel Klehr 6054cda473 Create a customizable timeslider toolbar 2014-03-30 13:02:41 +02:00
Marcel Klehr a369347d86 Merge branch 'pr/1579' into toolbar-test 
Conflicts:
	settings.json.template
	src/static/js/pad_editbar.js
 2014-03-16 13:30:22 +01:00
Luc Didry 3d8452b143 Replace tabs indentation with spaces indentation 
Some files are obviously external libraries, I didn't touch them
 2013-12-05 08:41:29 +01:00
Grant Woodford fbe4e43c3d Privacy: Add an option to disable IP logging 2013-10-19 21:37:11 +02:00
goldquest 121c02c74f Grant access, when valid session is available and sessionNoPassword is set 2013-05-29 16:53:14 +02:00
Spruce (Felix Fichte) fb0bc31056 updated to use settings 
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-24 12:19:41 +02:00
cohitre e1961d4353 Adding settings.json.template example for the toolbar. 2013-04-13 12:25:53 -07:00
Victor Hooi aa9fd7621a Remove nested /* */ from settings.json.template 2013-03-05 05:58:03 +11:00
yourcelf 44965f462b Fix comma errors in settings.json.template 2013-03-03 16:25:09 -05:00
John McLear fb605fb527 Merge pull request #1569 from ether/doc/log4js-appenders 
Document the endless possibilities of log4js..
 2013-03-03 08:29:50 -08:00
Marcel Klehr 5c03c039d1 [settings.json.template] Shrink things together a bit and consistently indent comments 2013-03-03 16:39:34 +01:00
John McLear 36923313fa remove more references to lite 2013-03-01 23:08:39 +00:00
Marcel Klehr 176a6c36d8 Document the endless possibilities of log4js 2013-02-27 20:39:38 +01:00
John McLear efce99c3a1 session key in settings file OR generate temp key for instance 2013-02-13 21:51:09 +00:00
John McLear 82e681fb14 Update settings.json.template 2013-01-24 22:39:32 +00:00
Marcel Klehr f4b95c5ca4 Add log4js config setting 2013-01-13 12:20:49 +01:00
Wikinaut e1a1540011 moved to settings.json.template bottom; chg gitignore 2012-12-10 23:46:54 +01:00
Wikinaut 5bf79971b8 merged upstream develop 2012-12-07 08:59:13 +01:00
Wikinaut 9701c51ac5 removed empty line in settings.json.template 2012-12-02 18:48:47 +01:00
Wikinaut 38c6549058 removed wrong comment in settings.json.template 2012-12-02 18:47:06 +01:00
Wikinaut 8b044254cc add socketTransportProtocols parameter 2012-12-02 18:28:28 +01:00
Iván Eixarch d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
Wikinaut 43980ffe11 chg server.key to epl-server.key 2012-11-23 21:18:05 +01:00
Wikinaut e8bca8ea04 Ip => IP typo fix; +comment for SSL 2012-11-23 21:15:52 +01:00
Wikinaut eed6b752d4 initial https version fix #1148 2012-11-22 10:12:58 +01:00
Wikinaut c92b5283fd fix #377: add favicon url as optional settings.json parameter 2012-11-04 11:26:17 +01:00
Marcel Klehr 6d543fbcb3 Add a setting for customizing the app title 
the app title is inserted into the <title> of all tepmlates
 2012-11-02 12:30:57 +01:00
John McLear 0702f4e58c Get involved text 2012-10-30 13:03:33 +00:00
John McLear 82f1abf7cf Don't depend on Bit.ly to get people to the EP 
Bit.ly is a problem if we change endpoints.  Using etherpad.org gives us full control. 
https://github.com/Pita/etherpad-lite/issues/1099
 2012-10-30 12:59:16 +00:00
Alexis Metaireau bee9a05ec3 mention postgres in the default settings 2012-06-20 17:36:05 +02:00
Egil Moeller ecac40d062 Changed the authentication mechanism to support hooks 2012-04-19 16:04:03 +02:00
Egil Moeller ac36a99a72 More general basic auth 2012-04-19 14:25:12 +02:00
0ip 3dd24bdf6f forgot to remove a ',' ^.^ 2012-04-11 22:25:04 +03:00
0ip 05fcf4ba4a Having "maxAge" twice doesn't double the fun 2012-04-11 22:22:28 +03:00
Matthias Bartelmeß 396b586dbd when no password is set, dont allow access to admin page 2012-04-03 14:17:19 +02:00
Egil Moeller e06bf0e991 Basic auth for admin page 2012-04-02 18:45:37 +02:00
Egil Moeller 6120a0b7aa Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-03-27 22:36:48 +02:00
Matthias Bartelmeß c407ad3d34 re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. 2012-03-23 19:28:46 +01:00
Egil Moeller dbdc53307e Bugfix to not have server required anywhere as it causes problems for command line script usage of modules 2012-03-14 18:50:13 +01:00
Peter 'Pita' Martischka 935edbf892 fix dirty path in settings.json 2012-03-04 19:47:35 +01:00
Peter 'Pita' Martischka 5888f5ff7d @cweider, only Chuck Norris can compute in json files 2012-02-27 19:54:54 +01:00
Chad Weider 1fe9d2a21e Allow maxAge of server to be specified in a setting. 2012-02-19 20:43:17 -08:00
Alexandre Girard a520c1e112 change settings sample to avoid error when editing httpAuth 2011-12-02 14:42:42 +01:00
Alexandre Girard 71fee11656 add the ability to set global password with http basic auth 2011-12-01 16:44:51 +01:00
Jordan a491600487 editOnly should default to false 2011-11-25 21:24:00 -05:00
Jordan 5e7c5d5dd3 Add editOnly option 2011-11-21 12:44:33 -05:00
Jordan 5630889fb0 A more precise description of the requireSession setting 2011-11-21 11:54:29 -05:00
Jordan 9850ba43ee Implement a 'requireSession' mode, which requires any user to have a valid session 2011-11-21 01:45:37 -05:00
John Soros 7362992191 Update README.md and settings.json.template: use mysql or sqlite for production 2011-11-18 03:49:00 +01:00
Peter 'Pita' Martischka 3ec7dc224b added a loglevel setting 2011-08-17 17:45:47 +01:00
Peter 'Pita' Martischka 95b1ac9393 removed sqlite dependency and made dirty the default db 2011-08-17 12:30:35 +01:00
Peter 'Pita' Martischka b30849c2f2 Installed log4js as logging framework 2011-07-31 18:25:51 +01:00
Peter 'Pita' Martischka 5306a88214 added the ability to listen at a specific ip 2011-07-30 16:39:53 +01:00
Peter 'Pita' Martischka eeddf1348f Added support for document export, no link from the pad so far 2011-07-19 19:48:11 +01:00
Peter 'Pita' Martischka 280b4ab9c7 Create a template of the settings file 2011-06-02 12:15:02 +01:00
Renamed from settings.json (Browse further)