Commit graph

186 commits

Author SHA1 Message Date
Marcel Klehr
49061175c9 Text color changes based on author color 2012-01-22 13:30:25 +01:00
0ip
3f8b03a900 Typo again 2012-01-22 02:15:02 +01:00
Robin
3c85a9cc6c Typo 2012-01-22 00:13:00 +01:00
Robin
300886da34 Removed duplicates 2012-01-22 00:10:06 +01:00
John McLear
9f0ca7cc44 Remove alt key from Z to stop Polish people feeling sad 2012-01-17 16:50:35 +00:00
Peter 'Pita' Martischka
8f887262b0 Merge pull request #335 from johnyma22/importInstructions
Added a string to let people know to install abiword to enable import
2012-01-15 12:50:55 -08:00
Peter 'Pita' Martischka
a313c2570e Merge pull request #331 from cweider/packaging-improvement
Packaging improvement
2012-01-15 12:48:41 -08:00
John McLear
eec22c4b70 Added a string to let people know to install abiword to enable import 2012-01-15 20:48:29 +00:00
Chad Weider
71a7c00abc Merge adjacent scripts. 2012-01-15 12:10:29 -08:00
Chad Weider
a7bea30d83 Remove unnecessary quoting approach. 2012-01-15 11:27:08 -08:00
Chad Weider
9c91f16c71 Improve inlining of editor content.
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
John McLear
5f46ac2b01 Temporary fix that was breaking clicks inside of embedded pads 2012-01-15 18:24:18 +00:00
John McLear
f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Chad Weider
387dd4a48b The value of all href attributes is escaped. 2012-01-14 14:50:23 -08:00
Chad Weider
6e36b59a59 All escaping functions replace HTML reserved characters. 2012-01-14 14:46:15 -08:00
John McLear
642b716553 Merge pull request #289 from jhollinger/no_spaces
Sanitize pad names
2012-01-08 07:30:07 -08:00
John McLear
86902c2c0b Merge pull request #291 from jhollinger/export_revisions
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
John McLear
7232dff6db Merge pull request #306 from 0ip/patch-7
Disables line numbers on mobile devices (fix for #304 and #305)
2012-01-08 06:49:56 -08:00
Jordan
ca70a7772a Fix cursor jump in IE when clicking edit buttons 2012-01-02 20:45:31 -05:00
0ip
a9a17e7360 properly disables line numbers on mobile devices (fix for #304 and #305) 2011-12-31 17:46:10 +01:00
Jordan
2a86d57e46 Add ability to export specific pad revisions 2011-12-18 00:18:35 -05:00
Jordan
e8ef99fb72 Sanitize pad names 2011-12-16 15:41:11 -05:00
Peter 'Pita' Martischka
609701961e Added some comments to help us documentating the code 2011-12-11 19:45:40 +01:00
John McLear
d20dcc7c57 fixed merge conflicts 2011-12-11 18:45:41 +01:00
Peter 'Pita' Martischka
c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki 2011-12-11 18:09:51 +01:00
0ip
4287cc283a Fix for disappearing chat 2011-12-07 15:14:52 +01:00
ryrun
9616d5631f Speed up line numbering of huge pads. Tested on chrome and firefox. Pad with more than 6000 lines will be loaded fast. It refresh first all current line numbers, then creates new with DocumentFragment and style.height info. Reflow(rebuild and rendering of dom) will be reduced to one for new ones, instead for each ones. 2011-12-07 14:23:28 +01:00
Adrian Lang
40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
John McLear
a444f11900 Merge pull request #275 from 0ip/patch-5
Mobile Patch [New]
2011-12-06 12:10:59 -08:00
0ip
9ad3aa0e4b Updated chat for mobile devices 2011-12-06 18:43:30 +01:00
0ip
2dbe562bdc Fix for 'Fix IE8 userpicker color issue' :) 2011-12-06 18:18:38 +01:00
Pierros Papadeas
3b1765bb23 Defining minimum Height and Width of Serialbox 2011-12-05 11:53:43 -08:00
John McLear
b2f1f04b54 Add support for hiding QR code via a parameter 2011-12-04 17:18:24 +01:00
John McLear
990a559a09 When noColors is set hide the clearAuthorship colors button 2011-12-04 17:17:44 +01:00
John McLear
a46a723b09 slight clean up 2011-12-04 17:17:16 +01:00
John McLear
dea5b05198 Fix IE8 userpicker color issue thanks to wikinaut now we can close off https://github.com/Pita/etherpad-lite/issues/233 2011-12-04 17:16:48 +01:00
John McLear
9e509677dc Merge pull request #231 from jtlebi/origin/shift-tab
(de)indent behaviour enhancement
2011-11-28 20:23:37 -08:00
John McLear
c8bfd21c03 Merge branch 'master' of https://github.com/Pita/etherpad-lite 2011-11-28 20:48:16 +00:00
John McLear
769892a736 Show QR code on read only and non read only options 2011-11-28 20:45:27 +00:00
Peter 'Pita' Martischka
ec56ca75ad Fixed #135, thx to @Wikinaut 2011-11-28 11:26:36 -08:00
Peter 'Pita' Martischka
e5d12f1d56 cherry picking @Yaco-Sistemas commit to fix IE 8 2011-11-28 11:18:47 -08:00
John McLear
90d36471b1 Remove read only link and place all functionality into embed option sorts issue #246 2011-11-27 21:04:11 +00:00
John McLear
19ee4865f4 Make the title changes Pita wanted which were show an increment and also fix the bug where it would keep increasing the title this is part of issue #125 2011-11-27 20:39:47 +00:00
Jean-Tiare Le Bigot
2cc47211f9 one more 'one line fix'. Fixes bullet list auto replacing indented text whenever a new char is appended to it. This was caused by 'bullet' being hardcoded in a regular expression :/ 2011-11-27 19:10:22 +01:00
John McLear
f465ebaab9 Being mentioned in a chat 2011-11-27 16:35:20 +00:00
John McLear
9bfc78eac1 Applied 0ip's fix https://github.com/Pita/etherpad-lite/issues/233#issuecomment-2884908 2011-11-27 01:11:51 +00:00
John McLear
33c51e1b01 Second and final part of https://github.com/Pita/etherpad-lite/issues/233 2011-11-26 19:16:32 +00:00
Peter 'Pita' Martischka
7296913cb0 fixed merge confilicts 2011-11-25 16:56:08 -08:00
Peter 'Pita' Martischka
54b912f352 Revert "This should fix the IE Cursor Issue #171"
This reverts commit 53bf7dc19d.
2011-11-25 16:10:21 -08:00
Peter 'Pita' Martischka
dc6d0cda68 Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-25 16:08:24 -08:00