libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3122 commits 2 branches 0 tags 24 MiB
Commit graph

48 commits

Author SHA1 Message Date
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)