1077 commits

Author	SHA1	Message	Date
John McLear	f9f8b1c079	allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway	2013-03-05 20:30:31 +00:00
John McLear	3dee4098b0	update ueberdb	2013-03-05 13:24:24 +00:00
Siebrand Mazeland	6c304f0480	Localisation updates from http://translatewiki.net.	2013-03-04 11:46:05 +00:00
John McLear	71f10bff5b	Merge pull request #1568 from ether/client-stability ... stop the client disconnecting of the server sends out a bad revision #, ...	2013-03-03 13:19:10 -08:00
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	994c4ebeed	stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510	2013-02-27 19:29:59 +00:00
John McLear	ebd8b85072	patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution	2013-02-27 16:17:50 +00:00
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	ad52b40597	post correct url, heh	2013-02-26 13:24:24 +00:00
John McLear	b2eb1b3814	post url with pad error msg	2013-02-26 13:14:17 +00:00
John McLear	f915285f15	merge develop	2013-02-25 10:13:50 +00:00
John McLear	5b89242c5b	Merge pull request #1538 from ether/timeslider-init-hook ... timeslider init hook	2013-02-25 02:12:37 -08:00
Siebrand Mazeland	26ccb1fa3e	Localisation updates from http://translatewiki.net.	2013-02-24 16:38:27 +00:00
John McLear	4a98ec3c23	resolve merge conflict	2013-02-20 22:37:27 +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
John McLear	9eff8576ef	timeslider init hook	2013-02-18 22:04:58 +00:00
John McLear	cda3a0e78b	a different approach	2013-02-18 21:03:52 +00:00
John McLear	c986a8565a	Merge pull request #1535 from ether/fix-extractPadData ... fix extract and checkPad	2013-02-18 12:41:46 -08: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	ab81b5cfe9	dont jump pages	2013-02-18 19:46:31 +00:00
John McLear	5441179e78	dont jump pages	2013-02-18 19:38:25 +00:00
John McLear	1a177d730a	Merge pull request #1536 from ether/timeslider-scripts-block ... Timeslider scripts block	2013-02-18 11:34:53 -08:00
John McLear	e7a07a495c	Merge pull request #1531 from ether/fix-for-long-strings ... make the focus jump back to the left if it's required	2013-02-18 11:26:46 -08:00
John McLear	2ee3d0469e	Merge pull request #1533 from ether/indenting-text ... Indenting text	2013-02-18 11:25:55 -08:00
John McLear	7fcc71710f	dont exposrt sendSocketMs	2013-02-18 18:59:53 +00:00
John McLear	75fd27998e	expose socket timeslider with a bad hack	2013-02-18 18:58:58 +00:00
John McLear	3f87a32a12	timestlider script block	2013-02-18 18:07:01 +00:00
John McLear	4cfac2f624	fix extract and checkPad	2013-02-18 08:29:25 -08:00
John McLear	77d03d3473	Try to add some sanity to indentation	2013-02-18 01:40:34 +00:00
John McLear	48ffbde731	allow colon to indent line	2013-02-18 01:10:54 +00: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	51a9ecf1f0	better support for other browsers	2013-02-17 21:19:15 +00:00
John McLear	7e023ce8e1	make the focus jump back to the left if it's required	2013-02-17 21:03:19 +00:00
Marcel Klehr	9ca2275432	Fixes #1498: Two-part locale specs in lang cookie wouldn't be read correctly	2013-02-17 21:35:46 +01:00
John McLear	04f609752f	actually works	2013-02-17 18:05:25 +00:00
John McLear	6b47fb69d0	seems to be working pretty well	2013-02-17 18:01:25 +00:00
John McLear	93d58b93be	Update src/static/css/iframe_editor.css	2013-02-17 17:13:02 +00:00
Siebrand Mazeland	025a3aa724	Localisation updates from http://translatewiki.net.	2013-02-16 05:10:29 +00:00
John McLear	140ff6f1bf	dont lose focus on key up, doesn't work yet	2013-02-15 12:24:16 +00:00
John McLear	c723aefdfe	when exporting HTML include html and body	2013-02-14 01:10:47 +00:00
John McLear	36814ed42b	apply overlay and remove overlay instantly	2013-02-13 23:44:20 +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