659 commits

Author	SHA1	Message	Date
John McLear	18b6cf1534	Merge pull request #1523 from ether/store-sessions-in-db ... Store sessions in db	2013-02-26 18:03:54 -08:00
John McLear	2c69066591	remove pointless stuff	2013-02-27 02:02:18 +00:00
John McLear	fb3e4a6232	only show clients on this pad resolves issue #1544	2013-02-20 16:10:27 +00:00
John McLear	e52dc2b17c	dont reset head count, use the one we should :)	2013-02-19 02:05:51 +00:00
Marcel Klehr	4592397bd9	Merge pull request #1491 from ether/export-txt-with-indent ... TXT Export Indentation on lists Edit	2013-02-18 12:13:06 -08:00
John McLear	eeeeb04840	remove cruft	2013-02-18 00:37:47 +00:00
John McLear	6e46a53288	this is probably bad, please sanity check	2013-02-18 00:36:31 +00:00
John McLear	11a8295150	eureka	2013-02-18 00:29:53 +00:00
John McLear	6d7e709ecb	Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db	2013-02-17 23:44:26 +00:00
John McLear	7c03bc2610	when exporting HTML include html and body	2013-02-14 01:13:23 +00:00
John McLear	c723aefdfe	when exporting HTML include html and body	2013-02-14 01:10:47 +00: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
John McLear	aefd8d8d0d	nice chars n no cruft	2013-02-13 18:45:45 +00:00
John McLear	dea892213e	Revert "allow non ascii chars in txt export" ... This reverts commit be56272e66.	2013-02-13 18:41:04 +00:00
John McLear	be56272e66	allow non ascii chars in txt export	2013-02-13 18:30:55 +00:00
John McLear	d3f730e2ba	fix various issues dont stop random *'s appearing	2013-02-13 18:01:15 +00:00
Mark Fisher	500f9b8b48	Fixed typo thats made server hang	2013-02-13 15:25:27 +00:00
John McLear	5c9d081391	Begin supporting the database but still have a problem where it generates new key on restart...	2013-02-13 01:33:22 +00:00
John McLear	198110eb4b	drunk comments	2013-02-12 23:49:43 +00:00
John McLear	e152c477c7	include the callback call, for sanity and stop the pad from being nuked so early in the function	2013-02-12 23:38:02 +00:00
John McLear	086132de66	dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad	2013-02-12 23:23:44 +00:00
Manuel Knitza	8c9ad6ee50	Update src/node/handler/APIHandler.js	2013-02-12 21:50:14 +01:00
Manuel Knitza	e855bafdf9	Update src/node/hooks/express/apicalls.js	2013-02-12 21:47:40 +01:00
John McLear	da246d183d	Correct license header	2013-02-12 19:47:53 +00:00
John McLear	0b5c948549	Move code from Html export to a Helper file	2013-02-12 19:45:46 +00:00
Manuel Knitza	b1586684c8	Explicitly log creation of pad	2013-02-11 03:03:18 +01:00
John McLear	60ef5f210a	remove duplicate code to the best of my ability right now	2013-02-10 23:41:14 +00:00
John McLear	28f6d50011	remove console warn	2013-02-10 22:14:05 +00:00
John McLear	bcf9c23b4e	dont use HTML filter hooks on txt export	2013-02-10 19:38:16 +00:00
John McLear	626ee97669	kinda brutal way of stopping plugins being able to pass *s instead of attributes	2013-02-10 19:36:46 +00:00
John McLear	a67a0950dd	stop urls being encoded, not sure about other security implications here...	2013-02-10 19:21:27 +00:00
John McLear	a378f48c00	remove console warns	2013-02-10 17:39:02 +00:00
John McLear	d16b15f3eb	begin support for better txt output	2013-02-10 17:34:34 +00:00
Marcel Klehr	6d2b1488d6	Reformat access log messages to improve readability	2013-02-10 16:14:48 +01:00
Marcel Klehr	ee89696c4d	Log the client ip on pad access with logger 'access' ... also, don't log every message with log level info!	2013-02-10 16:03:49 +01:00
mluto	f2cd9e3adc	Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this.	2013-02-08 22:06:28 +01:00
mluto	e6454af5ed	Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP	2013-02-08 22:00:17 +01:00
mluto	0d5b98a338	Removed isProPad, since all pads are public except for group-pads	2013-02-07 14:30:09 +01:00
John McLear	488ebc20a4	Merge pull request #1446 from ether/allow-plugins-to-specify-specs ... Allow plugins to specify specs	2013-02-06 15:43:39 -08:00
John McLear	5b31030958	Merge pull request #1454 from dmitryuv/feature/socketio-rooms ... socket.io rooms instead of own session management	2013-02-05 16:09:25 -08:00
Dmitry	34f9f15150	socket.io rooms instead of own session management ... Replaces homegrown pad session management with socket.io build-in rooms	2013-02-05 23:33:44 +04:00
Jordan Hollinger	718421a46d	Bugfixes to getChatHistory API method	2013-02-04 00:57:51 -05:00
John McLear	da0b331502	Make async and cleaner	2013-02-04 00:00:39 +00:00
John McLear	8b8cf01785	put tests in static folder, still have a race condition no biggy	2013-02-03 13:53:44 +00:00
John McLear	0ff9f53297	correct path	2013-02-03 00:18:24 +00:00
John McLear	594d272334	allow plugins to specify frontend test specs	2013-02-03 00:14:17 +00:00
John McLear	1814c756ad	Merge pull request #1431 from mluto/fix-userinfo-crash ... Fix USERINFO_UPDATE crash	2013-01-30 06:43:37 -08:00
mluto	7e48e025c7	Check for missing payload on CLIENT_MESSAGE	2013-01-30 15:28:54 +01:00
mluto	f2742c5b63	Check for missing userInfo	2013-01-30 15:21:25 +01:00