572 commits

Author	SHA1	Message	Date
John McLear	ec6dc4fa0e	make async, please check	2014-05-07 16:27:41 +01:00
John McLear	69ba3cc104	remove eplite add etherpad	2014-05-07 15:17:14 +01:00
John McLear	1f7fcd54f1	working logic for allowing a server side hook to modify the export file name but NOT the extension	2014-05-06 21:13:22 +01:00
Marcel Klehr	6054cda473	Create a customizable timeslider toolbar	2014-03-30 13:02:41 +02:00
John McLear	56fd078469	Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages ... Fix crash with queued messages	2014-03-26 19:39:19 +00:00
Marcel Klehr	f6f319960d	Fix REQ_CS rev boundary check ... fixes #2096	2014-03-20 21:34:01 +01:00
John McLear	e1fa43e640	quick formatting clean up	2014-03-17 19:20:32 +00:00
Marcel Klehr	da5970dda3	Refactor toolbar.js to use consistent naming	2014-03-16 15:14:21 +01:00
Marcel Klehr	a369347d86	Merge branch 'pr/1579' into toolbar-test ... Conflicts: settings.json.template src/static/js/pad_editbar.js	2014-03-16 13:30:22 +01:00
goldquest	a00c505403	Sometimes, the author2session / group2session don't exist anymore, but the session does. ... It should be possible to delete a session, if they don't exist	2014-03-14 17:50:37 +01:00
webzwo0i	fa681d43f7	remember user session because it can be gone when finalHandler is called	2014-02-20 17:38:25 +01:00
webzwo0i	c8c2866087	fix crash if disconnect happens for sessions that have messages queued	2014-02-20 16:33:42 +01:00
Simon Gaeremynck	cfdd57b487	Addressed a potential never finishing forEach in PadMessageHandler.padUsers ... If the session info for a client would be null or undefined, the forEach callback would never get called which means the padUsers callback would never get trigged. This could potentially block API request as this function is exposed at an HTTP API endpoint.	2014-02-19 10:48:15 +00:00
webzwo0i	a43123880a	fix randomstring	2014-01-24 01:19:14 +01:00
Robert Helmer	348d9a838f	convert over to server-side crypto	2014-01-15 11:44:57 -08:00
Robert Helmer	ae99c5ea6f	new randomString function should take len arg	2014-01-15 11:44:41 -08:00
Robert Helmer	9ef709e7f7	mozilla bug 844796 - use node crypto module for randomString	2014-01-15 10:58:50 -08:00
Marcel Klehr	adf05576b2	Don't crash if CHANGESET_REQ fails	2013-12-17 16:20:57 +01:00
s1341	5add63165d	Fix server side bug index overflow ... The server wasn't properly checking that the changesets it needed to return for changeset_requests actually existed.	2013-12-17 15:37:35 +02:00
John McLear	7d47d91a08	Merge pull request #1514 from ether/dont-die-on-bad-html ... dont die on bad html but only warn to api logger but dont tell client th...	2013-12-16 03:08:42 -08:00
Lennart Brinkmann	dd8af99e2e	Add input validation for html param in setHTML()	2013-12-14 21:14:56 +01:00
John McLear	58cd71dcce	Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop	2013-12-10 19:25:36 +00:00
John McLear	58bbfd8a65	resolve merge conflict	2013-12-09 21:55:04 +00:00
John McLear	24e96c4f8b	Merge pull request #2028 from webzwo0i/remove-deadcode ... Remove deadcode	2013-12-09 10:49:57 -08: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	9400425b1e	[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused	2013-12-08 17:33:58 +01:00
webzwo0i	aadcfbb3d1	do not send globalPadId in clientvars - its not used anywhere	2013-12-08 17:29:41 +01:00
webzwo0i	ca6f877db2	[padDiff] remove unused functions a?lines_length	2013-12-08 17:28:43 +01:00
webzwo0i	e1fbb1d1aa	fix loop	2013-12-08 13:53:26 +01:00
webzwo0i	9557dc9dba	remove unused require	2013-12-08 13:48:21 +01:00
webzwo0i	c3081c046b	function scope: variables only need to be declared once	2013-12-08 13:47:05 +01:00
webzwo0i	0fa0d6dc2c	remove now unused code	2013-12-08 13:45:45 +01:00
webzwo0i	27e0c37779	refactor export of style attributes ... 1. mark all attributes that are used 2. find the outermost attribute that is no longer used 3. close all tags upto this attribute 4. open all tags that are used and not open (5. close all open tags)	2013-12-08 13:39:50 +01:00
webzwo0i	f968b5a057	useless var statement (function scope)	2013-12-08 11:37:47 +01:00
webzwo0i	51769585a9	workaround so that at least one tag stays open if its the outermost tag. saves some space in the output	2013-12-08 11:37:07 +01:00
webzwo0i	656a558af9	be more clear about the value in propVals	2013-12-08 11:35:28 +01:00
webzwo0i	a534b1ec22	some more docs for attribute export and cleanup empty lines	2013-12-08 11:34:11 +01:00
webzwo0i	70c51d731b	add some documentation for styling attributes export	2013-12-08 11:33:20 +01:00
webzwo0i	86791707cd	fix export so no tags are omitted	2013-12-08 11:31:23 +01:00
webzwo0i	01c71085e4	fix closing of </title> tag	2013-12-07 00:18:36 +01:00
Luc Didry	3d8452b143	Replace tabs indentation with spaces indentation ... Some files are obviously external libraries, I didn't touch them	2013-12-05 08:41:29 +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
s1341	9b7203d4d2	have the server parse the settings file using minify and strip commas	2013-11-26 10:20:59 +02:00
s1341	45e0680484	move copy/move pad into a new api version	2013-11-24 22:34:56 +02:00
s1341	52a99eb9e5	fix bugs, add force option to overwrite destination	2013-11-18 08:25:46 +02:00
s1341	93fcab0461	change parameter names	2013-11-17 21:01:02 +02:00
s1341	29d8bb7716	add pad copy/move API functions	2013-11-17 17:02:44 +00:00
Marcel Klehr	8ab2442cc9	Update padList correctly ... fixes #1971	2013-11-01 14:16:26 +01:00