10 commits

Author	SHA1	Message	Date
John McLear	58bbfd8a65	resolve merge conflict	2013-12-09 21:55:04 +00:00
John McLear	204118eea5	dont crash on malformed HTML import	2013-09-21 16:11:56 +01: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
Jordan Hollinger	b118903f4e	Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768	2012-06-11 23:34:28 -04:00
Jordan Hollinger	6653a3b6f0	Bugfix to setPadHTML. resolves #764	2012-06-09 11:32:05 -04:00
Egil Moeller	a894fcd4f9	Removed CommonCode entierly	2012-02-28 21:19:10 +01:00
Egil Moeller	763361a7c9	First stab at getting client side require(plugin/..) to work from within etherpad	2012-02-26 17:48:17 +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/ImportHtml.js (Browse further)