libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 06:52:46 +01:00
Code Issues Projects Releases Wiki Activity
2813 commits 207 branches 105 tags 123 MiB
Commit graph

438 commits

Author SHA1 Message Date
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
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
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
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
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
John McLear
a45a8a837d stop opera doing stupid things 2013-02-09 19:44:13 +00:00
John McLear
a93ff37879 fix opera by recreating a scheduler object 2013-02-09 16:42:47 +00:00
Marcel Klehr
5f79546c2a Merge pull request #1465 from mluto/kill-ep-stuff 
Removing old etherpad code
 2013-02-08 13:21:57 -08:00
mluto
f2cd9e3adc Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this. 2013-02-08 22:06:28 +01:00
mluto
e6454af5ed Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP 2013-02-08 22:00:17 +01:00
mluto
fc60ab24fa Removed debug code, moved hash-setting after the param-checking 2013-02-07 15:34:10 +01:00
mluto
0d5b98a338 Removed isProPad, since all pads are public except for group-pads 2013-02-07 14:30:09 +01:00
mluto
0cbd4034b1 Killed pad_docbar.js as it's from the old etherpad and not used 2013-02-07 13:59:41 +01:00