515 commits

Author	SHA1	Message	Date
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	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
John McLear	93d58b93be	Update src/static/css/iframe_editor.css	2013-02-17 17:13:02 +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	36814ed42b	apply overlay and remove overlay instantly	2013-02-13 23:44:20 +00:00
John McLear	14dca92692	Merge pull request #1505 from ether/fix-for-long-strings ... very simple fix that might break other things but stops the caret focus ...	2013-02-12 11:06:45 -08:00
John McLear	a37d396577	fix issue where opera was doing stupid things but still an issue w/ double tabs exists	2013-02-12 19:04:43 +00:00
John McLear	2f20461445	a comment	2013-02-12 00:13:47 +00:00
John McLear	5f73a5ec30	very simple fix that might break other things but stops the caret focus being moved to the end of new lines when a long string without spaces is pasted into a pad	2013-02-12 00:08:44 +00:00
John McLear	24485283fd	Merge pull request #1504 from ether/feature/bringJqueryBack ... Checked JQuery back in. Temporary fix for #1499	2013-02-11 14:05:31 -08:00
Peter 'Pita' Martischka	b76e49ecde	Checked JQuery back in. Temporary fix for #1499	2013-02-11 21:22:16 +00:00
Peter 'Pita' Martischka	0953a5ac33	Brought scheduler back completly, fixes #1502	2013-02-11 20:51:40 +00:00
Peter 'Pita' Martischka	25fd3c5901	Windows and Mobile tests should be case insensitive	2013-02-10 22:10:25 +00:00
Peter 'Pita' Martischka	8d8487dfa6	Made jquery browser usable in testframework	2013-02-10 21:49:00 +00:00
Peter 'Pita' Martischka	1fbd408e82	replaced opera regex check with jquery browser check	2013-02-10 21:21:22 +00:00
Peter 'Pita' Martischka	500c451ba1	removed hack, because its uncessary now that scheduler is back	2013-02-10 21:19:48 +00:00
Peter 'Pita' Martischka	5e041aaedb	Moved old jquery recognition to seperate file	2013-02-10 20:34:27 +00:00
Peter 'Pita' Martischka	60de52477c	jquery shouldn't be checked in	2013-02-10 20:14:13 +00:00
Marcel Klehr	6191b01633	Merge pull request #1477 from ether/fix-opera-double-enter ... Fixes #940: opera double enter	2013-02-10 05:10:38 -08:00
John McLear	98d45af0f9	Merge pull request #1484 from disy-mk/develop ... jquery update 1.7.1 -> 1.9.1	2013-02-09 18:18:40 -08:00
Manuel Knitza	7b3d567d0c	.browser() support ... Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)	2013-02-10 02:53:07 +01:00
John McLear	cd77f3e637	Merge pull request #1483 from 0ip/ua ... Add UA functions	2013-02-09 17:47:34 -08:00
Manuel Knitza	7389e90cd0	update jquery 1.7.1 -> 1.9.1	2013-02-10 02:37:17 +01:00
0ip	c3a29d1480	Add missing export entry for the browser object	2013-02-09 22:35:10 +01:00
0ip	7ddfdc3935	Add UA functions	2013-02-09 22:26:47 +01:00
0ip	8a6b3c90e2	Fix loader styling	2013-02-09 21:29:11 +01:00