mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 16:05:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
753 commits 217 branches 107 tags 79 MiB
Commit graph

373 commits

Author SHA1 Message Date
GitHub Merge Button
5e0befce3a Merge 3248ca4cbb into d73f053b5a 2012-01-02 06:48:03 -08: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
3401a7bc11 small css fix at the importexport panel 2011-12-11 18:20:05 +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
Jean-Tiare Le Bigot
0a513bc1d7 editor CSS proposal 2011-12-10 10:33:33 +01:00
Jean-Tiare Le Bigot
4715900eeb renumbering should be OK in most situations now :). It is automatically triggered on delete and return key and executed only when necessary 2011-12-09 17:23:32 +01:00
Jean-Tiare Le Bigot
4078ad83da fixed ordered list disapearing when typing 2011-12-09 13:23:05 +01:00
Jean-Tiare Le Bigot
a5ec736b4c improved return key behaviour in lists when on empty item 2011-12-08 19:23:21 +01:00
Jean-Tiare Le Bigot
ff04714614 fix typo in both CSS 2011-12-08 17:50:27 +01:00
Jean-Tiare Le Bigot
06d5e345c0 fix renumbering when indented text is mixed with regular lists 2011-12-08 17:48:49 +01:00
Jean-Tiare Le Bigot
9fd50b3e9f fix suggestion for the list theming 2011-12-08 16:56:23 +01:00
Jean-Tiare Le Bigot
226898eff0 bring back numbering increment 2011-12-08 16:31:02 +01:00
Jean-Tiare Le Bigot
0888bc94e1 fixed duplicated css rule 2011-12-08 16:28:47 +01:00
Jean-Tiare Le Bigot
308a20bf11 bring indentation and ordered list support to timeslider. Still miss numbering :/ 2011-12-08 16:21:38 +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
89aac09c91 sorry for that, correct pad.html 2011-12-06 18:54:57 +01:00
0ip
95fe749791 Optimized index page for mobile devices 2011-12-06 18:48:28 +01:00
0ip
a4dad594d3 Optimized css for mobile devices 2011-12-06 18:46:40 +01:00
0ip
b615da194f Optimized index page for mobile devices 2011-12-06 18:45:16 +01: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
0ip
1cf52682df 💅 Small fix for a recently introduced alignment-bug (10px are missing) + fixed gap between the checkbox and 'Read Only' @ Share and Embed dropdown 2011-12-02 22:47:29 +01:00
0ip
499e780c88 added related div to work properly 2011-12-02 20:39:23 +01:00
0ip
495b48056b Minor bugfix: Solves http://j.mp/utOjbn 2011-12-02 20:36:02 +01:00
Jean-Tiare Le Bigot
cd15ad24ab trivial, quick and dirty chrome fix 2011-12-02 09:34:17 +01:00
Jean-Tiare Le Bigot
68a01cc603 added numbrering logic + trigger on style update + visual render 2011-12-01 18:35:26 +01:00
Jean-Tiare Le Bigot
b8e9131158 added an icon for ordered list 2011-12-01 15:09:50 +01:00
Jean-Tiare Le Bigot
5027ad4c92 fixed typo, added initial interface with still bullet button 2011-12-01 11:59:12 +01:00
Jean-Tiare Le Bigot
239742e80c added internal ordered list support. Numbering increment is not yet handled. small code factorisation. Added related CSS 2011-12-01 11:50:17 +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
Peter 'Pita' Martischka
a2d3c6ddb2 Merge branch 'master' of git://github.com/Pita/etherpad-lite 2011-11-28 11:16:33 -08:00
John McLear
054af3da77 Change embe this pad to share and embed this pad 2011-11-28 02:42:30 +00: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
Kai Hermann
5838e7ee7f fixed merge conflicts 2011-11-27 11:55:18 -08: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