LokeshN
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
98016665e4
working logic
2015-12-02 11:54:37 +00:00
John McLear
3aff0001a1
Merge pull request #2798 from ypid/fixed_get_git_hash
...
Get git commit hash even if the repo only points to a bare repo.
2015-10-22 16:13:58 +01: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
Robin Schneider
29441a8ae1
Get git commit hash even if the repo only points to a bare repo.
...
* Used by https://github.com/debops/ansible-etherpad
2015-10-07 15:43:29 +02:00
Thomas Russell Murphy
b557927b72
Fix link to etherpad-lite on GitHub
2015-08-03 21:53:54 -05:00
Simon Gaeremynck
786b43efc8
Tidy HTML before trying to convert it with abiword
2015-05-18 16:24:41 +01:00
Peter 'Pita' Martischka
fc0cac0cad
merge object settings into default settings
2015-04-11 22:01:46 +01: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
Stefan
db5bdc8719
Log version number and git-sha on server start
2015-04-11 00:13:04 +02:00
Stefan
8e4c961207
Add version number to plugins-info page
2015-04-10 23:52:17 +02:00
John McLear
a5345524e1
Merge pull request #2566 from ether/editbar-accessibility
...
Accessibility
2015-04-07 21:25:27 +01:00
John McLear
3a969f8dd8
pass error messages to pad text if shown during startup
2015-04-06 00:13:38 +01:00
John McLear
e027083136
timeslider settings for fonts
2015-04-05 15:18:36 +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
ddc69831b2
working, need to test though
2015-02-11 17:59:05 +00:00
John McLear
26c839063f
check file system that abiword exists
2015-01-04 14:47:08 +00:00
John McLear
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
John McLear
cb28d10963
move logging into debug environment variable .. sighs
2014-11-04 18:32:26 +00:00
Joachim Schiele
63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02: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
Joachim Schiele
e17044d60e
added /abs/path/settings.json handling
...
before this path, one could only supply a relative path like:
--settings ../relative/path/settings.js
now one can also use it with absolute paths like:
--settings /abs/path/settings.json
2014-06-22 20:56:21 +02: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
Robert Helmer
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
s1341
9b7203d4d2
have the server parse the settings file using minify and strip commas
2013-11-26 10:20:59 +02:00
Grant Woodford
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
Marcel Klehr
7b17bd58ae
Merge branch 'pr/1756' into develop
...
Conflicts:
src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
Eric Schrijver
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
goldquest
7528ddf610
typo
2013-05-29 16:54:39 +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
Marcel Klehr
04a53c4402
Merge branch 'feature/support-node-0.10' into develop
...
Conflicts:
src/package.json
2013-04-01 13:29:07 +02:00
disy-mk
c78aad16ea
adds missing semicolons in src/node/utils folder
2013-03-24 01:18:44 +01:00
Marcel Klehr
cd9c78998e
Fix path.join in Settings.js
2013-03-16 09:47:10 +01:00
cohitre
292a3bd7b7
Setting up the right toolbar.
2013-03-09 14:57:42 -08:00
Marcel Klehr
c4966543ed
Fix settings object having constructors of another vm.context
...
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
2013-02-28 16:16:26 +01:00
John McLear
7f09ec25a2
no need for prefix and tidy double semi
2013-02-13 21:53:15 +00:00
John McLear
efce99c3a1
session key in settings file OR generate temp key for instance
2013-02-13 21:51:09 +00:00
Marcel Klehr
f4b95c5ca4
Add log4js config setting
2013-01-13 12:20:49 +01:00
Wikinaut
05e8c74307
removed console.log of transport protocols
2012-12-10 22:33:00 +01:00
Wikinaut
0d2eddb62a
console.debug socketTransportProtocols
2012-12-02 18:54:30 +01:00
Wikinaut
9224e9beef
removed wrong comment in Settings.js
2012-12-02 18:44:39 +01:00
Wikinaut
8b044254cc
add socketTransportProtocols parameter
2012-12-02 18:28:28 +01:00
John McLear
d761003588
fix path to favicon resolves #1236
2012-11-30 22:50:54 +00:00
