mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-01 04:39:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
3882 commits 220 branches 107 tags 75 MiB
Commit graph

833 commits

Author SHA1 Message Date
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
0ip
8fb8f0d3b6 Change settings layout 2013-02-09 21:22:23 +01:00
0ip
40734e6776 Fix table CSS 2013-02-09 20:58:57 +01:00
John McLear
a45a8a837d stop opera doing stupid things 2013-02-09 19:44:13 +00:00
0ip
b04e99bddc Tweak admin-UI 2013-02-09 17:54:39 +01:00
John McLear
a93ff37879 fix opera by recreating a scheduler object 2013-02-09 16:42:47 +00:00
0ip
ef0a6ce5ff Remove top-border 2013-02-09 17:39:08 +01: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
mluto
6e8dcee650 Removed old chat-code 2013-02-07 11:15:16 +01:00
John McLear
e78879c300 Merge pull request #1461 from ether/slider-nan 
stop slider showing NaN on tiny pads
 2013-02-06 15:45:39 -08:00
John McLear
284748adb7 stop slider showing NaN on tiny pads 2013-02-06 23:35:58 +00:00
John McLear
adaded343d better fix for IE8 page up down 2013-02-06 20:09:30 +00:00
John McLear
dd49c71af9 fixes IE8 error by only redifining if firefox 2013-02-06 19:43:28 +00:00
Peter 'Pita' Martischka
eaa835630c Support Page Up and Page Down in ace 2013-02-03 17:39:49 +00:00
Peter 'Pita' Martischka
cba001341f Remove legacy mozilla specific code from ace inner 2013-02-03 14:03:10 +00:00
Peter 'Pita' Martischka
d30daccb10 Don't handle selections that are not from the inner frame 2013-02-03 13:44:37 +00:00
Manuel Knitza
b9b5ebf661 Update src/static/js/html10n.js 
Added missing semicolons (#1440)
 2013-02-01 21:28:22 +01:00
John McLear
f8cc7e0d7b Merge pull request #1438 from mluto/plugin-search-case-senstive 
Made plugin search not casesensitive
 2013-01-31 10:13:37 -08:00
mluto
037478cbcd Made plugin search not casesensitive 2013-01-31 19:05:23 +01:00
Swen
1f348d911f Merge branch 'develop' into admin-index-plugable 2013-01-30 20:16:51 +01:00
John McLear
5b285e2ffa Merge pull request #1430 from mluto/notification-on-startup 
Don't show notifications when loading the chat-messages.
 2013-01-30 06:33:47 -08:00
mluto
b5eeeb7dc2 Don't show notifications when loading the chat-messages. 2013-01-30 12:16:32 +01:00
John McLear
daaa650a1b remove message about requiring comments 2013-01-29 12:15:11 +00:00
John McLear
a7361f5ce0 make tinycon update on all chat messages not just ones that mention your name 2013-01-29 12:09:16 +00:00
John McLear
fa7952523e spacing 2013-01-29 02:08:37 +00:00
John McLear
1c7810783c gritter now implemented 2013-01-29 01:55:36 +00:00
John McLear
2ae3dae492 introduce gritter files and ensure its available 2013-01-29 00:46:36 +00:00
John McLear
c6f997981b Merge pull request #1417 from ether/diff-view 
Adds an API endpoint for Diff view
 2013-01-28 13:50:31 -08:00