8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
a3ed82ad06
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 18:45:14 +02:00
3a969f8dd8
pass error messages to pad text if shown during startup
2015-04-06 00:13:38 +01:00
ec6a2b5ba9
allow for load testing connections to hit by a setting
2015-02-16 23:02:19 +00:00
83b7ca529b
tidy up template a bit
2014-07-22 16:03:49 +01:00
95ab126fe2
tidy up template a bit
2014-07-22 16:03:26 +01:00
6dfe33258a
tidy up template a bit
2014-07-22 16:02:56 +01:00
aa908ea8ce
tidy up template a bit
2014-07-22 16:02:22 +01:00
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
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
6054cda473
Create a customizable timeslider toolbar
2014-03-30 13:02:41 +02:00
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
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
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
121c02c74f
Grant access, when valid session is available and sessionNoPassword is set
2013-05-29 16:53:14 +02:00
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
e1961d4353
Adding settings.json.template example for the toolbar.
2013-04-13 12:25:53 -07:00
aa9fd7621a
Remove nested /* */ from settings.json.template
2013-03-05 05:58:03 +11:00
44965f462b
Fix comma errors in settings.json.template
2013-03-03 16:25:09 -05:00
fb605fb527
Merge pull request #1569 from ether/doc/log4js-appenders
...
Document the endless possibilities of log4js..
2013-03-03 08:29:50 -08:00
5c03c039d1
[settings.json.template] Shrink things together a bit and consistently indent comments
2013-03-03 16:39:34 +01:00
36923313fa
remove more references to lite
2013-03-01 23:08:39 +00:00
176a6c36d8
Document the endless possibilities of log4js
2013-02-27 20:39:38 +01:00
efce99c3a1
session key in settings file OR generate temp key for instance
2013-02-13 21:51:09 +00:00
82e681fb14
Update settings.json.template
2013-01-24 22:39:32 +00:00
f4b95c5ca4
Add log4js config setting
2013-01-13 12:20:49 +01:00
e1a1540011
moved to settings.json.template bottom; chg gitignore
2012-12-10 23:46:54 +01:00
5bf79971b8
merged upstream develop
2012-12-07 08:59:13 +01:00
9701c51ac5
removed empty line in settings.json.template
2012-12-02 18:48:47 +01:00
38c6549058
removed wrong comment in settings.json.template
2012-12-02 18:47:06 +01:00
8b044254cc
add socketTransportProtocols parameter
2012-12-02 18:28:28 +01:00
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +01:00
43980ffe11
chg server.key to epl-server.key
2012-11-23 21:18:05 +01:00
e8bca8ea04
Ip => IP typo fix; +comment for SSL
2012-11-23 21:15:52 +01:00
eed6b752d4
initial https version fix #1148
2012-11-22 10:12:58 +01:00
c92b5283fd
fix #377 : add favicon url as optional settings.json parameter
2012-11-04 11:26:17 +01:00
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
0702f4e58c
Get involved text
2012-10-30 13:03:33 +00:00
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
bee9a05ec3
mention postgres in the default settings
2012-06-20 17:36:05 +02:00
ecac40d062
Changed the authentication mechanism to support hooks
2012-04-19 16:04:03 +02:00
ac36a99a72
More general basic auth
2012-04-19 14:25:12 +02:00
3dd24bdf6f
forgot to remove a ',' ^.^
2012-04-11 22:25:04 +03:00
05fcf4ba4a
Having "maxAge" twice doesn't double the fun
2012-04-11 22:22:28 +03:00
396b586dbd
when no password is set, dont allow access to admin page
2012-04-03 14:17:19 +02:00
e06bf0e991
Basic auth for admin page
2012-04-02 18:45:37 +02:00
6120a0b7aa
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-03-27 22:36:48 +02:00
c407ad3d34
re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.
2012-03-23 19:28:46 +01:00
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
935edbf892
fix dirty path in settings.json
2012-03-04 19:47:35 +01:00
John McLear