Commit graph

691 commits

Author SHA1 Message Date
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
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
deedc17ca8 Added backup and patch files to .gitignore. Makes life a bit easier 2011-11-28 11:28:06 -08: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
Peter 'Pita' Martischka
88a8853fda Added a extractPadData Script 2011-11-27 05:32:31 +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
Peter 'Pita' Martischka
f33af4700b Merge pull request #242 from jaseg/master
Random filename generation fix, made a windows-only delay actually windows-only.
2011-11-26 12:23:44 -08:00
Peter 'Pita' Martischka
3aacc0a1eb Merge pull request #222 from jhollinger/master
API-only access, per issue #150
2011-11-26 12:22:04 -08: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
John McLear
dd2d0d45f0 First part of https://github.com/Pita/etherpad-lite/issues/233 2011-11-26 19:15:43 +00:00
Peter 'Pita' Martischka
84e8fb94eb Merge pull request #239 from riseuplabs/master
Fix for jquery version test: #234
2011-11-25 22:18:43 -08:00
Micah Anderson
28c5e3ffb1 Fix jquery version test: #234 2011-11-26 00:58:47 -05:00
Jordan
a491600487 editOnly should default to false 2011-11-25 21:24:00 -05:00
Peter 'Pita' Martischka
6bcd2886e9 Fixed some problems with the database convertion 2011-11-25 17:56:50 -08:00
Peter 'Pita' Martischka
932ad0eeeb This may fixes the pdf convert issue 2011-11-25 16:58:00 -08: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
Peter 'Pita' Martischka
fa098d73cd Do a reconnect on network problems. After 10s it gives up 2011-11-25 15:26:01 -08:00
Jean-Tiare Le Bigot
7d184a681a fix indenting while cursor is in the line 2011-11-26 00:02:25 +01:00
John McLear
f61de98046 Merge pull request #232 from riseuplabs/master
Temp fix, @Pita may revert this.  For now it gets things stable again
2011-11-25 10:47:12 -08:00
Micah Anderson
97e9eb84af fix for #224 2011-11-25 13:39:33 -05:00
Jean-Tiare Le Bigot
9c14dcd498 updated menu bar labels 2011-11-25 11:19:22 +01:00
Jean-Tiare Le Bigot
caf8792974 applying/removing list now preserves the indentation level 2011-11-25 11:10:57 +01:00
Jean-Tiare Le Bigot
ea2e7d0550 added support for (de)indent of regular text 2011-11-25 10:29:31 +01:00
Jean-Tiare Le Bigot
6b11ae330d added handling of de-indenting when already on higher level 2011-11-25 09:13:03 +01:00
John McLear
40fcc83a05 Merge pull request #227 from jtlebi/origin/shift-tab
handle shift+tab, trivial fix
2011-11-24 08:04:04 -08:00
John McLear
89e3778a2c Merge pull request #228 from alx/readonly-checkbox
add checkbox to limit number of inputs in embed window
2011-11-24 08:01:23 -08:00
Alexandre Girard
7a7b3391fb add checkbox to limit number of inputs 2011-11-24 16:34:28 +01:00
Jean-Tiare Le Bigot
42341f2b2f handle shift+tab, trivial fix 2011-11-24 15:29:45 +01:00
John McLear
ccaa21a04a Styling for the new embed options 2011-11-23 15:49:22 +00:00