539 commits

Author	SHA1	Message	Date
John McLear	59a9ff404d	more settimeout to top window	2013-03-28 13:18:55 +00:00
John McLear	c489177206	show light yellow for .5 secs on save revision keypress	2013-03-28 02:24:59 +00:00
John McLear	6b55d13370	expose ace document, reqjired for various plugins	2013-03-26 01:54:01 +00:00
John McLear	0063933041	fix cookies	2013-03-23 02:59:12 +00:00
Sahil Amoli	23abafb3cb	Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen	2013-03-20 15:48:11 -07:00
John McLear	4ea7ccd104	merge develop	2013-03-20 01:11:27 +00:00
Marcel Klehr	bcb92f25a6	Refactor chat notifications and the chatNewMessage hook	2013-03-19 20:21:27 +01:00
John McLear	7741f762e2	hook for chat msg	2013-03-19 02:21:53 +00:00
Marcel Klehr	b3dbf1c995	Update html10n.js	2013-03-18 22:29:42 +01:00
John McLear	3e0a80cb74	remove console log	2013-03-17 15:17:36 +00:00
John McLear	693b9b9b94	better mobile support for gritter messages, before it was awful	2013-03-17 01:23:31 +00:00
John McLear	a1d9d27cde	much cleaner way of showing / hiding overlay	2013-03-16 17:57:23 +00:00
John McLear	69a4ab76cf	hide modal once reconnect is good	2013-03-16 17:50:53 +00:00
John McLear	cf041dcb08	Merge pull request #1618 from ether/tidy-up ... Tidy up	2013-03-14 14:32:13 -07:00
John McLear	5d12be940c	return text instead of html	2013-03-14 18:28:35 -03:00
John McLear	383439629a	specialkey doesnt even exist afaik	2013-03-14 18:27:32 -03:00
John McLear	1bb9d1d625	remove pointless +	2013-03-14 18:23:27 -03:00
John McLear	d72abceee7	escape .color	2013-03-14 18:18:14 -03:00
John McLear	babb33d825	add authorId to chat and userlist, possibly privacy/security issue?	2013-03-13 21:55:29 +01:00
John McLear	26a6765b50	fix indent on chrome in linux	2013-03-08 08:40:40 -08:00
John McLear	1e94eaa06c	fix safari rtl dissapearing pad	2013-03-06 14:50:08 +00:00
Marcel Klehr	5731ef7802	Fix ace rtlIsTrue property setter	2013-03-06 15:40:02 +01:00
John McLear	2a8038b9fe	Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting ... Add a setting for RTL text direction (integrating the url paramter)	2013-03-06 05:58:47 -08:00
Marcel Klehr	760e1b82c3	Add a setting for RTL text direction (integrating the url paramter) ... Fixes #1191	2013-03-05 23:12:00 +01:00
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	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	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	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
John McLear	4a98ec3c23	resolve merge conflict	2013-02-20 22:37:27 +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
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	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	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	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