44 commits

Author	SHA1	Message	Date
Tom Hunkapiller	fd1d285a77	fix the rest of the deprecation warnings	2015-04-10 14:18:30 -05:00
John McLear	fef746e80e	fix import issue with txt files and abiword #2572	2015-04-01 00:19:42 +01:00
John McLear	cadb83ac5a	bumpage	2015-01-19 02:51:32 +00:00
John McLear	a07d1722fc	no errors on chrome client	2014-12-30 12:12:24 +01:00
John McLear	ac4f9eb4ce	licensing	2014-12-30 00:12:26 +01:00
John McLear	b8648b4a49	remove error logging	2014-12-29 23:08:42 +01:00
John McLear	a6400b3f61	allow only for pads less than 10 to be overwritten	2014-12-29 22:02:24 +01:00
John McLear	ab5e7381a2	working for all files	2014-12-29 21:35:10 +01:00
John McLear	3773b6346b	semi working requires browser refresh	2014-12-29 20:57:58 +01:00
John McLear	77de2d918b	multiline	2014-11-25 22:14:48 +00:00
John McLear	2a062f8dc3	mheh no browser requirement at all	2014-11-25 18:18:42 +00:00
John McLear	c2c0cb6907	so yeah, prolly can do this anyway?	2014-11-25 18:07:34 +00:00
John McLear	9b66c93d6b	swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well	2014-11-22 19:11:35 +00:00
John McLear	17f26b8c2c	Support to allow for a setting so you can stop unknown file types from being imported	2014-07-22 15:46:31 +01:00
John McLear	44cb676ba2	Merge pull request #2150 from ether/export-file-name-hook ... Server side hook to modify the export file name	2014-06-16 16:47:15 +01:00
John McLear	b74c43889e	Update ImportHandler.js	2014-05-09 13:50:00 +01:00
John McLear	69ba3cc104	remove eplite add etherpad	2014-05-07 15:17:14 +01:00
John McLear	6d38b05623	abiword shouldnt be used for HTML native documents	2014-05-06 17:32:45 +01:00
John McLear	438f3fc717	Merge pull request #2030 from ether/import_hook ... Working import hooks	2013-12-09 10:22:40 -08:00
John McLear	3180b96213	Remove console logs	2013-12-09 18:13:07 +00:00
webzwo0i	01c71085e4	fix closing of </title> tag	2013-12-07 00:18:36 +01:00
John McLear	271dd663bf	foo	2013-11-28 17:22:34 +00:00
John McLear	6fcc7c77f9	not working and erally confused	2013-11-27 00:23:11 +00:00
John McLear	c615ccf514	dont crash on importing blank html	2013-09-27 14:47:34 +01:00
John McLear	4bea3a348e	strip title out of html during import, pesky abiword behavior	2013-09-21 23:29:32 +01:00
Gared	b336e38637	Add check if uploaded file only contains ascii chars when abiword disabled	2013-09-10 21:58:28 +02:00
goldquest	cbf0535f97	browser detection was dropped in jquery 1.9, so we have to add the browser detection js file	2013-04-05 15:35:03 +02:00
Marcel Klehr	c30697cb07	Don't break the whole server if an import failed because no files were uploaded ... Fixes #1611	2013-03-19 18:40:39 +01:00
goldquest	74185e79ab	use the existing padimpexp object from the parent window	2013-01-23 16:36:37 +01:00
goldquest	666c0adcd2	script tag didn't link to right location	2013-01-22 16:42:56 +01:00
John McLear	bf5283fa11	Fix issue #725 which was caused by a race condition	2012-12-10 11:34:53 +00:00
goldquest	1380fda2b2	use the parent window, not the top	2012-12-06 17:51:43 +01:00
Iván Eixarch	bf04a4686a	avoid use of os.tmpDir() for node 0.6 compatibility	2012-12-06 11:49:04 +01:00
Iván Eixarch	97d77ea089	added my name in header	2012-11-27 00:11:45 +01:00
Iván Eixarch	cc60b82a6e	Import html by default and allow basic import/export features without abiword	2012-11-23 22:55:25 +01:00
Iván Eixarch	ef3231efd2	cleaning	2012-11-23 19:06:18 +01:00
Iván Eixarch	d0a17d5471	test import converting to html instead to txt by default	2012-11-23 18:18:03 +01:00
John McLear	26614bf2d5	You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594	2012-05-23 01:01:50 +02:00
John McLear	d1c2d12150	Import Should now work in IE	2012-05-23 00:52:10 +02:00
John McLear	dafa44e6b4	I hate how hacky this change is.	2012-05-23 00:51:03 +02:00
John McLear	b27287ce37	Update src/node/handler/ImportHandler.js	2012-05-23 00:49:12 +02:00
John McLear	c8b93f6ddc	Fix IE import	2012-05-23 00:46:56 +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/handler/ImportHandler.js (Browse further)