77 commits

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