29 commits

Author	SHA1	Message	Date
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
Wikinaut	eed6b752d4	initial https version fix #1148	2012-11-22 10:12:58 +01:00
Marcel Klehr	e702a86c9f	Add ability to reload settings	2012-11-06 17:35:05 +01:00
John McLear	28bcdcec25	Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter ... fix #377: add favicon url as optional settings.json parameter	2012-11-06 03:08:25 -08:00
John McLear	dfa0ae9181	Merge pull request #893 from marcelklehr/feature/plugin-settings ... Add a new section in settings.json specifically for installed plugins.	2012-11-05 04:48:47 -08: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
Randy	596e20e123	Add default port of process.env.PORT if port isnt specified in settings.json	2012-10-25 10:21:34 -07:00
Marcel Klehr	b0099a4aba	Add plugin-specific sections in settings.json ... Settings for specific plugins are written down as below: { ... "ep_pluginname": { "foo":"bar" } ... }	2012-10-11 16:22:40 +02:00
Marcel Klehr	dc09323d8f	Don't exit if no settings file was found.	2012-07-11 15:36:41 +02:00
Marcel Klehr	f09dd0f3fb	Put toString() back in.	2012-07-11 15:34:33 +02:00
Marcel Klehr	87f26334d1	Fix typo.	2012-07-10 21:55:35 +02:00
Marcel Klehr	8858446678	Exit on error.	2012-07-10 21:38:14 +02:00
Marcel Klehr	4c8f69b7c5	Use v8 to parse settings.json	2012-07-08 18:59:46 +02:00
Matthias Bartelmeß	c90ef5aeb8	default dirty.db to current pwd, so no new directory has to be created	2012-04-20 22:39:16 +02:00
Matthias Bartelmeß	e9fc16a974	warn if dirty db is used	2012-04-20 17:03:37 +02:00
Matthias Bartelmeß	90bbf169b2	allow startup without settings file	2012-04-20 17:03:26 +02:00
Egil Moeller	ac36a99a72	More general basic auth	2012-04-19 14:25:12 +02:00
Egil Moeller	e06bf0e991	Basic auth for admin page	2012-04-02 18:45:37 +02:00
Egil Moeller	ce5d2d8685	Merge branch 'pita' ... Resolved conflicts: .gitignore src/static/js/ace.js src/static/js/ace2_inner.js src/static/js/broadcast.js src/static/js/domline.js src/static/pad.html src/static/timeslider.html Ignored conflicts (please merge manually later): node/server.js src/node/utils/Minify.js	2012-03-02 22:00:20 +01:00
Egil Moeller	1239ce7f28	The Big Renaming - etherpad is now an NPM module	2012-02-26 13:07:51 +01:00

Renamed from node/utils/Settings.js (Browse further)